RPM: updates for Fedora 36

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

14 files changed, 390 insertions, 8 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 2254088e6..440ddb369 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -193,7 +193,7 @@ ifneq (,$(filter $(DIST),.oss150 .oss151))
 endif
 
 wv2:
-ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35))
+ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 ))
 	$(call buildpkg,3rdparty/wv2)
 endif
 
diff --git a/redhat/applications/knemo/knemo.spec b/redhat/applications/knemo/knemo.spec
index 630273418..29ef60d10 100644
--- a/redhat/applications/knemo/knemo.spec
+++ b/redhat/applications/knemo/knemo.spec
@@ -98,6 +98,7 @@ BuildRequires:	libidn-devel
 BuildRequires:	openssl-devel
 
 # Wireless support
+%define with_wifi 1
 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
 BuildRequires: wireless-tools-devel
 %endif
@@ -159,6 +160,7 @@ fi
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
   \
   -DWITH_ALL_OPTIONS=ON \
+  %{!?with_wifi:-DWITH_LIBIW=OFF} \
   -DWITH_GCC_VISIBILITY=ON \
   \
   -DBUILD_ALL=ON \
diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec
index 2eb075d59..823f48b66 100644
--- a/redhat/applications/wlassistant/wlassistant.spec
+++ b/redhat/applications/wlassistant/wlassistant.spec
@@ -171,7 +171,7 @@ fi
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  -DBUILD_ALL=on \
+  -DBUILD_ALL=ON \
   ..
 
 %__make %{?_smp_mflags}
diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64
new file mode 100644
index 000000000..80c5d583c
--- /dev/null
+++ b/redhat/docker/f36/Dockerfile.x86_64
@@ -0,0 +1,40 @@
+FROM fedora:36
+
+ARG TDE_VERSION=14.0.12
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-36.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
diff --git a/redhat/docker/f36/packages b/redhat/docker/f36/packages
new file mode 100644
index 000000000..71b1f0d27
--- /dev/null
+++ b/redhat/docker/f36/packages
@@ -0,0 +1,238 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f36/rpmbuild.repo b/redhat/docker/f36/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f36/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f36/rpmmacros b/redhat/docker/f36/rpmmacros
new file mode 100644
index 000000000..22a794cc1
--- /dev/null
+++ b/redhat/docker/f36/rpmmacros
@@ -0,0 +1,6 @@
+%dist .fc36
+%_smp_mflags -j8
+%jobs 8
+%__cmake_builddir %nil
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc36
@@ -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.fc36 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc36
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc36
@@ -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.fc36 b/redhat/main/tdebase/pamd.kdm-trinity.fc36
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc36
@@ -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.fc36 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc36
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc36
@@ -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/tdm.fc36.te b/redhat/main/tdebase/tdm.fc36.te
new file mode 100644
index 000000000..afe6de52a
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc36.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.fc36 b/redhat/main/tdebase/tdm.service.fc36
new file mode 100644
index 000000000..9ef7e07ff
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc36
@@ -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
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 06a5369c0..c7681f983 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -175,12 +175,9 @@ BuildRequires:	libXxf86vm-devel
 ## Conditional build:
 # RHEL6: xmms is outdated !
 #define _with_xmms --with-xmms
-%ifnarch s390 s390x
-%define _with_wifi --with-wifi
-%endif
 
 # Wifi support
-%if "%{?_with_wifi:1}" == "1"
+%define with_wifi 1
 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
 BuildRequires: wireless-tools-devel
 %endif
@@ -193,7 +190,6 @@ BuildRequires: wireless-tools
 %if 0%{?suse_version} || 0%{?mgaversion} >= 3
 BuildRequires:	libiw-devel
 %endif
-%endif
 
 # OpenSLP support
 %if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -288,7 +284,9 @@ Requires: trinity-krdc = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-krfb = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-ktalkd = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_wifi}
 Requires: trinity-kwifimanager = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 Requires: trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-lisa = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -311,7 +309,9 @@ Networking applications, including:
 * krfb: Desktop Sharing server, allow others to access your desktop via VNC
 * ksirc: IRC client for Trinity
 * ktalkd: Talk daemon for Trinity
+%if 0%{?with_wifi}
 * kwifimanager: Wireless lan manager for Trinity
+%endif
 * librss: RSS library for Trinity
 * lisa: lan information server
 
@@ -947,7 +947,8 @@ and shouldn't be run on a multi-user machine.
 
 ##########
 
-%if "%{?_with_wifi:1}" == "1"
+%if 0%{?with_wifi}
+
 %package -n trinity-kwifimanager
 Summary:		Wireless lan manager for Trinity
 Group:			Applications/Internet
@@ -973,6 +974,7 @@ wavelan card that uses the wireless extensions interface.
 %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
 %{tde_tdedocdir}/HTML/en/kwifimanager/
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/
+
 %endif
 
 ##########
@@ -1064,8 +1066,10 @@ A tdeioslave and tded module that provide Zeroconf support. Try
 
 # Workaround libiw detection failure on opensuse
 %if 0%{?suse_version}
+%if 0%{?with_wifi}
 %__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|"
 %endif
+%endif
 
 # Update icons for some control center modules
 %__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|"
@@ -1115,6 +1119,7 @@ fi
   %{!?build_kopete_motionaway:-DBUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY=OFF} \
   %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \
   %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \
+  %{!?with_wifi:-DBUILD_WIFI=OFF} \
   ..
 
 # Tdenetwork is not smp safe !
@@ -1177,6 +1182,12 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
   fi
 done
 
+# Remove unwanted doc
+%if 0%{?with_wifi} == 0
+%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/"
+%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kwifimanager/"
+%endif
+
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file    kcmkrfb
@@ -1189,8 +1200,10 @@ done
 %suse_update_desktop_file -r krdc          System   RemoteAccess
 %suse_update_desktop_file -r krfb          System   RemoteAccess
 %suse_update_desktop_file -r kget          System   TrayIcon
+%if 0%{?with_wifi}
 %suse_update_desktop_file -r kwifimanager  System   Network
 %suse_update_desktop_file    kcmwifi
+%endif
 %suse_update_desktop_file -u knewsticker-standalone Network  News
 %suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop
 %endif