diff --git a/.gitignore b/.gitignore index 7aa5b07..3ddb904 100644 --- a/.gitignore +++ b/.gitignore @@ -226,3 +226,4 @@ libselinux-2.0.96.tgz /libselinux-3.4-rc3.tar.gz /libselinux-3.4.tar.gz /libselinux-3.5-rc1.tar.gz +/libselinux-3.5-rc2.tar.gz diff --git a/0001-Use-SHA-2-instead-of-SHA-1.patch b/0001-Use-SHA-2-instead-of-SHA-1.patch index 48d3126..a65d9cb 100644 --- a/0001-Use-SHA-2-instead-of-SHA-1.patch +++ b/0001-Use-SHA-2-instead-of-SHA-1.patch @@ -1,4 +1,4 @@ -From 7fb581c76b547b20a149c6dad3d7c51075192bd8 Mon Sep 17 00:00:00 2001 +From 1dbd23dc2566b3fe9113bf09fd9e190dfd4651b6 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Fri, 30 Jul 2021 14:14:37 +0200 Subject: [PATCH] Use SHA-2 instead of SHA-1 @@ -468,7 +468,7 @@ index 6b5f6921b82b..24604776974e 100644 current->path); diff --git a/libselinux/src/sha1.c b/libselinux/src/sha1.c deleted file mode 100644 -index a848467785f3..000000000000 +index 9d51e04ac331..000000000000 --- a/libselinux/src/sha1.c +++ /dev/null @@ -1,220 +0,0 @@ @@ -485,7 +485,7 @@ index a848467785f3..000000000000 -// Modified to: -// - stop symbols being exported for libselinux shared library - October 2015 -// Richard Haines --// - Not cast the workspace from a byte array to a CHAR64LONG16 due to alignment isses. +-// - Not cast the workspace from a byte array to a CHAR64LONG16 due to alignment issues. -// Fixes: -// sha1.c:73:33: error: cast from 'uint8_t *' (aka 'unsigned char *') to 'CHAR64LONG16 *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] -// CHAR64LONG16* block = (CHAR64LONG16*) workspace; @@ -1349,5 +1349,5 @@ index c4e0f836b260..80723f714264 100644 } default: -- -2.38.1 +2.39.0 diff --git a/libselinux.spec b/libselinux.spec index 05ea811..067cf9e 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -1,19 +1,19 @@ %define ruby_inc %(pkg-config --cflags ruby) -%define libsepolver 3.5-0 +%define libsepolver 3.5-0.rc2 Summary: SELinux library and simple utilities Name: libselinux Version: 3.5 -Release: 0.rc1.1%{?dist}.1 +Release: 0.rc2.1%{?dist} License: LicenseRef-Fedora-Public-Domain # https://github.com/SELinuxProject/selinux/wiki/Releases -Source0: https://github.com/SELinuxProject/selinux/releases/download/3.5-rc1/libselinux-3.5-rc1.tar.gz +Source0: https://github.com/SELinuxProject/selinux/releases/download/3.5-rc2/libselinux-3.5-rc2.tar.gz Source1: selinuxconlist.8 Source2: selinuxdefcon.8 Url: https://github.com/SELinuxProject/selinux/wiki # $ git clone https://github.com/fedora-selinux/selinux.git # $ cd selinux -# $ git format-patch -N 3.5-rc1 -- libselinux +# $ git format-patch -N 3.5-rc2 -- libselinux # $ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done # Patch list start Patch0001: 0001-Use-SHA-2-instead-of-SHA-1.patch @@ -87,7 +87,7 @@ The libselinux-static package contains the static libraries needed for developing SELinux applications. %prep -%autosetup -p 2 -n libselinux-%{version}-rc1 +%autosetup -p 2 -n libselinux-%{version}-rc2 %build export DISABLE_RPM="y" @@ -213,6 +213,9 @@ rm -f %{buildroot}%{_mandir}/man8/togglesebool* %{ruby_vendorarchdir}/selinux.so %changelog +* Mon Jan 16 2023 Petr Lautrbach - 3.5-0.rc2.1 +- SELinux userspace 3.5-rc2 release + * Wed Jan 04 2023 Mamoru TASAKA - 3.5-0.rc1.1.1 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 diff --git a/sources b/sources index 7fb0870..de0cdab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libselinux-3.5-rc1.tar.gz) = c4022a39d583a883944d6a6045605dd734448a36811a589248d0bf48e6ca1b0607c4480744778d7b9ae7cac916455a33d10f32b73c78a122ffc6090b8f7f6e12 +SHA512 (libselinux-3.5-rc2.tar.gz) = cf6056a9f618f0a122397606ef1718e8e7250d98157db452cca17f1ab2797f1b16a555e683e6f09ebdc1e4faae3baf28d6c009c526504ac2e7b08b10bc3cc8a0