From ddab224b431233637f44435253340ca24a7ab747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 30 May 2014 12:34:19 +0200 Subject: [PATCH] RPM Packaging: update 3.5.13.2 packages --- .../tde-guidance/tde-guidance-3.5.13.2.spec | 84 +++++++++++++------ ...ebase-3.5.13.2-fix_ice_security_hole.patch | 51 +++++++++++ redhat/tdebase/tdebase-3.5.13.2.spec | 48 +++++++++-- 3 files changed, 148 insertions(+), 35 deletions(-) create mode 100644 redhat/tdebase/tdebase-3.5.13.2-fix_ice_security_hole.patch diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec index 3202747e0..dc77f43b5 100644 --- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec +++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec @@ -32,7 +32,7 @@ Name: trinity-%{tde_pkg} Summary: A collection of system administration tools for Trinity Version: 0.8.0svn20080103 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -79,20 +79,24 @@ BuildRequires: sip-devel # PYTHON-QT support BuildRequires: python-qt3-devel -Requires: python-qt3 +BuildRequires: trinity-python-trinity-devel +Requires: python-qt3 Requires: trinity-python-trinity Requires: trinity-pytdeextensions -Requires: %{name}-backends = %{version}-%{release} Requires: python %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} Requires: hwdata %endif +Requires: %{name}-backends = %{version}-%{release} # POWERMANAGER support (requires HAL) %define with_powermanager 1 +# DISPLAYCONFIG support (deprecated) +#define with_displayconfig 1 + Obsoletes: trinity-guidance < %{version}-%{release} Provides: trinity-guidance = %{version}-%{release} @@ -110,8 +114,10 @@ or can be run as standalone applications. %files %defattr(-,root,root,-) %doc ChangeLog COPYING README TODO -#%{tde_bindir}/displayconfig -#%{tde_bindir}/displayconfig-restore +%if 0%{?with_displayconfig} +%{tde_bindir}/displayconfig +%{tde_bindir}/displayconfig-restore +%endif %{tde_bindir}/grubconfig %{tde_bindir}/mountconfig %{tde_bindir}/serviceconfig @@ -147,7 +153,9 @@ or can be run as standalone applications. %exclude %{tde_datadir}/apps/guidance/MonitorsDB # Files from powermanager +%if 0%{?with_powermanager} %exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%endif %exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png %exclude %{tde_datadir}/apps/guidance/pics/battery*.png %exclude %{tde_datadir}/apps/guidance/pics/processor.png @@ -184,9 +192,11 @@ Guidance configuration tools. %{python_sitearch}/%{name}/MicroHAL.py* %{python_sitearch}/%{name}/ScanPCI.py* %{python_sitearch}/%{name}/infimport.py* +%if 0%{?with_displayconfig} %{python_sitearch}/%{name}/displayconfigabstraction.py* %{python_sitearch}/%{name}/displayconfig-hwprobe.py* %{python_sitearch}/%{name}/displayconfig-restore.py* +%endif %{python_sitearch}/%{name}/drivedetect.py* %{python_sitearch}/%{name}/execwithcapture.py* %{python_sitearch}/%{name}/wineread.py* @@ -280,11 +290,11 @@ export KDEDIR=%{tde_prefix} export PYTHONDONTWRITEBYTECODE= # FTBFS on PCLOS ... -export CXXFLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}" +export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g" fi @@ -316,15 +326,15 @@ done ##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules) # install icons to right place %__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ +%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ +%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ +%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \ +#%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ +# %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png +%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \ %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png %__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \ %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png @@ -339,7 +349,7 @@ chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so %__mkdir_p %{buildroot}%{python_sitearch}/%{name} %__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name} -# fix the link properly +# Generates the startup scripts %__rm -f %{buildroot}%{tde_bindir}/* #%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig %__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig @@ -355,12 +365,12 @@ chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py -%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop +#%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop ##### BACKENDS INSTALLATION # install displayconfig-hwprobe.py script -%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ - %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py +#%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ +# %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py # The xf86misc stuff should not go under /opt/trinity bur under /usr !!! %__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch} @@ -389,7 +399,7 @@ chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so %__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name} # generate guidance-power-manager script -cat <%{buildroot}%{tde_bindir}/guidance-power-manager +cat <%{?buildroot}%{tde_bindir}/guidance-power-manager #!/bin/sh export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/python-qt3 %{python_sitearch}/%{name}/guidance-power-manager.py & @@ -407,9 +417,34 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py %__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py* %__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py* %__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py* - +%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui + %endif +# DISPLAYCONFIG (obsolete) +%if 0%{?with_displayconfig} +%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png +%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig +%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop + +# install displayconfig-hwprobe.py script +%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ + %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py + +%else +# Removes obsolete display config manager +%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig* +%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore +%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.* +%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py* +%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py* +%__rm -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop +%__rm -f %{buildroot}%{tde_datadir}/icons/*/*/apps/displayconfig.png +%__rm -fr %{buildroot}%{tde_datadir}/apps/guidance/pics/displayconfig +%endif + + # Replace all '#!' calls to python with /usr/bin/python # and make them executable for i in `find %{buildroot} -type f`; do @@ -428,19 +463,16 @@ done find %{buildroot} -name "*.egg-info" -exec rm -f {} \; find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; -# Removes obsolete display config manager -%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore -%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.* -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py* -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py* - %clean %__rm -rf %{buildroot} %changelog -* Fri Aug 16 2013 Francois Andriot - 0.8.0svn20080103-9 +* Sun May 18 2014 Francois Andriot - 0.8.0svn20080103-8 +- Backport fixes from R14 + +* Fri Aug 16 2013 Francois Andriot - 0.8.0svn20080103-7 - Build for Fedora 19 * Thu Jun 27 2013 Francois Andriot - 0.8.0svn20080103-6 diff --git a/redhat/tdebase/tdebase-3.5.13.2-fix_ice_security_hole.patch b/redhat/tdebase/tdebase-3.5.13.2-fix_ice_security_hole.patch new file mode 100644 index 000000000..e0096c6b9 --- /dev/null +++ b/redhat/tdebase/tdebase-3.5.13.2-fix_ice_security_hole.patch @@ -0,0 +1,51 @@ +commit c383da9dc680e5e79e75b84003eca7bfa08dd991 +Author: Timothy Pearson +Date: 1400559462 -0500 + + Forward port KDE SVN r803253 to fix potential security hole + +diff --git a/config.h.cmake b/config.h.cmake +index f5ebeeb..cacb97c 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -182,6 +182,7 @@ + + // ksmserver + #cmakedefine DBUS_SYSTEM_BUS "@DBUS_SYSTEM_BUS@" ++#cmakedefine HAVE__ICETRANSNOLISTEN 1 + + // ksplashml + #cmakedefine HAVE_XINERAMA 1 +diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt +index fdd521b..8578b01 100644 +--- a/ksmserver/CMakeLists.txt ++++ b/ksmserver/CMakeLists.txt +@@ -9,6 +9,8 @@ + # + ################################################# + ++include( ConfigureChecks.cmake ) ++ + if( NOT DBUS_SYSTEM_BUS ) + set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE ) + endif() +diff --git a/ksmserver/ConfigureChecks.cmake b/ksmserver/ConfigureChecks.cmake +new file mode 100644 +index 0000000..4f8cf79 +--- /dev/null ++++ b/ksmserver/ConfigureChecks.cmake +@@ -0,0 +1,12 @@ ++################################################# ++# ++# (C) 2014 Timothy Pearson ++# kb9vqf (AT) pearsoncomputing (DOT) net ++# ++# Improvements and feedback are welcome ++# ++# This file is released under GPL >= 2 ++# ++################################################# ++ ++check_library_exists( ICE _IceTransNoListen "" HAVE__ICETRANSNOLISTEN ) +\ No newline at end of file + diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec index 8aab6a970..b33bf3be1 100644 --- a/redhat/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/tdebase/tdebase-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-tdebase Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Trinity Base Programs Group: User Interface/Desktops @@ -115,6 +115,8 @@ Patch12: tdebase-3.5.13.2-kdesu-noignorebutton.patch Patch13: tdebase-3.5.13.2-fix_xdg_menu.patch ## [kdebase/tdm] Fix USER_PATH variable in TDM Patch14: tdebase-3.5.13.2-fix_tdm_user_path.patch +## [kdebase/Ksmserver] orward port KDE SVN r803253 to fix potential security hole [Commit #c383da9d] +Patch15: tdebase-3.5.13.2-fix_ice_security_hole.patch # Patches from Mandriva Patch101: tdebase-3.5.13.2-vibrate_dialog.patch @@ -198,6 +200,18 @@ Requires: fedora-release-notes %define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html %endif +# Fedora 20 Theme: "Heisenbug" +%if 0%{?fedora} == 20 +Requires: heisenbug-backgrounds-base +%define tde_bg /usr/share/backgrounds/heisenbug/default/standard/heisenbug.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png + +Requires: fedora-release-notes +%define tde_aboutlabel Fedora 20 +%define tde_aboutpage /usr/share/doc/fedora-release-notes/index.html +%endif + # RHEL 4 Theme %if 0%{?rhel} == 4 Requires: desktop-backgrounds-basic @@ -2674,7 +2688,6 @@ ever launching another application. %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase -%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase %{tde_datadir}/apps/konqueror/tiles/*.png %{tde_datadir}/autostart/konqy_preload.desktop %{tde_datadir}/config.kcfg/keditbookmarks.kcfg @@ -2938,7 +2951,7 @@ TDE will start, but many good defaults will not be set. %{tde_datadir}/apps/kconf_update/move_session_config.sh %{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png -# Remove conflicts with redhat-menus +# Workaround conflict with KDE4 %if "%{?tde_prefix}" != "/usr" %{tde_bindir}/plasma-desktop %endif @@ -3359,6 +3372,7 @@ Windows and Samba shares. %patch12 -p1 -b .kdesunoignorebutton %patch13 -p1 -b .xdgmenu %patch14 -p1 -b .tdmuserpath +%patch15 -p1 -b .iceauth %patch101 -p1 -b .vibrate_dialog %patch102 -p1 -b .kcontrol_menu_entry @@ -3416,6 +3430,20 @@ Windows and Samba shares. %__sed -i "kdm/kfrontend/genkdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" %endif +# Reboot command location may vary on some distributions +if [ -x "/usr/bin/reboot" ]; then + POWEROFF="/usr/bin/poweroff" + REBOOT="/usr/bin/reboot" +fi +if [ -n "${REBOOT}" ]; then + %__sed -i \ + "doc/kdm/kdmrc-ref.docbook" \ + "kcontrol/kdm/kdm-shut.cpp" \ + "kdm/config.def" \ + -e "s|/sbin/poweroff|${POWEROFF}|g" \ + -e "s|/sbin/reboot|${REBOOT}|g" +fi + %build unset QTDIR QTINC QTLIB @@ -3562,7 +3590,7 @@ EOF # TDM configuration %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/kdm/kdmrc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" @@ -3570,7 +3598,7 @@ EOF # Symlinks 'usb.ids' (Use system-provided version, not TDE provided version) %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?mgaversion} >= 4 %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" %else %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" @@ -3578,11 +3606,8 @@ EOF # Makes 'media_safelyremove.desktop' an alternative %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" -%__ln_s "%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" -%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives" -%__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" -# SUSE: creates DM config file, used by '/etc/init.d/xdm' +# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' %if 0%{?suse_version} >= 1210 %__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" @@ -3619,6 +3644,11 @@ EOF %changelog +* Sun May 18 2014 Francois Andriot - 3.5.13.2-4 +- Fix Fedora 20 theme +- Fix some Mageia 4 path problems +- Forward port KDE SVN r803253 to fix potential security hole [Commit #c383da9d] + * Fri Aug 16 2013 Francois Andriot - 3.5.13.2-3 - Build for Fedora 19