From ab3db24c9ea6d83ad6fd3065ff9b3c164b06d6d3 Mon Sep 17 00:00:00 2001 From: Lukas Vrabec Date: Mon, 10 Oct 2016 15:59:49 +0200 Subject: [PATCH] Rename docker-selinux to container-selinux package --- container-selinux.tgz | Bin 0 -> 4833 bytes docker-selinux.tgz | Bin 4317 -> 0 bytes make-rhat-patches.sh | 12 ++++++------ selinux-policy.spec | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 container-selinux.tgz delete mode 100644 docker-selinux.tgz diff --git a/container-selinux.tgz b/container-selinux.tgz new file mode 100644 index 0000000000000000000000000000000000000000..b15192511dcbb4936563eb86c702820ce35b0ff8 GIT binary patch literal 4833 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 H0H6Q>DzBc? literal 0 HcmV?d00001 diff --git a/docker-selinux.tgz b/docker-selinux.tgz deleted file mode 100644 index 2f419a7ffb25ab9965e299690424d21dc306240f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4317 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 L$^u;n0C)fZZIECb diff --git a/make-rhat-patches.sh b/make-rhat-patches.sh index e42df590..3f3481e8 100755 --- a/make-rhat-patches.sh +++ b/make-rhat-patches.sh @@ -12,7 +12,7 @@ POLICYSOURCES=`mktemp -d policysources.XXXXXX` pushd $POLICYSOURCES > /dev/null git clone git@github.com:fedora-selinux/selinux-policy.git -q -git clone git@github.com:fedora-cloud/docker-selinux.git -q +git clone git@github.com:projectatomic/container-selinux.git -q pushd selinux-policy > /dev/null # prepare policy patches against upstream commits matching the last upstream merge @@ -20,18 +20,18 @@ git rev-parse --verify origin/${FEDORA_VERSION}-base; git diff eb4512f6eb13792c7 git rev-parse --verify origin/${FEDORA_VERSION}-contrib; git diff 64302b790bf2b39d93610e1452c8361d56966ae0 origin/${FEDORA_VERSION}-contrib > policy-${FEDORA_VERSION}-contrib.patch popd > /dev/null -pushd docker-selinux > /dev/null -# Actual docker-selinux files are in master branch +pushd container-selinux > /dev/null +# Actual container-selinux files are in master branch #git checkout -b ${DOCKER_FEDORA_VERSION} -t origin/${DOCKER_FEDORA_VERSION} -q -tar -czf docker-selinux.tgz docker.if docker.te docker.fc +tar -czf container-selinux.tgz container.if container.te container.fc popd > /dev/null pushd $DISTGIT_PATH > /dev/null cp $POLICYSOURCES/selinux-policy/policy-${FEDORA_VERSION}-{base,contrib}.patch . -cp $POLICYSOURCES/docker-selinux/docker-selinux.tgz . +cp $POLICYSOURCES/container-selinux/container-selinux.tgz . popd > /dev/null popd > /dev/null rm -rf $POLICYSOURCES -echo "policy-rawhide-{contrib,base}.patches and docker.tgz with docker policy files have been created." +echo "policy-rawhide-{contrib,base}.patches and container.tgz with container policy files have been created." diff --git a/selinux-policy.spec b/selinux-policy.spec index fc2b95cd..456c3d47 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -55,7 +55,7 @@ Source28: permissivedomains.cil Source29: serefpolicy-contrib-%{version}.tgz Source30: booleans.subs_dist -Source35: docker-selinux.tgz +Source35: container-selinux.tgz # Do a factory reset when there's no policy.kern file in a store # http://bugzilla.redhat.com/1290659 @@ -495,7 +495,7 @@ Obsoletes: mod_fcgid-selinux <= %{version}-%{release} Obsoletes: cachefilesd-selinux <= 0.10-1 Conflicts: seedit Conflicts: 389-ds-base < 1.2.7, 389-admin < 1.1.12 -Conflicts: docker-selinux < 2:1.12.1-22 +Conflicts: container-selinux < 2:1.12.1-22 %description targeted SELinux Reference policy targeted base module. @@ -554,7 +554,7 @@ Requires(pre): coreutils Requires(pre): selinux-policy = %{version}-%{release} Requires: selinux-policy = %{version}-%{release} Conflicts: seedit -Conflicts: docker-selinux <= 1.9.0-9 +Conflicts: container-selinux <= 1.9.0-9 %description minimum SELinux Reference policy minimum base module. @@ -637,7 +637,7 @@ Requires(pre): coreutils Requires(pre): selinux-policy = %{version}-%{release} Requires: selinux-policy = %{version}-%{release} Conflicts: seedit -Conflicts: docker-selinux <= 1.9.0-9 +Conflicts: container-selinux <= 1.9.0-9 %description mls SELinux Reference policy mls base module.