summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/core/tdebase/tdm.fc39.te19
-rw-r--r--redhat/core/tdebindings/tdebindings.spec5
-rw-r--r--redhat/dependencies/tqt3/tqt3.spec1
-rw-r--r--redhat/docker/f39/rpmmacros1
4 files changed, 23 insertions, 3 deletions
diff --git a/redhat/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te
index afe6de52a..3278f6ac9 100644
--- a/redhat/core/tdebase/tdm.fc39.te
+++ b/redhat/core/tdebase/tdm.fc39.te
@@ -2,10 +2,27 @@
module tdm 1.0;
require {
+ type etc_t;
type fprintd_t;
type init_t;
+ type tmp_t;
+ type unconfined_service_t;
+ type unconfined_t;
+ type var_run_t;
+ type xdm_t;
+ class capability2 mac_admin;
class dbus send_msg;
+ class fifo_file { getattr open read setattr };
+ class file { getattr lock map open read unlink write };
+ class lnk_file unlink;
+ class process transition;
}
-#============= fprintd_t ==============
allow fprintd_t init_t:dbus send_msg;
+allow unconfined_service_t unconfined_t:process transition;
+allow unconfined_t self:capability2 mac_admin;
+allow xdm_t etc_t:file write;
+allow xdm_t tmp_t:fifo_file { getattr open read setattr };
+allow xdm_t tmp_t:file { map open unlink };
+allow xdm_t tmp_t:lnk_file unlink;
+allow xdm_t var_run_t:file { getattr lock open read write };
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index ab5f9fa6d..27fb4156b 100644
--- a/redhat/core/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -1143,6 +1143,11 @@ if [ -d "/usr/include/python3.6m" ]; then
EXTRA_INCLUDES="/usr/include/python3.6m:${EXTRA_INCLUDES}"
fi
+# Fedora >= 39 comes with python 3.12, but we want version 3.11
+%if 0%{?fedora} >= 39
+export PYTHON=%{__python3}
+%endif
+
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \
--prefix=%{tde_prefix} \
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index 5feba7a23..3cab800ff 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -1290,7 +1290,6 @@ echo "sle_version = %{?sle_version}"
%endif
# fix variables in 'qmake.conf'
-distrib_cflags="$(rpm -E %optflags|sed -e "s/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2/")"
%__sed -i mkspecs/*/qmake.conf \
-e "s|^QMAKE_INCDIR_TQT.*|QMAKE_INCDIR_TQT = %{_includedir}/tqt3|" \
-e "s|\$(QTDIR)|/usr|g" \
diff --git a/redhat/docker/f39/rpmmacros b/redhat/docker/f39/rpmmacros
index 79cc08916..d5696f832 100644
--- a/redhat/docker/f39/rpmmacros
+++ b/redhat/docker/f39/rpmmacros
@@ -6,7 +6,6 @@
%__cmake_in_source_build 1
%_debugsource_packages %nil
%_debugsource_template %nil
-%_fortify_level 2
%source_date_epoch_from_changelog 0
# Use python3.11 instead of default python3.12