rpms/xguest/devel xguest-namespace.patch, NONE, 1.1 xguest.spec, 1.11, 1.12

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/xguest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24965

Modified Files:
	xguest.spec 
Added Files:
	xguest-namespace.patch 
Log Message:
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


xguest-namespace.patch:

--- NEW FILE xguest-namespace.patch ---
diff -up xguest-1.0.8/xguest.conf~ xguest-1.0.8/xguest.conf
--- xguest-1.0.8/xguest.conf~	2009-06-01 14:59:02.000000000 -0400
+++ xguest-1.0.8/xguest.conf	2009-06-01 14:56:40.000000000 -0400
@@ -0,0 +1,5 @@
+# Inserted by the xguest package.
+/tmp    tmpfs   tmpfs   ~xguest
+/var/tmp        tmpfs   tmpfs   ~xguest
+$HOME           tmpfs   tmpfs   ~xguest
+


Index: xguest.spec
===================================================================
RCS file: /cvs/extras/rpms/xguest/devel/xguest.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xguest.spec	26 Feb 2009 09:35:34 -0000	1.11
+++ xguest.spec	2 Jun 2009 12:46:21 -0000	1.12
@@ -1,11 +1,12 @@
 Summary: Creates xguest user as a locked down user 
 Name: xguest
 Version: 1.0.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
 Source: http://people.fedoraproject.org/~dwalsh/xguest/%{name}-%{version}.tar.bz2
+patch: xguest-namespace.patch
 URL: http://people.fedoraproject.org/~dwalsh/xguest/
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +24,7 @@ mounted on tmpfs.
 
 %prep
 %setup -q
+%patch -p1 -b .namespace
 
 %build
 
@@ -33,7 +35,9 @@ mounted on tmpfs.
 %{__rm} -fR %{buildroot}
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/desktop-profiles
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/rc.d/init.d
+%{__mkdir} -p %{buildroot}/%{_sysconfdir}/security/namespace.d/ls
 install -m0644 xguest.zip %{buildroot}/%{_sysconfdir}/desktop-profiles/
+install -m0644 xguest.conf %{buildroot}/%{_sysconfdir}/security/namespace.d/
 install -m0755 xguest.init %{buildroot}/%{_sysconfdir}/rc.d/init.d/xguest
 
 %pre
@@ -41,16 +45,6 @@ if [ $1 -eq 1 ]; then
 semanage user -a  -S targeted -P xguest -R xguest_r xguest_u  2> /dev/null  || :
 (useradd -c "Guest" -Z xguest_u xguest || semanage login -a -S targeted -s xguest_u xguest || semanage login -m -S targeted -s xguest_u xguest) 2>/dev/null || exit 1
 
-echo -n \
-'
-# xguest begin
-# Inserted by the xguest package.
-/tmp    tmpfs   tmpfs   ~xguest
-/var/tmp        tmpfs   tmpfs   ~xguest
-$HOME           tmpfs   tmpfs   ~xguest
-# xguest end
-' >> /etc/security/namespace.conf 
-
 echo "xguest:exclusive" >> /etc/security/sepermit.conf
 
 semanage  boolean -m -S targeted -F /dev/stdin  << _EOF
@@ -82,12 +76,12 @@ fi
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/desktop-profiles/xguest.zip
 %{_sysconfdir}/rc.d/init.d/xguest
+%{_sysconfdir}/security/namespace.d/
 %doc README LICENSE
 
 %preun
 if [ $1 -eq 0 ]; then
 sed -i '/^xguest/d' /etc/security/sepermit.conf
-sed -i '/^# xguest begin/,/^# xguest end/d' /etc/security/namespace.conf 
 
 /usr/bin/python << __eof
 from sabayon import userdb