Update to upstream
- Write pid file
This commit is contained in:
Dan Walsh
parent
92e33b0c5b
commit
a59173415b
@ -1,43 +0,0 @@
|
|||||||
diff -up mcstrans-0.3.2/src/mcstransd.c.writepid mcstrans-0.3.2/src/mcstransd.c
|
|
||||||
--- mcstrans-0.3.2/src/mcstransd.c.writepid 2011-01-05 10:32:25.000000000 -0500
|
|
||||||
+++ mcstrans-0.3.2/src/mcstransd.c 2012-02-01 16:02:46.670139198 -0500
|
|
||||||
@@ -556,6 +556,30 @@ void dropprivs(void)
|
|
||||||
cap_free(new_caps);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static const char *pidfile = "/var/run/mcstransd.pid";
|
|
||||||
+
|
|
||||||
+static int write_pid_file(void)
|
|
||||||
+{
|
|
||||||
+ int pidfd, len;
|
|
||||||
+ char val[16];
|
|
||||||
+
|
|
||||||
+ len = snprintf(val, sizeof(val), "%u\n", getpid());
|
|
||||||
+ if (len < 0) {
|
|
||||||
+ syslog(LOG_ERR, "Pid error (%s)", strerror(errno));
|
|
||||||
+ pidfile = 0;
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ pidfd = open(pidfile, O_CREAT | O_TRUNC | O_NOFOLLOW | O_WRONLY, 0644);
|
|
||||||
+ if (pidfd < 0) {
|
|
||||||
+ syslog(LOG_ERR, "Unable to set pidfile (%s)", strerror(errno));
|
|
||||||
+ pidfile = 0;
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ (void)write(pidfd, val, (unsigned int)len);
|
|
||||||
+ close(pidfd);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
int
|
|
||||||
main(int UNUSED(argc), char *argv[])
|
|
||||||
{
|
|
||||||
@@ -582,6 +606,8 @@ main(int UNUSED(argc), char *argv[])
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ write_pid_file();
|
|
||||||
+
|
|
||||||
syslog(LOG_NOTICE, "%s initialized", argv[0]);
|
|
||||||
process_connections();
|
|
||||||
|
|
||||||
210
mcstrans.spec
210
mcstrans.spec
@ -1,210 +0,0 @@
|
|||||||
Summary: SELinux Translation Daemon
|
|
||||||
Name: mcstrans
|
|
||||||
Version: 0.3.2
|
|
||||||
Release: 3%{?dist}
|
|
||||||
License: GPL+
|
|
||||||
Group: System Environment/Daemons
|
|
||||||
Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
|
|
||||||
Patch: mcstrans-0.3.2-writepid.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
BuildRequires: libselinux-devel >= 1.30.3-1
|
|
||||||
BuildRequires: libcap-devel pcre-devel libsepol-devel libsepol-static
|
|
||||||
Requires: pcre
|
|
||||||
Requires(pre): /sbin/chkconfig /sbin/service
|
|
||||||
Requires(post):/sbin/chkconfig /sbin/service
|
|
||||||
Provides: setransd
|
|
||||||
Provides: libsetrans
|
|
||||||
Obsoletes: libsetrans
|
|
||||||
|
|
||||||
%description
|
|
||||||
Security-enhanced Linux is a feature of the Linux® kernel and a number
|
|
||||||
of utilities with enhanced security functionality designed to add
|
|
||||||
mandatory access controls to Linux. The Security-enhanced Linux
|
|
||||||
kernel contains new architectural components originally developed to
|
|
||||||
improve the security of the Flask operating system. These
|
|
||||||
architectural components provide general support for the enforcement
|
|
||||||
of many kinds of mandatory access control policies, including those
|
|
||||||
based on the concepts of Type Enforcement®, Role-based Access
|
|
||||||
Control, and Multi-level Security.
|
|
||||||
|
|
||||||
mcstrans provides an translation daemon to translate SELinux categories
|
|
||||||
from internal representations to user defined representation.
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q
|
|
||||||
%patch -p1 -b .writepid
|
|
||||||
|
|
||||||
%build
|
|
||||||
make clean
|
|
||||||
make LIBDIR="%{_libdir}" CFLAGS="-g %{optflags}" %{?_smp_mflags}
|
|
||||||
|
|
||||||
%install
|
|
||||||
rm -rf %{buildroot}
|
|
||||||
mkdir -p %{buildroot}/%{_lib}
|
|
||||||
mkdir -p %{buildroot}/%{_libdir}
|
|
||||||
mkdir -p %{buildroot}%{_usr}/share/mcstrans
|
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/selinux/mls/setrans.d
|
|
||||||
|
|
||||||
make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" install
|
|
||||||
rm -f %{buildroot}%{_sbindir}/*
|
|
||||||
rm -f %{buildroot}%{_libdir}/*.a
|
|
||||||
cp -r share/* %{buildroot}%{_usr}/share/mcstrans/
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf %{buildroot}
|
|
||||||
|
|
||||||
%post
|
|
||||||
chkconfig --add mcstrans
|
|
||||||
if [ -f /var/lock/subsys/mcstrans ]; then
|
|
||||||
mv /var/lock/subsys/mcstrans /var/lock/subsys/mcstransd
|
|
||||||
fi
|
|
||||||
|
|
||||||
%preun
|
|
||||||
if [ $1 -eq 0 ]; then
|
|
||||||
service mcstrans stop > /dev/null 2>&1
|
|
||||||
chkconfig --del mcstrans
|
|
||||||
fi
|
|
||||||
|
|
||||||
%postun
|
|
||||||
if [ $1 -ge 1 ]; then
|
|
||||||
service mcstrans condrestart > /dev/null 2>&1 || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-,root,root,0755)
|
|
||||||
%{_mandir}/man8/mcs.8.gz
|
|
||||||
%{_mandir}/man8/mcstransd.8.gz
|
|
||||||
%{_mandir}/man8/setrans.conf.8.gz
|
|
||||||
/sbin/mcstransd
|
|
||||||
%{_sysconfdir}/rc.d/init.d/mcstrans
|
|
||||||
%dir %{_sysconfdir}/selinux/mls/setrans.d
|
|
||||||
|
|
||||||
%dir %{_usr}/share/mcstrans
|
|
||||||
|
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%dir %{_usr}/share/mcstrans/util
|
|
||||||
%dir %{_usr}/share/mcstrans/examples
|
|
||||||
%{_usr}/share/mcstrans/examples/*
|
|
||||||
|
|
||||||
%defattr(0755,root,root,0755)
|
|
||||||
%{_usr}/share/mcstrans/util/*
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Wed Feb 1 2012 Dan Walsh <dwalsh@redhat.com> - 0.3.2-3
|
|
||||||
- Write pid file
|
|
||||||
|
|
||||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-1
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 5 2011 Ted X Toth <txtoth@gmail.com> - 0.3.2-0
|
|
||||||
- Add constraints
|
|
||||||
- Add setrans.conf man page
|
|
||||||
- Fix mixed raw and translated range bug
|
|
||||||
- Moved todo comments to TODO file
|
|
||||||
|
|
||||||
* Thu Oct 16 2009 Dan Walsh <dwalsh@redhat.com> 0.3.1-4
|
|
||||||
- Add mcstransd man page
|
|
||||||
|
|
||||||
* Thu Sep 17 2009 Miroslav Grepl <mgrepl@redhat.com> 0.3.1-3
|
|
||||||
- Fix init script
|
|
||||||
|
|
||||||
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Feb 5 2009 Joe Nall <joe@nall.com> 0.3.1-1
|
|
||||||
- Rewrite translations to allow individual word/category mapping
|
|
||||||
- Eamon Walsh's color mapping changes
|
|
||||||
|
|
||||||
* Wed May 28 2008 Tom "spot" Callaway <tcallawa@redhat.com> 0.2.11-2
|
|
||||||
- fix license tag
|
|
||||||
|
|
||||||
* Wed May 7 2008 Dan Walsh <dwalsh@redhat.com> 0.2.11-1
|
|
||||||
- More fixes from Jim Meyering
|
|
||||||
|
|
||||||
* Tue May 6 2008 Dan Walsh <dwalsh@redhat.com> 0.2.10-1
|
|
||||||
- More error checking on failed strdup
|
|
||||||
|
|
||||||
* Tue May 6 2008 Dan Walsh <dwalsh@redhat.com> 0.2.9-1
|
|
||||||
- Start mcstrans before netlabel
|
|
||||||
|
|
||||||
* Mon Apr 14 2008 Dan Walsh <dwalsh@redhat.com> 0.2.8-1
|
|
||||||
- Fix error handling
|
|
||||||
|
|
||||||
* Tue Feb 12 2008 Dan Walsh <dwalsh@redhat.com> 0.2.7-2
|
|
||||||
- Rebuild for gcc 4.3
|
|
||||||
|
|
||||||
* Mon Oct 30 2007 Steve Conklin <sconklin@redhat.com> - 0.2.7-1
|
|
||||||
- Folded current patches into tarball
|
|
||||||
|
|
||||||
* Thu Oct 25 2007 Steve Conklin <sconklin@redhat.com> - 0.2.6-3
|
|
||||||
- Fixed a compile problem with max_categories
|
|
||||||
|
|
||||||
* Thu Oct 25 2007 Steve Conklin <sconklin@redhat.com> - 0.2.6-2
|
|
||||||
- Fixed some init script errors
|
|
||||||
|
|
||||||
* Thu Sep 13 2007 Dan Walsh <dwalsh@redhat.com> 0.2.6-1
|
|
||||||
- Check for max_categories and error out
|
|
||||||
|
|
||||||
* Thu Mar 1 2007 Dan Walsh <dwalsh@redhat.com> 0.2.5-1
|
|
||||||
- Fix case where s0=""
|
|
||||||
|
|
||||||
* Mon Feb 26 2007 Dan Walsh <dwalsh@redhat.com> 0.2.4-1
|
|
||||||
- Translate range if fully specified correctly
|
|
||||||
|
|
||||||
* Mon Feb 12 2007 Dan Walsh <dwalsh@redhat.com> 0.2.3-1
|
|
||||||
- Additional fix to handle ssh root/sysadm_r/s0:c1,c2
|
|
||||||
Resolves: #224637
|
|
||||||
|
|
||||||
* Mon Feb 5 2007 Dan Walsh <dwalsh@redhat.com> 0.2.1-1
|
|
||||||
- Rewrite to handle MLS properly
|
|
||||||
Resolves: #225355
|
|
||||||
|
|
||||||
* Mon Jan 29 2007 Dan Walsh <dwalsh@redhat.com> 0.1.10-2
|
|
||||||
- Cleanup memory when complete
|
|
||||||
|
|
||||||
* Mon Dec 4 2006 Dan Walsh <dwalsh@redhat.com> 0.1.10-1
|
|
||||||
- Fix Memory Leak
|
|
||||||
Resolves: #218173
|
|
||||||
|
|
||||||
* Thu Sep 21 2006 Dan Walsh <dwalsh@redhat.com> 0.1.9-1
|
|
||||||
- Add -pie
|
|
||||||
- Fix compiler warnings
|
|
||||||
- Fix Memory Leak
|
|
||||||
Resolves: #218173
|
|
||||||
|
|
||||||
* Wed Sep 13 2006 Peter Jones <pjones@redhat.com> - 0.1.8-3
|
|
||||||
- Fix subsys locking in init script
|
|
||||||
|
|
||||||
* Wed Aug 23 2006 Dan Walsh <dwalsh@redhat.com> 0.1.8-1
|
|
||||||
- Only allow one version to run
|
|
||||||
|
|
||||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control
|
|
||||||
- rebuild
|
|
||||||
|
|
||||||
* Mon Jun 19 2006 Dan Walsh <dwalsh@redhat.com> 0.1.7-1
|
|
||||||
- Apply sgrubb patch to only call getpeercon on translations
|
|
||||||
|
|
||||||
* Tue Jun 6 2006 Dan Walsh <dwalsh@redhat.com> 0.1.6-1
|
|
||||||
- Exit gracefully when selinux is not enabled
|
|
||||||
|
|
||||||
* Mon May 15 2006 Dan Walsh <dwalsh@redhat.com> 0.1.5-1
|
|
||||||
- Fix sighup handling
|
|
||||||
|
|
||||||
* Mon May 15 2006 Dan Walsh <dwalsh@redhat.com> 0.1.4-1
|
|
||||||
- Add patch from sgrubb
|
|
||||||
- Fix 64 bit size problems
|
|
||||||
- Increase the open file limit
|
|
||||||
- Make sure maximum size is not exceeded
|
|
||||||
|
|
||||||
* Fri May 12 2006 Dan Walsh <dwalsh@redhat.com> 0.1.3-1
|
|
||||||
- Move initscripts to /etc/rc.d/init.d
|
|
||||||
|
|
||||||
* Thu May 11 2006 Dan Walsh <dwalsh@redhat.com> 0.1.2-1
|
|
||||||
- Drop Privs
|
|
||||||
|
|
||||||
* Mon May 8 2006 Dan Walsh <dwalsh@redhat.com> 0.1.1-1
|
|
||||||
- Initial Version
|
|
||||||
- This daemon reuses the code from libsetrans
|
|
||||||
Loading…
Reference in New Issue
Block a user