From a826afc5adaba4a88b14bf5b3941e9352a0a94e6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:21:20 +0000 Subject: import policycoreutils-2.5-17.1.el7 --- diff --git a/.gitignore b/.gitignore index 530c6f6..b334830 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ SOURCES/policycoreutils-2.5.tar.gz +SOURCES/policycoreutils-po.tgz SOURCES/policycoreutils_man_ru2.tar.bz2 SOURCES/sepolgen-1.2.3.tar.gz SOURCES/sepolicy-icons.tgz diff --git a/.policycoreutils.metadata b/.policycoreutils.metadata index d72bfa6..2b02542 100644 --- a/.policycoreutils.metadata +++ b/.policycoreutils.metadata @@ -1,4 +1,5 @@ 425ab5ad02cf2195d63fad5578b23a615eb95c21 SOURCES/policycoreutils-2.5.tar.gz +26821b24438fcc6095e5b26d3874b2c780c84ca6 SOURCES/policycoreutils-po.tgz be6e4cb77bb89b98ecb246f03780389b30646198 SOURCES/policycoreutils_man_ru2.tar.bz2 a7af25afd151ccf688a59e7764604b05e738e0e3 SOURCES/sepolgen-1.2.3.tar.gz d849fa76cc3ef4a26047d8a69fef3a55d2f3097f SOURCES/sepolicy-icons.tgz diff --git a/SOURCES/policycoreutils-rhel.patch b/SOURCES/policycoreutils-rhel.patch index acc7cbd..c6ac940 100644 --- a/SOURCES/policycoreutils-rhel.patch +++ b/SOURCES/policycoreutils-rhel.patch @@ -2183,7 +2183,7 @@ index abf8d3b..f50fcb2 100644 + except ValueError as e: self.error(e.args[0]) diff --git policycoreutils-2.5/hll/pp/pp.c policycoreutils-2.5/hll/pp/pp.c -index 866734f..9245975 100644 +index 866734f..49ca05e 100644 --- policycoreutils-2.5/hll/pp/pp.c +++ policycoreutils-2.5/hll/pp/pp.c @@ -28,6 +28,7 @@ @@ -2248,7 +2248,7 @@ index 866734f..9245975 100644 + if (separator) { + *separator = '\0'; + } -+ if (strcmp(mod_name, cil_name) != 0) { ++ if (mod_name && strcmp(mod_name, cil_name) != 0) { + fprintf(stderr, "Warning: SELinux userspace will refer to the module from %s as %s rather than %s\n", ifile, cil_name, mod_name); + } + free(cil_path); @@ -2315,679046 +2315,19 @@ index a693823..555f381 100644 ../sepolicy/info.c \ ../sepolicy/search.c \ ../sepolicy/sepolicy.py \ -diff --git policycoreutils-2.5/po/ach.po policycoreutils-2.5/po/ach.po -new file mode 100644 -index 0000000..0d84e13 ---- /dev/null -+++ policycoreutils-2.5/po/ach.po -@@ -0,0 +1,5198 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# -+# Translators: -+msgid "" -+msgstr "" -+"Project-Id-Version: Policycoreutils\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2014-01-03 16:04-0500\n" -+"PO-Revision-Date: 2014-03-24 16:46+0000\n" -+"Last-Translator: jsmith \n" -+"Language-Team: Acoli (http://www.transifex.com/projects/p/fedora/language/ach/)\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Language: ach\n" -+"Plural-Forms: nplurals=2; plural=(n > 1);\n" -+ -+#: ../run_init/run_init.c:67 -+msgid "" -+"USAGE: run_init