- Move restorecond into its own subpackage

2010-09-23 16:23:05 -04:00 · 2010-09-23 16:23:05 -04:00 · cccd96b8cf
parent e500ad80f0
commit cccd96b8cf
6 changed files with 81191 additions and 65737 deletions
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
--- a/policycoreutils-po.patch
+++ b/policycoreutils-po.patch
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@ -7,8 +7,8 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.83
-Release: 9%{?dist}
-License: GPLv2+
+Release: 30%{?dist}
+License: GPLv2
 Group:	 System Environment/Base
 Source:  http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
 Source1: http://www.nsa.gov/selinux/archives/sepolgen-%{sepolgenver}.tgz
@ -81,6 +81,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/rc.d/init.d
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/24x24/apps
 %{__mkdir} -p %{buildroot}%{_datadir}/pixmaps
+%{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}-%{version}/
+cp COPYING %{buildroot}/%{_usr}/share/doc/%{name}-%{version}/

 make LSPP_PRIV=y  DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install
 make -C sepolgen-%{sepolgenver} DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install
@ -91,11 +93,10 @@ install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/system-config-selinux
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/system-config-selinux
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/selinux-polgengui
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/console.apps/system-config-selinux
-install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/security/console.apps/selinux-polgengui
 tar -jxf %{SOURCE8} -C %{buildroot}/
 rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
 ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
-ln -sf consolehelper %{buildroot}%{_bindir}/selinux-polgengui
+ln -sf /usr/share/system-config-selinux/polgengui.py %{buildroot}%{_bindir}/selinux-polgengui

 desktop-file-install	--vendor fedora \
 			--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
@ -116,7 +117,7 @@ Requires: audit-libs-python >=  %{libauditver}
 Requires: /usr/bin/make
 Requires(pre): python >= 2.6
 Obsoletes: policycoreutils < 2.0.61-2
-Requires: setools-libs-python
+Requires: setools-libs-python >= setools-3.3.7-6

 %description python
 The policycoreutils-python package contains the management tools use to manage an SELinux environment.
@ -227,7 +228,6 @@ system-config-selinux is a utility for managing the SELinux environment
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-selinux
 %config(noreplace) %{_sysconfdir}/pam.d/selinux-polgengui
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-selinux
-%config(noreplace) %{_sysconfdir}/security/console.apps/selinux-polgengui

 %clean
 rm -rf %{buildroot}
@ -241,7 +241,6 @@ rm -rf %{buildroot}
 %{_sbindir}/seunshare
 %{_sbindir}/genhomedircon
 %{_sbindir}/load_policy
-%{_sbindir}/restorecond
 %{_sbindir}/setsebool
 %{_sbindir}/semodule
 %{_sbindir}/sestatus
@ -257,11 +256,6 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/pam.d/newrole
 %config(noreplace) %{_sysconfdir}/pam.d/run_init
 %config(noreplace) %{_sysconfdir}/sestatus.conf
-%attr(755,root,root) /etc/rc.d/init.d/restorecond
-%config(noreplace) /etc/selinux/restorecond.conf
-%config(noreplace) /etc/selinux/restorecond_user.conf
-%{_sysconfdir}/xdg/autostart/restorecond.desktop
-%{_datadir}/dbus-1/services/org.selinux.Restorecond.service
 # selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
 %{_mandir}/man8/fixfiles.8*
 %{_mandir}/ru/man8/fixfiles.8*
@ -271,8 +265,6 @@ rm -rf %{buildroot}
 %{_mandir}/ru/man8/open_init_pty.8*
 %{_mandir}/man8/restorecon.8*
 %{_mandir}/ru/man8/restorecon.8*
-%{_mandir}/man8/restorecond.8*
-%{_mandir}/ru/man8/restorecond.8*
 %{_mandir}/man8/run_init.8*
 %{_mandir}/ru/man8/run_init.8*
 %{_mandir}/man8/semodule.8*
@ -295,25 +287,114 @@ rm -rf %{buildroot}
 %{_mandir}/ru/man1/secon.1*
 %{_mandir}/man8/seunshare.8*
 %{_mandir}/man8/genhomedircon.8*
+%doc %{_usr}/share/doc/%{name}-%{version}

-%preun
+%package restorecond
+Summary: SELinux restorecond utilities
+Group:	 System Environment/Base
+Requires(post): /sbin/chkconfig
+
+%description restorecond
+The policycoreutils-restorecond package contains the restorecond service.
+
+%files restorecond
+%defattr(-,root,root,-)
+%{_sbindir}/restorecond
+%attr(755,root,root) /etc/rc.d/init.d/restorecond
+%config(noreplace) /etc/selinux/restorecond.conf
+%config(noreplace) /etc/selinux/restorecond_user.conf
+%{_sysconfdir}/xdg/autostart/restorecond.desktop
+%{_datadir}/dbus-1/services/org.selinux.Restorecond.service
+%{_mandir}/man8/restorecond.8*
+%{_mandir}/ru/man8/restorecond.8*
+
+%preun restorecond
 if [ $1 -eq 0 ]; then
   /sbin/service restorecond stop > /dev/null 2>&1
   /sbin/chkconfig --del restorecond
 fi
 exit 0

-%post
+%post restorecond
 /sbin/chkconfig --add restorecond
 exit 0

-%postun
+%postun restorecond
 if [ "$1" -ge "1" ]; then 
   [ -x /sbin/service ] && /sbin/service restorecond condrestart  > /dev/null
 fi
 exit 0

 %changelog
+* Thu Sep 23 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-30
+- Move restorecond into its own subpackage
+
+* Thu Sep 23 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-29
+- Fix semanage man page
+
+* Mon Sep 13 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-28
+- Add seremote, to allow the execution of command inside the sandbox from outside the sandbox.
+
+* Mon Sep 13 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-27
+- Fix sandbox copyfile when copying a dir with a socket, print error
+
+* Fri Sep 10 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-26
+- Stop polgengui from crashing if selinux policy is not installed
+
+* Thu Sep 9 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-25
+- Fix bug preventing sandbox from using -l 
+
+* Tue Sep 7 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-24
+- Eliminate quotes fro desktop files
+
+* Mon Aug 30 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-23
+- Add -w windowsize patch from Christoph A.
+
+* Mon Aug 30 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-22
+- Update po
+
+* Wed Aug 25 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-21
+- Update po
+
+* Tue Aug 24 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-20
+- Tighten down seunshare to create /tmp dir with sticky bit and  MS_NODEV | MS_NOSUID | MS_NOEXEC;
+- Remove setsid on seunshare so ^c on sandbox will cause apps to exit
+- Add dbus-launch --exit-with-session so all processes launched within the sandbox exit with the sandbox
+- Clean up error handling so error will get sent back to sandbox tool
+
+* Mon Aug 23 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-19
+- Fix translation handling in file context page of system-config-selinux
+
+* Fri Aug 13 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-18
+- Fix sandbox error handling
+
+* Fri Aug 13 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-17
+- Apply patch to restorecond from Chris Adams, which will cause restorecond 
+- to watch first user that logs in.
+
+* Thu Aug 12 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-16
+- Add COPYING file to doc dir
+
+* Thu Aug 5 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-15
+- Update po and translations
+Resolves: #610473
+
+* Thu Aug 5 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-14
+- More fixes for polgen tools
+
+* Thu Aug 5 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-13
+- Remove requirement to run selinux-polgen as root
+
+* Thu Aug 5 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-12
+- Update po and translations
+- Fix gui policy generation tools
+
+* Wed Aug 4 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-11
+- Update po and translations
+
+* Sat Jul 31 2010 David Malcolm <dmalcolm@redhat.com> - 2.0.83-10
+- rebuild against python 2.7
+
 * Wed Jul 28 2010 Dan Walsh <dwalsh@redhat.com> 2.0.83-9
 - Update selinux-polgengui to sepolgen policy generation

--- a/selinux-polgengui.desktop
+++ b/selinux-polgengui.desktop
@ -1,36 +1,60 @@
 [Desktop Entry]
 Name=SELinux Policy Generation Tool
-Name[de]="Tool zur Erstellung von SELinux-Richtlinien"
-Name[es]="Herramienta de Generación de Políticas de SELinux"
-Name[gu]="SELinux પોલિસી બનાવટ સાધન"
-Name[it]="Tool di generazione della policy di SELinux"
-Name[ja]="SELinux ポリシー生成ツール"
-Name[kn]="SELinux ಪಾಲಿಸಿ ಉತ್ಪಾದನಾ ಉಪಕರಣ"
-Name[mr]="SELinux करार निर्माण साधन"
-Name[nl]="SELinux tactiek generatie gereedschap"
-Name[or]="SELinux ନୀତି ସୃଷ୍ଟି ଉପକରଣ"
-Name[pa]="SELinux ਪਾਲਿਸੀ ਨਿਰਮਾਣ ਜੰਤਰ"
-Name[pl]="Narzędzie tworzenia polityki SELinuksa"
-Name[pt_BR]="Ferramenta de criação de políticas do SELinux"
-Name[ru]="Средство создания политики SELinux"
-Name[te]="SELinux నిర్వహణ"
-Name[zh_CN]="SELinux 策略生成工具"
+Name[bn_IN]=SELinux Policy নির্মাণের সামগ্রী
+Name[ca]=Eina de generació de polítiques del SELinux
+Name[de]=Tool zur Erstellung von SELinux-Richtlinien
+Name[es]=Generador de Políticas de SELinux
+Name[fi]=SELinux-käytäntöjen generointityökalu
+Name[fr]=Outil de génération de stratégies SELinux
+Name[gu]=SELinux પોલિસી બનાવટ સાધન
+Name[hi]=SELinux पॉलिसी जनन औजार
+Name[it]=Tool di generazione della policy di SELinux
+Name[ja]=SELinux ポリシー生成ツール
+Name[kn]=SELinux ಪಾಲಿಸಿ ಉತ್ಪಾದನಾ ಉಪಕರಣ
+Name[ko]=SELinux 정책 생성 도구
+Name[ml]=SELinux പോളിസി ഉത്പാദന പ്രയോഗം
+Name[mr]=SELinux करार निर्माण साधन
+Name[nl]=SELinux tactiek generatie gereedschap
+Name[or]=SELinux ନୀତି ସୃଷ୍ଟି ଉପକରଣ
+Name[pa]=SELinux ਪਾਲਿਸੀ ਨਿਰਮਾਣ ਜੰਤਰ
+Name[pl]=Narzędzie tworzenia polityki SELinuksa
+Name[pt]=Ferramenta de Geração de Políticas SELinux
+Name[pt_BR]=Ferramenta de criação de políticas do SELinux
+Name[ru]=Средство создания политики SELinux
+Name[sv]=Genereringsverktyg för SELinuxpolicy
+Name[ta]=SELinux பாலிசி உற்பத்தி கருவி
+Name[te]=SELinux నిర్వహణ
+Name[uk]=Утиліта генерації політики SELinux
+Name[zh_CN]=SELinux 策略生成工具
+Name[zh_TW]=SELinux 政策產生工具（SELinux Policy Generation Tool）
 Comment=Generate SELinux policy modules
-Comment[de]="Tool zur Erstellung von SELinux-Richtlinien"
-Comment[es]="Generar módulos de política de SELinux"
-Comment[gu]="SELinux પોલિસી મોડ્યુલોને ઉત્પન્ન કરો"
-Comment[it]="Genera moduli della politica di SELinux"
-Comment[ja]="新しいポリシーモジュールの作成"
-Comment[kn]="SELinux ಪಾಲಿಸಿ ಘಟಕಗಳನ್ನು ಉತ್ಪಾದಿಸು"
-Comment[mr]="SELinux करार घटके निर्माण करा"
-Comment[nl]="Maak een SELinux tactiek module aan"
-Comment[or]="SELinux ନୀତି ଏକକାଂଶ ସୃଷ୍ଟିକରନ୍ତୁ"
-Comment[pa]="SELinux ਪਾਲਿਸੀ ਮੈਡਿਊਲ ਬਣਾਓ"
-Comment[pl]="Tworzenie nowych modułów polityki SELinuksa"
-Comment[pt_BR]="Gerar módulos de política do SELinux"
-Comment[ru]="Генерация модулей политики SELinux"
-Comment[te]="SELinux పాలసీ మాడ్యూళ్ళను వుద్భవింపచేయుము"
-Comment[zh_CN]="生成 SELinux 策略模块"
+Comment[bn_IN]=SELinux নিয়মনীতির মডিউল নির্মাণ করুন
+Comment[ca]=Genera els mòduls de les polítiques de SELinux
+Comment[de]=Tool zur Erstellung von SELinux-Richtlinien
+Comment[es]=Generar módulos de política de SELinux
+Comment[fi]=Generoi SELinuxin käytäntömoduuleja
+Comment[fr]=Génére des modules de stratégie SELinux
+Comment[gu]=SELinux પોલિસી મોડ્યુલોને ઉત્પન્ન કરો
+Comment[hi]=नया पॉलिसी मॉड्यूल उत्पन्न करें
+Comment[it]=Genera moduli della politica di SELinux
+Comment[ja]=新しいポリシーモジュールの作成
+Comment[kn]=SELinux ಪಾಲಿಸಿ ಘಟಕಗಳನ್ನು ಉತ್ಪಾದಿಸು
+Comment[ko]=SELinux 정책 모듈 생성
+Comment[ml]=SELinux യ പോളിസി ഘങ്ങള്‍ തയ്യാറാക്കുക
+Comment[mr]=SELinux करार घटके निर्माण करा
+Comment[nl]=Maak een SELinux tactiek module aan
+Comment[or]=SELinux ନୀତି ଏକକାଂଶ ସୃଷ୍ଟିକରନ୍ତୁ
+Comment[pa]=SELinux ਪਾਲਿਸੀ ਮੈਡਿਊਲ ਬਣਾਓ
+Comment[pl]=Tworzenie nowych modułów polityki SELinuksa
+Comment[pt]=Gerar módulos de políticas SELinux
+Comment[pt_BR]=Gerar módulos de política do SELinux
+Comment[ru]=Генерация модулей политики SELinux
+Comment[sv]=Generera SELinux-policymoduler
+Comment[ta]=SELinux கொள்கை தொகுதியை உருவாக்கவும்
+Comment[te]=SELinux పాలసీ మాడ్యూళ్ళను వుద్భవింపచేయుము
+Comment[uk]=Створення модулів контролю доступу SELinux
+Comment[zh_CN]=生成 SELinux 策略模块
+Comment[zh_TW]=產生 SELinux 政策模組
 StartupNotify=true
 Icon=system-config-selinux
 Exec=/usr/bin/selinux-polgengui
--- a/system-config-selinux.desktop
+++ b/system-config-selinux.desktop
@ -1,36 +1,60 @@
 [Desktop Entry]
 Name=SELinux Management
-Name[de]="SELinux-Management"
-Name[es]="Administración de SELinux"
-Name[gu]="SELinux સંચાલન"
-Name[jp]="SELinux 管理"
-Name[it]="Gestione di SELinux"
-Name[kn]="SELinux ವ್ಯವಸ್ಥಾಪನೆ"
-Name[mr]="SELinux मॅनेजमेंट"
-Name[nl]="SELinux beheer"
-Name[or]="SELinux ପରିଚାଳନା"
-Name[pa]="SELinux ਮੈਨੇਜਮੈਂਟ"
-Name[pl]="Zarządzanie SELinuksem"
-Name[pt_BR]="Gerenciamento do SELinux"
-Name[ru]="Управление SELinux"
-Name[te]="SELinux నిర్వహణ"
-Name[zh_CN]="SELinux 管理"
+Name[bn_IN]=SELinux পরিচালনা
+Name[de]=SELinux-Management
+Name[ca]=Gestió de SELinux
+Name[es]=Administración de SELinux
+Name[fi]=SELinuxin ylläpito
+Name[fr]=Gestion de SELinux
+Name[gu]=SELinux સંચાલન
+Name[hi]=SELinux प्रबंधन
+Name[jp]=SELinux 管理
+Name[it]=Gestione di SELinux
+Name[kn]=SELinux ವ್ಯವಸ್ಥಾಪನೆ
+Name[ko]=SELinux 관리
+Name[ml]=SELinux മാനേജ്മെന്റ്
+Name[mr]=SELinux मॅनेजमेंट
+Name[nl]=SELinux beheer
+Name[or]=SELinux ପରିଚାଳନା
+Name[pa]=SELinux ਮੈਨੇਜਮੈਂਟ
+Name[pl]=Zarządzanie SELinuksem
+Name[pt_BR]=Gerenciamento do SELinux
+Name[pt]=Gestão de SELinux
+Name[ru]=Управление SELinux
+Name[sv]=SELinux-hantering
+Name[ta]=SELinux மேலாண்மை
+Name[te]=SELinux నిర్వహణ
+Name[uk]=Керування SELinux
+Name[zh_CN]=SELinux 管理
+Name[zh_TW]=SELinux 管理
 Comment=Configure SELinux in a graphical setting
-Comment[de]="SELinux in einer grafischen Einstellung konfigurieren"
-Comment[es]="Defina SELinux en una configuración de interfaz gráfica"
-Comment[gu]="ગ્રાફિકલ સુયોજનમાં SELinux ને રૂપરેખાંકિત કરો"
-Comment[it]="Configura SELinux in una impostazione grafica"
-Comment[jp]="グラフィカルな設定画面で SELinux を設定する"
-Comment[kn]="SELinux ಅನ್ನು ಒಂದು ಚಿತ್ರಾತ್ಮಕ ಸಿದ್ದತೆಯಲ್ಲಿ ಸಂರಚಿಸಿ"
-Comment[mr]="ग्राफिकल सेटिंगमध्ये SELinux संरचीत करा"
-Comment[nl]="Configureer SELinux in een grafische omgeving"
-Comment[or]="SELinux କୁ ଆଲେଖିକ ସଂରଚନାରେ ବିନ୍ୟାସ କରନ୍ତୁ"
-Comment[pa]="SELinux ਨੂੰ ਗਰਾਫੀਕਲ ਸੈਟਿੰਗ ਵਿੱਚ ਸੰਰਚਿਤ ਕਰੋ"
-Comment[pl]="Konfiguracja SELinuksa w trybie graficznym"
-Comment[pt_BR]="Configure o SELinux em uma configuração gráfica"
-Comment[ru]="Настройка SELinux в графическом режиме"
-Comment[te]="SELinuxను గ్రాఫికల్ అమర్పునందు ఆకృతీకరించుము"
-Comment[zh_CN]="在图形设置中配置 SELinux"
+Comment[bn_IN]=গ্রাফিক্যাল পরিবেশে SELinux কনফিগার করুন
+Comment[ca]=Configura SELinuc an mode de preferències gràfiques
+Comment[de]=SELinux in einer grafischen Einstellung konfigurieren
+Comment[es]=Defina SELinux en una configuración de interfaz gráfica
+Comment[fi]=Tee SELinuxin asetukset graafisesti
+Comment[fr]=Configure SELinux dans un environnement graphique
+Comment[gu]=ગ્રાફિકલ સુયોજનમાં SELinux ને રૂપરેખાંકિત કરો
+Comment[hi]=SELinux को आलेखी सेटिंग में विन्यस्त करें
+Comment[it]=Configura SELinux in una impostazione grafica
+Comment[jp]=グラフィカルな設定画面で SELinux を設定する
+Comment[ko]=SELinux를 그래픽 사용자 인터페이스로 설정
+Comment[kn]=SELinux ಅನ್ನು ಒಂದು ಚಿತ್ರಾತ್ಮಕ ಸಿದ್ದತೆಯಲ್ಲಿ ಸಂರಚಿಸಿ
+Comment[ml]=ഒരു ഗ്രാഫിക്കല്‍ സജ്ജീകരണത്തില്‍ SELinux ക്രമീകരിയ്ക്കുക
+Comment[mr]=ग्राफिकल सेटिंगमध्ये SELinux संरचीत करा
+Comment[nl]=Configureer SELinux in een grafische omgeving
+Comment[or]=SELinux କୁ ଆଲେଖିକ ସଂରଚନାରେ ବିନ୍ୟାସ କରନ୍ତୁ
+Comment[pa]=SELinux ਨੂੰ ਗਰਾਫੀਕਲ ਸੈਟਿੰਗ ਵਿੱਚ ਸੰਰਚਿਤ ਕਰੋ
+Comment[pl]=Konfiguracja SELinuksa w trybie graficznym
+Comment[pt]=Configurar o SELinux num ambiente gráfico
+Comment[pt_BR]=Configure o SELinux em uma configuração gráfica
+Comment[ru]=Настройка SELinux в графическом режиме
+Comment[sv]=Konfigurera SELinux i en grafisk miljö
+Comment[ta]=SELinuxஐ ஒரு வரைகலை அமைவில் கட்டமைக்கவும்
+Comment[te]=SELinuxను గ్రాఫికల్ అమర్పునందు ఆకృతీకరించుము
+Comment[uk]=Засіб для налаштування SELinux з графічним інтерфейсом
+Comment[zh_CN]=在图形设置中配置 SELinux
+Comment[zh_TW]=在圖形話設定中配置 SELinux
 StartupNotify=true
 Icon=system-config-selinux
 Exec=/usr/bin/system-config-selinux