From a165ede89b996ee867e5719b52852345b631eec9 Mon Sep 17 00:00:00 2001 From: makkalot Date: Mon, 4 Aug 2008 19:38:38 +0300 Subject: the certmaster version should be bigger --- funcweb/funcweb.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'funcweb/funcweb.spec') diff --git a/funcweb/funcweb.spec b/funcweb/funcweb.spec index df5aee7..ff28dfa 100644 --- a/funcweb/funcweb.spec +++ b/funcweb/funcweb.spec @@ -16,7 +16,7 @@ Source0: %{name}-%{version}.tar.gz #packages that are required Requires: python >= 2.3 Requires: func >= 0.20 -Requires: certmaster >= 0.1 +Requires: certmaster >= 0.20 Requires: mod_ssl >= 2.0 Requires: httpd >= 2.0 Requires: TurboGears >= 1.0.4.2 -- cgit From 5c5f6a54328c87c51ef608ea3f501779dd45a805 Mon Sep 17 00:00:00 2001 From: "Krzysztof A. Adamski" Date: Fri, 11 Jul 2008 11:58:06 -0400 Subject: Add SELinux policy to funcweb. (cherry picked from commit 5dff1a3b189d83f6573eee91cd4ee3228131b2ed) --- funcweb/funcweb.spec | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'funcweb/funcweb.spec') diff --git a/funcweb/funcweb.spec b/funcweb/funcweb.spec index ff28dfa..a2b1720 100644 --- a/funcweb/funcweb.spec +++ b/funcweb/funcweb.spec @@ -12,6 +12,7 @@ Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist} License: GPLv2+ Group: Applications/System Source0: %{name}-%{version}.tar.gz +Source1: %{name}.te #packages that are required Requires: python >= 2.3 @@ -34,6 +35,12 @@ BuildRequires: python-setuptools-devel BuildRequires: python-setuptools %endif %endif +# SELinux module +%if 0%{?fedora} == 5 +BuildRequires: checkpolicy, selinux-policy >= 2.2.40, m4 +%else +BuildRequires: checkpolicy, selinux-policy-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Url: https://hosted.fedoraproject.org/projects/func/ @@ -41,8 +48,21 @@ Url: https://hosted.fedoraproject.org/projects/func/ Web interface for managing systems controlled by Func +%package selinux +Summary: SELinux support for FuncWeb +Group: System Environment/Daemons +Requires: %{name} = %{version} +Requires(post): policycoreutils, initscripts, %{name} +Requires(preun): policycoreutils, initscripts, %{name} +Requires(postun): policycoreutils + +%description selinux +This package adds SELinux policy for FuncWeb + %prep %setup -q +mkdir -p selinux +cp -p %{SOURCE1} selinux/ %build %{__python} setup.py build @@ -51,6 +71,11 @@ Web interface for managing systems controlled by Func test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT +#SELinux part +cd selinux/ +make -f %{_datadir}/selinux/devel/Makefile +install -p -m 644 -D %{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp + %clean rm -fr $RPM_BUILD_ROOT @@ -103,6 +128,10 @@ rm -fr $RPM_BUILD_ROOT /usr/bin/funcwebd %doc README +%files selinux +%defattr(-, root, root, -) +%{_datadir}/selinux/packages/%{name}/%{name}.pp + %post # for suse if [ -x /usr/lib/lsb/install_initd ]; then @@ -120,6 +149,24 @@ else done fi +%post selinux +if [ "$1" -le "1" ]; then # Fist install + semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp 2>/dev/null || : + semanage port -a -t funcweb_port_t -p tcp 51236 2>/dev/null || : +fi + +%preun selinux +if [ "$1" -lt "1" ]; then # Final removal + semanage port -d -t funcweb_port_t -p tcp 51236 2>/dev/null || : + semodule -r funcweb 2>/dev/null || : +fi + +%postun selinux +if [ "$1" -ge "1" ]; then # Upgrade + # Replaces the module if it is already loaded + semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp 2>/dev/null || : +fi + #before uninstall the things %preun if [ "$1" = 0 ] ; then @@ -135,6 +182,9 @@ fi %changelog +* Fri Jul 11 2008 Krzysztof A. Adamski - 0.1 +- SELinux policy added + * Sat Jul 05 2008 Denis Kurov - 0.1 - The first RPM for funcweb with new dynamic widget stuff -- cgit From f2e491ba089156ad683da8cb197cc34c03d10af9 Mon Sep 17 00:00:00 2001 From: "Krzysztof A. Adamski" Date: Fri, 11 Jul 2008 13:12:56 -0400 Subject: Provide our own PAM service configuration file. (cherry picked from commit 1656265c3aec5c0701c25f9260b03c444e6af07a) --- funcweb/funcweb.spec | 1 + 1 file changed, 1 insertion(+) (limited to 'funcweb/funcweb.spec') diff --git a/funcweb/funcweb.spec b/funcweb/funcweb.spec index a2b1720..39d394b 100644 --- a/funcweb/funcweb.spec +++ b/funcweb/funcweb.spec @@ -98,6 +98,7 @@ rm -fr $RPM_BUILD_ROOT %dir /var/log/funcweb %config(noreplace) %{_sysconfdir}/httpd/conf.d/funcweb.conf %config(noreplace) %{_sysconfdir}/%{name}/prod.cfg +%config(noreplace) %{_sysconfdir}/pam.d/funcweb %config(noreplace) /etc/logrotate.d/funcweb_rotate #adding the server startup shutdown thing -- cgit From 68f6a073f74c0288ce86e84d1e29803f22974623 Mon Sep 17 00:00:00 2001 From: makkalot Date: Mon, 14 Jul 2008 21:56:00 +0300 Subject: there was a conflict due to merging errors in spec file (cherry picked from commit 3119ab486a6360278ebdafc8cba7724c6e79a3e5) --- funcweb/funcweb.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'funcweb/funcweb.spec') diff --git a/funcweb/funcweb.spec b/funcweb/funcweb.spec index 39d394b..91c8fe4 100644 --- a/funcweb/funcweb.spec +++ b/funcweb/funcweb.spec @@ -12,7 +12,7 @@ Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist} License: GPLv2+ Group: Applications/System Source0: %{name}-%{version}.tar.gz -Source1: %{name}.te +Source2: %{name}.te #packages that are required Requires: python >= 2.3 @@ -62,7 +62,7 @@ This package adds SELinux policy for FuncWeb %prep %setup -q mkdir -p selinux -cp -p %{SOURCE1} selinux/ +cp -p %{SOURCE2} selinux/ %build %{__python} setup.py build -- cgit From 8c3b84ba9794a0088d0d89e45b8cd8df0ebdea5e Mon Sep 17 00:00:00 2001 From: makkalot Date: Mon, 4 Aug 2008 23:10:09 +0300 Subject: a workaround for alikins bug report for cherrypy version conflict --- funcweb/funcweb.spec | 3 +++ 1 file changed, 3 insertions(+) (limited to 'funcweb/funcweb.spec') diff --git a/funcweb/funcweb.spec b/funcweb/funcweb.spec index 91c8fe4..fee8611 100644 --- a/funcweb/funcweb.spec +++ b/funcweb/funcweb.spec @@ -22,6 +22,9 @@ Requires: mod_ssl >= 2.0 Requires: httpd >= 2.0 Requires: TurboGears >= 1.0.4.2 Requires: pam +#a bug in Turbogears package that causes some problems if +#bigger version than that one is installed on the system ! +Requires: python-cherrypy < 3.0 #the build requires BuildRequires: python-devel -- cgit From cc10cfa9b4e39e901128749cf034d64c4db47ad7 Mon Sep 17 00:00:00 2001 From: makkalot Date: Mon, 18 Aug 2008 17:53:44 +0300 Subject: some fixes in spec file --- funcweb/funcweb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'funcweb/funcweb.spec') diff --git a/funcweb/funcweb.spec b/funcweb/funcweb.spec index fee8611..7ea73c1 100644 --- a/funcweb/funcweb.spec +++ b/funcweb/funcweb.spec @@ -95,7 +95,8 @@ rm -fr $RPM_BUILD_ROOT %dir %{python_sitelib}/funcweb/static %dir %{python_sitelib}/funcweb/static/css %dir %{python_sitelib}/funcweb/static/images -%dir %{python_sitelib}/funcweb/static/javascript +%dir %{python_sitelib}/funcweb/static/images/imgs +%dir %{python_sitelib}/funcweb/static/javascript/ext %dir %{python_sitelib}/funcweb/identity %dir %{_sysconfdir}/%{name} %dir /var/log/funcweb @@ -124,8 +125,10 @@ rm -fr $RPM_BUILD_ROOT %{python_sitelib}/funcweb/static/images/*.jpg %{python_sitelib}/funcweb/static/images/*.ico %{python_sitelib}/funcweb/static/images/*.gif +%{python_sitelib}/funcweb/static/images/imgs/*.gif %{python_sitelib}/funcweb/static/images/Makefile %{python_sitelib}/funcweb/static/javascript/*.js +%{python_sitelib}/funcweb/static/javascript/ext/*.js %{python_sitelib}/funcweb/static/javascript/Makefile %{python_sitelib}/funcweb/identity/*.py* %{python_sitelib}/funcweb/identity/Makefile -- cgit