Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package k3s-selinux for openSUSE:Factory
checked in at 2024-09-23 15:20:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/k3s-selinux (Old)
and /work/SRC/openSUSE:Factory/.k3s-selinux.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k3s-selinux"
Mon Sep 23 15:20:41 2024 rev:7 rq:1202416 version:1.6.stable.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/k3s-selinux/k3s-selinux.changes 2024-02-07
18:51:54.102275735 +0100
+++ /work/SRC/openSUSE:Factory/.k3s-selinux.new.29891/k3s-selinux.changes
2024-09-23 15:22:04.085059010 +0200
@@ -1,0 +2,11 @@
+Sat Sep 21 18:13:26 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 1.6.stable.1:
+ * Fix upload repo script for all distros (#70)
+ * Add docker volume to the rest of drone steps (#69)
+ * Fix dapper commands in drone (#68)
+ * Fix CI (#67)
+ * Remove maximum version limit for container-selinux for slemicro
+ (#66)
+
+-------------------------------------------------------------------
Old:
----
k3s-selinux-1.5.stable.1.tar.gz
New:
----
k3s-selinux-1.6.stable.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ k3s-selinux.spec ++++++
--- /var/tmp/diff_new_pack.WVBvHf/_old 2024-09-23 15:22:04.569079083 +0200
+++ /var/tmp/diff_new_pack.WVBvHf/_new 2024-09-23 15:22:04.569079083 +0200
@@ -35,7 +35,7 @@
%define container_policyver 2.164.2-1.1
Name: k3s-selinux
-Version: 1.5.stable.1
+Version: 1.6.stable.1
Release: 0
Summary: SELinux policy module for k3s
++++++ _service ++++++
--- /var/tmp/diff_new_pack.WVBvHf/_old 2024-09-23 15:22:04.617081074 +0200
+++ /var/tmp/diff_new_pack.WVBvHf/_new 2024-09-23 15:22:04.621081240 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/k3s-io/k3s-selinux</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v1.5.stable.1</param>
+ <param name="revision">v1.6.stable.1</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.WVBvHf/_old 2024-09-23 15:22:04.649082401 +0200
+++ /var/tmp/diff_new_pack.WVBvHf/_new 2024-09-23 15:22:04.653082567 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/k3s-io/k3s-selinux</param>
- <param
name="changesrevision">a370547da1d368521836a72cd7b071e3c20a5941</param></service></servicedata>
+ <param
name="changesrevision">48b687df7714d042a925e499c3b770d77858f37e</param></service></servicedata>
(No newline at EOF)
++++++ k3s-selinux-1.5.stable.1.tar.gz -> k3s-selinux-1.6.stable.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/k3s-selinux-1.5.stable.1/.drone.yml
new/k3s-selinux-1.6.stable.1/.drone.yml
--- old/k3s-selinux-1.5.stable.1/.drone.yml 2024-02-06 21:56:19.000000000
+0100
+++ new/k3s-selinux-1.6.stable.1/.drone.yml 2024-09-06 19:24:09.000000000
+0200
@@ -10,13 +10,13 @@
- name: Build EL7
image: rancher/dapper:v0.6.0
commands:
- - dapper -f Dockerfile.centos7.dapper policy/centos7/scripts/build
+ - dapper -f Dockerfile.centos7.dapper ./policy/centos7/scripts/build
volumes:
- name: docker
path: /var/run/docker.sock
- name: Sign RPM EL7
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
PRIVATE_KEY:
from_secret: private_key
@@ -27,7 +27,10 @@
TESTING_PRIVATE_KEY_PASS_PHRASE:
from_secret: testing_private_key_pass_phrase
commands:
- - policy/centos7/scripts/sign
+ - dapper -f Dockerfile.centos7.dapper ./policy/centos7/scripts/sign
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -38,7 +41,7 @@
- tag
- name: Yum Repo Upload EL7
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
AWS_S3_BUCKET:
from_secret: aws_s3_bucket
@@ -53,7 +56,10 @@
TESTING_AWS_SECRET_ACCESS_KEY:
from_secret: testing_aws_secret_access_key
commands:
- - policy/centos7/scripts/upload-repo
+ - dapper -f Dockerfile.centos7.dapper ./policy/centos7/scripts/upload-repo
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -100,13 +106,13 @@
- name: Build EL8
image: rancher/dapper:v0.6.0
commands:
- - dapper -f Dockerfile.centos8.dapper policy/centos8/scripts/build
+ - dapper -f Dockerfile.centos8.dapper ./policy/centos8/scripts/build
volumes:
- name: docker
path: /var/run/docker.sock
- name: Sign RPM EL8
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
PRIVATE_KEY:
from_secret: private_key
@@ -117,7 +123,10 @@
TESTING_PRIVATE_KEY_PASS_PHRASE:
from_secret: testing_private_key_pass_phrase
commands:
- - policy/centos8/scripts/sign
+ - dapper -f Dockerfile.centos7.dapper ./policy/centos8/scripts/sign
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -128,7 +137,7 @@
- tag
- name: Yum Repo Upload EL8
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
AWS_S3_BUCKET:
from_secret: aws_s3_bucket
@@ -143,7 +152,10 @@
TESTING_AWS_SECRET_ACCESS_KEY:
from_secret: testing_aws_secret_access_key
commands:
- - policy/centos8/scripts/upload-repo
+ - dapper -f Dockerfile.centos7.dapper ./policy/centos8/scripts/upload-repo
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -190,13 +202,13 @@
- name: Build SLE Micro
image: rancher/dapper:v0.6.0
commands:
- - dapper -f Dockerfile.slemicro.dapper policy/slemicro/scripts/build
+ - dapper -f Dockerfile.slemicro.dapper ./policy/slemicro/scripts/build
volumes:
- name: docker
path: /var/run/docker.sock
- name: Sign RPM SLE
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
PRIVATE_KEY:
from_secret: private_key
@@ -207,7 +219,10 @@
TESTING_PRIVATE_KEY_PASS_PHRASE:
from_secret: testing_private_key_pass_phrase
commands:
- - policy/slemicro/scripts/sign
+ - dapper -f Dockerfile.centos7.dapper ./policy/slemicro/scripts/sign
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -218,7 +233,7 @@
- tag
- name: Yum Repo Upload SLE Micro
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
AWS_S3_BUCKET:
from_secret: aws_s3_bucket
@@ -233,7 +248,10 @@
TESTING_AWS_SECRET_ACCESS_KEY:
from_secret: testing_aws_secret_access_key
commands:
- - policy/slemicro/scripts/upload-repo
+ - dapper -f Dockerfile.centos7.dapper ./policy/slemicro/scripts/upload-repo
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -281,13 +299,13 @@
- name: Build MicroOS
image: rancher/dapper:v0.6.0
commands:
- - dapper -f Dockerfile.microos.dapper policy/microos/scripts/build
+ - dapper -f Dockerfile.microos.dapper ./policy/microos/scripts/build
volumes:
- name: docker
path: /var/run/docker.sock
- name: Sign RPM MicroOS
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
PRIVATE_KEY:
from_secret: private_key
@@ -298,7 +316,10 @@
TESTING_PRIVATE_KEY_PASS_PHRASE:
from_secret: testing_private_key_pass_phrase
commands:
- - policy/microos/scripts/sign
+ - dapper -f Dockerfile.centos7.dapper ./policy/microos/scripts/sign
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -309,7 +330,7 @@
- tag
- name: Yum Repo Upload MicroOS
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
AWS_S3_BUCKET:
from_secret: aws_s3_bucket
@@ -324,7 +345,10 @@
TESTING_AWS_SECRET_ACCESS_KEY:
from_secret: testing_aws_secret_access_key
commands:
- - policy/microos/scripts/upload-repo
+ - dapper -f Dockerfile.centos7.dapper ./policy/microos/scripts/upload-repo
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -372,13 +396,13 @@
- name: Build Fedora CoreOS
image: rancher/dapper:v0.6.0
commands:
- - dapper -f Dockerfile.coreos.dapper policy/coreos/scripts/build
+ - dapper -f Dockerfile.coreos.dapper ./policy/coreos/scripts/build
volumes:
- name: docker
path: /var/run/docker.sock
- name: Sign RPM Fedora CoreOS
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
PRIVATE_KEY:
from_secret: private_key
@@ -389,7 +413,10 @@
TESTING_PRIVATE_KEY_PASS_PHRASE:
from_secret: testing_private_key_pass_phrase
commands:
- - policy/coreos/scripts/sign
+ - dapper -f Dockerfile.centos7.dapper ./policy/coreos/scripts/sign
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -400,7 +427,7 @@
- tag
- name: Yum Repo Upload Fedora CoreOS
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
AWS_S3_BUCKET:
from_secret: aws_s3_bucket
@@ -415,7 +442,10 @@
TESTING_AWS_SECRET_ACCESS_KEY:
from_secret: testing_aws_secret_access_key
commands:
- - policy/coreos/scripts/upload-repo
+ - dapper -f Dockerfile.centos7.dapper ./policy/coreos/scripts/upload-repo
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -462,13 +492,13 @@
- name: Build EL9
image: rancher/dapper:v0.6.0
commands:
- - dapper -f Dockerfile.centos9.dapper policy/centos9/scripts/build
+ - dapper -f Dockerfile.centos9.dapper ./policy/centos9/scripts/build
volumes:
- name: docker
path: /var/run/docker.sock
- name: Sign RPM EL9
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
PRIVATE_KEY:
from_secret: private_key
@@ -479,7 +509,10 @@
TESTING_PRIVATE_KEY_PASS_PHRASE:
from_secret: testing_private_key_pass_phrase
commands:
- - policy/centos9/scripts/sign
+ - dapper -f Dockerfile.centos7.dapper ./policy/centos9/scripts/sign
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
@@ -490,7 +523,7 @@
- tag
- name: Yum Repo Upload EL9
- image: centos:7
+ image: rancher/dapper:v0.6.0
environment:
AWS_S3_BUCKET:
from_secret: aws_s3_bucket
@@ -505,7 +538,10 @@
TESTING_AWS_SECRET_ACCESS_KEY:
from_secret: testing_aws_secret_access_key
commands:
- - policy/centos9/scripts/upload-repo
+ - dapper -f Dockerfile.centos7.dapper ./policy/centos9/scripts/upload-repo
+ volumes:
+ - name: docker
+ path: /var/run/docker.sock
when:
instance:
- drone-publish.k3s.io
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/k3s-selinux-1.5.stable.1/Dockerfile.centos7.dapper
new/k3s-selinux-1.6.stable.1/Dockerfile.centos7.dapper
--- old/k3s-selinux-1.5.stable.1/Dockerfile.centos7.dapper 2024-02-06
21:56:19.000000000 +0100
+++ new/k3s-selinux-1.6.stable.1/Dockerfile.centos7.dapper 2024-09-06
19:24:09.000000000 +0200
@@ -1,11 +1,14 @@
FROM centos:7
+RUN sed -i -e "s/mirrorlist.*//g" /etc/yum.repos.d/*
+RUN sed -i -e
"s/#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/linuxsoft.cern.ch\/centos-vault\//g"
/etc/yum.repos.d/*
+
RUN yum install -y epel-release \
&& yum -y install container-selinux git rpm-build selinux-policy-devel
yum-utils
ENV DAPPER_SOURCE /source
ENV DAPPER_OUTPUT ./dist
-ENV DAPPER_ENV COMBARCH DRONE_TAG TAG
+ENV DAPPER_ENV COMBARCH DRONE_TAG TAG PRIVATE_KEY PRIVATE_KEY_PASS_PHRASE
TESTING_PRIVATE_KEY TESTING_PRIVATE_KEY_PASS_PHRASE AWS_S3_BUCKET
AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY TESTING_AWS_S3_BUCKET
TESTING_AWS_ACCESS_KEY_ID TESTING_AWS_SECRET_ACCESS_KEY
ENV HOME ${DAPPER_SOURCE}
WORKDIR ${DAPPER_SOURCE}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/k3s-selinux-1.5.stable.1/Makefile
new/k3s-selinux-1.6.stable.1/Makefile
--- old/k3s-selinux-1.5.stable.1/Makefile 2024-02-06 21:56:19.000000000
+0100
+++ new/k3s-selinux-1.6.stable.1/Makefile 2024-09-06 19:24:09.000000000
+0200
@@ -1,10 +1,6 @@
-CENTOS7_TARGETS := $(addprefix centos7-,$(shell ls policy/centos7/scripts))
-CENTOS8_TARGETS := $(addprefix centos8-,$(shell ls policy/centos8/scripts))
-CENTOS9_TARGETS := $(addprefix centos9-,$(shell ls policy/centos9/scripts))
-MICROOS_TARGETS := $(addprefix microos-,$(shell ls policy/microos/scripts))
-SLEMICRO_TARGETS := $(addprefix slemicro-,$(shell ls policy/slemicro/scripts))
-COREOS_TARGETS := $(addprefix coreos-,$(shell ls policy/coreos/scripts))
-
+UPLOAD_TARGETS := $(addprefix upload-,$(shell ls policy/))
+BUILD_TARGETS := $(addprefix build-,$(shell ls policy/))
+SIGN_TARGETS := $(addprefix sign-,$(shell ls policy/))
.dapper:
@echo Downloading dapper
@curl -sL https://releases.rancher.com/dapper/latest/dapper-$$(uname
-s)-$$(uname -m) > .dapper.tmp
@@ -12,22 +8,16 @@
@./.dapper.tmp -v
@mv .dapper.tmp .dapper
-$(CENTOS7_TARGETS): .dapper
- ./.dapper -f Dockerfile.centos7.dapper $(@:centos7-%=%)
-
-$(CENTOS8_TARGETS): .dapper
- ./.dapper -f Dockerfile.centos8.dapper $(@:centos8-%=%)
-
-$(CENTOS9_TARGETS): .dapper
- ./.dapper -f Dockerfile.centos9.dapper $(@:centos9-%=%)
+$(BUILD_TARGETS): .dapper
+ ./.dapper -f Dockerfile.$(@:build-%=%).dapper
./policy/$(@:build-%=%)/scripts/build
-$(MICROOS_TARGETS): .dapper
- ./.dapper -f Dockerfile.microos.dapper $(@:microos-%=%)
+$(SIGN_TARGETS): .dapper
+ ./.dapper -f Dockerfile.centos7.dapper
./policy/$(@:sign-%=%)/scripts/sign
-$(SLEMICRO_TARGETS): .dapper
- ./.dapper -f Dockerfile.slemicro.dapper $(@:slemicro-%=%)
+$(UPLOAD_TARGETS): .dapper
+ ./.dapper -f Dockerfile.centos7.dapper
./policy/$(@:upload-%=%)/scripts/upload-repo
-$(COREOS_TARGETS): .dapper
- ./.dapper -f Dockerfile.coreos.dapper $(@:coreos-%=%)
+clean:
+ rm -rf dist/ Dockerfile.*.dapper[0-9]*
-.PHONY: $(CENTOS7_TARGETS) $(CENTOS8_TARGETS)
+.PHONY: $(UPLOAD_TARGETS) $(BUILD_TARGETS) $(SIGN_TARGETS) clean
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/k3s-selinux-1.5.stable.1/policy/centos7/scripts/upload-repo
new/k3s-selinux-1.6.stable.1/policy/centos7/scripts/upload-repo
--- old/k3s-selinux-1.5.stable.1/policy/centos7/scripts/upload-repo
2024-02-06 21:56:19.000000000 +0100
+++ new/k3s-selinux-1.6.stable.1/policy/centos7/scripts/upload-repo
2024-09-06 19:24:09.000000000 +0200
@@ -6,7 +6,9 @@
popd
yum install -y epel-release
-yum install -y git python2-pip python-deltarpm
+yum install -y git python2-pip python-deltarpm ca-certificates
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+
pip install --cache-dir=/var/cache/pip --upgrade 'boto3==1.17.112' 'pip<21.0'
'setuptools<45.0'
pip install --cache-dir=/var/cache/pip/ \
git+https://github.com/Voronenko/rpm-s3.git@5695c6ad9a08548141d3713328e1bd3f533d137e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/k3s-selinux-1.5.stable.1/policy/centos8/scripts/upload-repo
new/k3s-selinux-1.6.stable.1/policy/centos8/scripts/upload-repo
--- old/k3s-selinux-1.5.stable.1/policy/centos8/scripts/upload-repo
2024-02-06 21:56:19.000000000 +0100
+++ new/k3s-selinux-1.6.stable.1/policy/centos8/scripts/upload-repo
2024-09-06 19:24:09.000000000 +0200
@@ -6,7 +6,9 @@
popd
yum install -y epel-release
-yum install -y git python2-pip python-deltarpm
+yum install -y git python2-pip python-deltarpm ca-certificates
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+
pip install --cache-dir=/var/cache/pip --upgrade 'boto3==1.17.112' 'pip<21.0'
'setuptools<45.0'
pip install --cache-dir=/var/cache/pip/ \
git+https://github.com/Voronenko/rpm-s3.git@5695c6ad9a08548141d3713328e1bd3f533d137e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/k3s-selinux-1.5.stable.1/policy/centos9/scripts/upload-repo
new/k3s-selinux-1.6.stable.1/policy/centos9/scripts/upload-repo
--- old/k3s-selinux-1.5.stable.1/policy/centos9/scripts/upload-repo
2024-02-06 21:56:19.000000000 +0100
+++ new/k3s-selinux-1.6.stable.1/policy/centos9/scripts/upload-repo
2024-09-06 19:24:09.000000000 +0200
@@ -6,7 +6,9 @@
popd
yum install -y epel-release
-yum install -y git python2-pip python-deltarpm
+yum install -y git python2-pip python-deltarpm ca-certificates
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+
pip install --cache-dir=/var/cache/pip --upgrade 'boto3==1.17.112' 'pip<21.0'
'setuptools<45.0'
pip install --cache-dir=/var/cache/pip/ \
git+https://github.com/Voronenko/rpm-s3.git@5695c6ad9a08548141d3713328e1bd3f533d137e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/k3s-selinux-1.5.stable.1/policy/coreos/scripts/upload-repo
new/k3s-selinux-1.6.stable.1/policy/coreos/scripts/upload-repo
--- old/k3s-selinux-1.5.stable.1/policy/coreos/scripts/upload-repo
2024-02-06 21:56:19.000000000 +0100
+++ new/k3s-selinux-1.6.stable.1/policy/coreos/scripts/upload-repo
2024-09-06 19:24:09.000000000 +0200
@@ -6,7 +6,9 @@
popd
yum install -y epel-release
-yum install -y git python2-pip python-deltarpm
+yum install -y git python2-pip python-deltarpm ca-certificates
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+
pip install --cache-dir=/var/cache/pip --upgrade 'boto3==1.17.112' 'pip<21.0'
'setuptools<45.0'
pip install --cache-dir=/var/cache/pip/ \
git+https://github.com/Voronenko/rpm-s3.git@5695c6ad9a08548141d3713328e1bd3f533d137e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/k3s-selinux-1.5.stable.1/policy/microos/scripts/upload-repo
new/k3s-selinux-1.6.stable.1/policy/microos/scripts/upload-repo
--- old/k3s-selinux-1.5.stable.1/policy/microos/scripts/upload-repo
2024-02-06 21:56:19.000000000 +0100
+++ new/k3s-selinux-1.6.stable.1/policy/microos/scripts/upload-repo
2024-09-06 19:24:09.000000000 +0200
@@ -6,7 +6,9 @@
popd
yum install -y epel-release
-yum install -y git python2-pip python-deltarpm
+yum install -y git python2-pip python-deltarpm ca-certificates
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+
pip install --cache-dir=/var/cache/pip --upgrade 'boto3==1.17.112' 'pip<21.0'
'setuptools<45.0'
pip install --cache-dir=/var/cache/pip/ \
git+https://github.com/Voronenko/rpm-s3.git@5695c6ad9a08548141d3713328e1bd3f533d137e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/k3s-selinux-1.5.stable.1/policy/slemicro/k3s-selinux.spec
new/k3s-selinux-1.6.stable.1/policy/slemicro/k3s-selinux.spec
--- old/k3s-selinux-1.5.stable.1/policy/slemicro/k3s-selinux.spec
2024-02-06 21:56:19.000000000 +0100
+++ new/k3s-selinux-1.6.stable.1/policy/slemicro/k3s-selinux.spec
2024-09-06 19:24:09.000000000 +0200
@@ -17,7 +17,6 @@
%define selinux_policyver 20210716-3.1
%define container_policyver 2.167.0-1
-%define container_policyver_max 2.191.0-1
Name: k3s-selinux
Version: %{k3s_selinux_version}
@@ -37,7 +36,7 @@
BuildRequires: selinux-policy-devel >= %{selinux_policyver}
Requires: policycoreutils, selinux-tools
-Requires(post): selinux-policy-base >= %{selinux_policyver}, policycoreutils,
container-selinux >= %{container_policyver}, container-selinux <
%{container_policyver_max}
+Requires(post): selinux-policy-base >= %{selinux_policyver}, policycoreutils,
container-selinux >= %{container_policyver}
Requires(postun): policycoreutils
Provides: %{name} = %{version}-%{release}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/k3s-selinux-1.5.stable.1/policy/slemicro/scripts/upload-repo
new/k3s-selinux-1.6.stable.1/policy/slemicro/scripts/upload-repo
--- old/k3s-selinux-1.5.stable.1/policy/slemicro/scripts/upload-repo
2024-02-06 21:56:19.000000000 +0100
+++ new/k3s-selinux-1.6.stable.1/policy/slemicro/scripts/upload-repo
2024-09-06 19:24:09.000000000 +0200
@@ -6,7 +6,9 @@
popd
yum install -y epel-release
-yum install -y git python2-pip python-deltarpm
+yum install -y git python2-pip python-deltarpm ca-certificates
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+
pip install --cache-dir=/var/cache/pip --upgrade 'boto3==1.17.112' 'pip<21.0'
'setuptools<45.0'
pip install --cache-dir=/var/cache/pip/ \
git+https://github.com/Voronenko/rpm-s3.git@5695c6ad9a08548141d3713328e1bd3f533d137e
