RPM: updates (cherry-pick from TDE R14.0.13)

Signed-off-by: François Andriot <albator78@libertysurf.fr>

13 files changed, 157 insertions, 4 deletions

diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el9 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el9
new file mode 120000
index 000000000..dab729b22
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.el9
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc37 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc37
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc37
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el9 b/redhat/main/tdebase/pamd.kdm-trinity-np.el9
new file mode 120000
index 000000000..3415e7d55
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.el9
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc37 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc37
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc37
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el9 b/redhat/main/tdebase/pamd.kdm-trinity.el9
new file mode 120000
index 000000000..f85413ec6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.el9
@@ -0,0 +1 @@
+pamd.kdm-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc37 b/redhat/main/tdebase/pamd.kdm-trinity.fc37
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc37
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+-auth       optional    pam_gnome_keyring.so
+-auth       optional    pam_kwallet.so
+-auth       optional    pam_kwallet5.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet.so
+-session    optional    pam_kwallet5.so
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el9 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el9
new file mode 120000
index 000000000..a5fab9e3e
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.el9
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc37 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc37
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc37
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 9427a628b..ce8582aaa 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -28,6 +28,7 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -164,6 +165,14 @@ Requires:	redhat-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
 %endif
 
+# Rocky 9 Theme
+%if 0%{?rocky} == 9
+Requires:	rocky-backgrounds
+Requires:	rocky-logos
+%define tde_bg /usr/share/backgrounds/rocky-default-9-abstract-1-day.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+%endif
+
 # Mageia Theme
 %if 0%{?mgaversion}
 Requires:	mageia-theme-Default
@@ -248,8 +257,13 @@ BuildRequires:	pam-devel
 BuildRequires:	%{_lib}usb1.0-devel
 BuildRequires:	%{_lib}usb-compat0.1-devel
 %else
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
 BuildRequires:	libusb-devel
 %endif
+%endif
 
 # ESOUND support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -262,7 +276,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -332,7 +346,7 @@ BuildRequires:	OpenEXR-devel
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
 #  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -487,12 +501,15 @@ BuildRequires:	x11-proto-devel
 BuildRequires:	xorg-x11-proto-devel
 %endif
 
-%if 0%{?rhel} >= 5 || 0%{?fedora}
+%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?fedora}
 BuildRequires:	xorg-x11-font-utils
 %endif
 
 %if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
 BuildRequires:	font-util
+%endif
+
+%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 || 0%{?rhel} >= 9
 BuildRequires:	bdftopcf
 %endif
 
@@ -543,6 +560,16 @@ BuildRequires:	checkpolicy
 BuildRequires:	selinux-policy-devel
 %endif
 
+# LIBSSH support
+%if 0%{?rhel} == 6
+%define with_libssh 0
+%else
+%define with_libssh 1
+%endif
+%if 0%{?with_libssh}
+BuildRequires:	libssh-devel
+%endif
+
 # tdebase is a metapackage that installs all sub-packages
 Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -731,6 +758,7 @@ creates menu entries for them.
 %{tde_datadir}/applnk/System/kappfinder.desktop
 %{tde_datadir}/apps/kappfinder
 %{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
+%{tde_mandir}/man1/kappfinder.1*
 
 ##########
 
@@ -789,6 +817,7 @@ Some random features:
 %{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
 %{tde_datadir}/servicetypes/kateplugin.desktop
 %{tde_tdedocdir}/HTML/en/kate/
+%{tde_mandir}/man1/kate.1*
 
 ##########
 
@@ -831,7 +860,7 @@ Kwrite is an advanced text editor for TDE.
 %{tde_datadir}/icons/hicolor/*/apps/kwrite.png
 %{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
 %{tde_tdedocdir}/HTML/en/kwrite/
-
+%{tde_mandir}/man1/kwrite.1*
 
 ##########
 
@@ -1257,6 +1286,22 @@ TDE applications, particularly those in the TDE base module.
 %{tde_tdedocdir}/HTML/en/tdesu/
 %{tde_tdedocdir}/HTML/en/knetattach/
 %{tde_tdedocdir}/HTML/en/kxkb/
+%{tde_mandir}/man1/drkonqi.1*
+%{tde_mandir}/man1/kblankscrn.kss.1*
+%{tde_mandir}/man1/kcheckpass.1*
+%{tde_mandir}/man1/kcminit.1*
+%{tde_mandir}/man1/kdcop.1*
+%{tde_mandir}/man1/kdialog.1*
+%{tde_mandir}/man1/khotkeys.1*
+%{tde_mandir}/man1/knetattach.1*
+%{tde_mandir}/man1/krandom.kss.1*
+%{tde_mandir}/man1/kreadconfig.1*
+%{tde_mandir}/man1/kstart.1*
+%{tde_mandir}/man1/ksystraycmd.1*
+%{tde_mandir}/man1/kwriteconfig.1*
+%{tde_mandir}/man1/kxkb.1*
+%{tde_mandir}/man1/tdedebugdialog.1*
+%{tde_mandir}/man1/tdesu.1*
 
 # SETUID binaries
 # Some setuid binaries need special care
@@ -1698,8 +1743,10 @@ group.
 %{tde_tdelibdir}/tdeio_remote.so
 %{tde_tdelibdir}/tdeio_settings.la
 %{tde_tdelibdir}/tdeio_settings.so
+%if 0%{?with_libssh}
 %{tde_tdelibdir}/tdeio_sftp.la
 %{tde_tdelibdir}/tdeio_sftp.so
+%endif
 %{tde_tdelibdir}/tdeio_system.la
 %{tde_tdelibdir}/tdeio_system.so
 %{tde_tdelibdir}/tdeio_tar.la
@@ -1756,7 +1803,9 @@ group.
 %{tde_datadir}/services/programs.protocol
 %{tde_datadir}/services/remote.protocol
 %{tde_datadir}/services/settings.protocol
+%if 0%{?with_libssh}
 %{tde_datadir}/services/sftp.protocol
+%endif
 %{tde_datadir}/services/system.protocol
 %{tde_datadir}/services/tar.protocol
 %{tde_datadir}/services/textthumbnail.desktop
@@ -1767,6 +1816,9 @@ group.
 %{tde_datadir}/servicetypes/thumbcreator.desktop
 %{tde_datadir}/services/tdefile_trash.desktop
 %{tde_tdedocdir}/HTML/en/tdeioslave/
+%{tde_mandir}/man1/ktrash.1*
+%{tde_mandir}/man1/tdeio_media_mounthelper.1*
+%{tde_mandir}/man1/tdeio_system_documenthelper.1*
 
 %if 0%{?with_exr}
 %{tde_tdelibdir}/exrthumbnail.la
@@ -1836,6 +1888,7 @@ system passwords.
 %{_datadir}/faces/Star.png
 %{_datadir}/faces/Teddybear.png
 %{_datadir}/faces/Turtle.png
+%{tde_mandir}/man1/tdepasswd.1*
 
 ##########
 
@@ -1898,6 +1951,9 @@ Installation of smbclient will make you able to use smb shared printers.
 %{tde_tdedocdir}/HTML/en/tdeprint/
 %{tde_tdedocdir}/HTML/en/tdeprintfax/
 %{tde_tdedocdir}/HTML/en/kjobviewer/
+%{tde_mandir}/man1/kjobviewer.1*
+%{tde_mandir}/man1/kprinter.1*
+%{tde_mandir}/man1/tdeprintfax.1*
 
 ##########
 
@@ -2030,6 +2086,12 @@ already. Most users won't need this.
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
 %endif
+%{tde_mandir}/man1/gentdmconf.1*
+%{tde_mandir}/man1/krootimage.1*
+%{tde_mandir}/man1/tdm.1*
+%{tde_mandir}/man1/tdmctl.1*
+%{tde_mandir}/man1/tdm_config.1*
+%{tde_mandir}/man1/tdm_greet.1*
 
 %if "%{?tde_version}" == "14.1.0"
 %{tde_bindir}/tdecryptocardwatcher
@@ -2191,6 +2253,7 @@ workstations.
 %{tde_datadir}/services/kfindpart.desktop
 %{tde_datadir}/servicetypes/findpart.desktop
 %{tde_tdedocdir}/HTML/en/kfind/
+%{tde_mandir}/man1/kfind.1*
 
 ##########
 
@@ -2340,6 +2403,10 @@ functionality.
 %if 0%{?mgaversion} >= 3
 %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
 %endif
+%{tde_mandir}/man1/appletproxy.1*
+%{tde_mandir}/man1/extensionproxy.1*
+%{tde_mandir}/man1/kasbar.1*
+%{tde_mandir}/man1/kicker.1*
 
 ##########
 
@@ -2428,6 +2495,7 @@ structure.
 %{tde_datadir}/apps/kcontroledit/
 %{tde_datadir}/apps/kmenuedit/
 %{tde_tdedocdir}/HTML/en/kmenuedit/
+%{tde_mandir}/man1/kmenuedit.1*
 
 ##########
 
@@ -2560,6 +2628,9 @@ ever launching another application.
 %{tde_datadir}/servicetypes/konqaboutpage.desktop
 %{tde_tdedocdir}/HTML/en/konqueror/
 %{tde_tdedocdir}/HTML/en/keditbookmarks/
+%{tde_mandir}/man1/keditbookmarks.1*
+%{tde_mandir}/man1/kfmclient.1*
+%{tde_mandir}/man1/konqueror.1*
 
 %post -n trinity-konqueror
 if [ $1 -eq 1 ]; then
@@ -2667,6 +2738,7 @@ Using Konsole, a user can open:
 %{tde_tdedocdir}/HTML/en/konsole/
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
 %config %{_sysconfdir}/fonts/conf.d/99-konsole.conf
+%{tde_mandir}/man1/konsole.1*
 
 ##########
 
@@ -2687,6 +2759,7 @@ applications. It is used to switch between applications or desktops.
 %{tde_datadir}/applnk/Utilities/kpager.desktop
 %{tde_datadir}/icons/hicolor/*/apps/kpager.png
 %{tde_tdedocdir}/HTML/en/kpager/
+%{tde_mandir}/man1/kpager.1*
 
 ##########
 
@@ -2708,6 +2781,7 @@ automatically started. KPersonalizer can also be called later.
 %{tde_datadir}/applnk/System/kpersonalizer.desktop
 %{tde_datadir}/apps/kpersonalizer/
 %{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
+%{tde_mandir}/man1/kpersonalizer.1*
 
 ##########
 
@@ -2745,6 +2819,7 @@ TDE will start, but many good defaults will not be set.
 %{tde_datadir}/apps/tdeconf_update/ksmserver.upd
 %{tde_datadir}/apps/tdeconf_update/move_session_config.sh
 %{tde_datadir}/apps/ksmserver/
+%{tde_mandir}/man1/starttde.1*
 
 %post -n trinity-ksmserver
 %if 0%{?mdkversion} || 0%{?mgaversion}
diff --git a/redhat/main/tdebase/tdm.el9.te b/redhat/main/tdebase/tdm.el9.te
new file mode 120000
index 000000000..034e33247
--- /dev/null
+++ b/redhat/main/tdebase/tdm.el9.te
@@ -0,0 +1 @@
+tdm.el8.te
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.fc37.te b/redhat/main/tdebase/tdm.fc37.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc37.te
@@ -0,0 +1,11 @@
+
+module tdm 1.0;
+
+require {
+	type fprintd_t;
+	type init_t;
+	class dbus send_msg;
+}
+
+#============= fprintd_t ==============
+allow fprintd_t init_t:dbus send_msg;
diff --git a/redhat/main/tdebase/tdm.service.el9 b/redhat/main/tdebase/tdm.service.el9
new file mode 120000
index 000000000..87f56ea08
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.el9
@@ -0,0 +1 @@
+tdm.service.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.service.fc37 b/redhat/main/tdebase/tdm.service.fc37
new file mode 100644
index 000000000..9ef7e07ff
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc37
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service