Hello community, here is the log from the commit of package mcstrans for openSUSE:Factory checked in at 2012-08-10 19:02:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mcstrans (Old) and /work/SRC/openSUSE:Factory/.mcstrans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mcstrans", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mcstrans/mcstrans.changes 2012-04-17 07:46:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mcstrans.new/mcstrans.changes 2012-08-10 19:02:17.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 7 13:19:20 UTC 2012 - [email protected] + +- updated to 0.3.3 , tarball taken from redhat source rpm. + +------------------------------------------------------------------- Old: ---- mcstrans-0.3.1-initscript.patch mcstrans-0.3.1-var_lock_subsys.patch mcstrans-0.3.1.tar.bz2 New: ---- mcstrans-0.3.3-initscript.patch mcstrans-0.3.3.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mcstrans.spec ++++++ --- /var/tmp/diff_new_pack.k64swk/_old 2012-08-10 19:02:19.000000000 +0200 +++ /var/tmp/diff_new_pack.k64swk/_new 2012-08-10 19:02:19.000000000 +0200 @@ -17,16 +17,14 @@ Name: mcstrans -Version: 0.3.1 +Version: 0.3.3 Release: 0 Url: http://fedora.redhat.com/ Summary: SELinux Translation Daemon License: GPL-2.0+ Group: System/Management -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tgz Patch0: %{name}-%{version}-initscript.patch -# PATCH-FIX-OPENSUSE don't use /var/lock/subsys (bnc#714633) -Patch1: mcstrans-0.3.1-var_lock_subsys.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libcap-devel BuildRequires: libselinux-devel >= 1.30.3 @@ -51,7 +49,6 @@ %prep %setup -q %patch0 -%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -68,9 +65,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} ln -sf ../../etc/init.d/mcstrans $RPM_BUILD_ROOT%{_sbindir}/rcmcstrans -%clean -rm -rf $RPM_BUILD_ROOT - %post %fillup_and_insserv mcstrans @@ -86,6 +80,8 @@ %{_sysconfdir}/init.d/mcstrans %{_sbindir}/rcmcstrans /sbin/mcstransd -%{_mandir}/man8/mcs.8.gz +%{_mandir}/man8/mcs.8* +%{_mandir}/man8/mcstransd.8* +%{_mandir}/man8/setrans.conf.8* %changelog ++++++ mcstrans-0.3.1-initscript.patch -> mcstrans-0.3.3-initscript.patch ++++++ --- /work/SRC/openSUSE:Factory/mcstrans/mcstrans-0.3.1-initscript.patch 2011-09-23 02:12:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mcstrans.new/mcstrans-0.3.3-initscript.patch 2012-08-10 19:02:17.000000000 +0200 @@ -17,7 +17,7 @@ # # Return values according to LSB for all commands but status: # 0 - success -@@ -17,63 +12,74 @@ +@@ -17,56 +12,68 @@ # 5 - program is not installed # 6 - program is not configured # 7 - program is not running @@ -36,15 +36,15 @@ +# PATH=/sbin:/bin:/usr/bin:/usr/sbin -+LOCK_FILE=/var/lock/subsys/mcstrans -+SETRANS_DIR=/var/run/setrans prog="mcstransd" +-lockfile=/var/lock/subsys/$prog ++lockfile=/var/lock/$prog ++SETRANS_DIR=/var/run/setrans ++ # Source function library. -. /etc/init.d/functions +. /etc/rc.status -+ -+rc_reset # Allow anyone to run status if [ "$1" = "status" ] ; then @@ -60,24 +60,24 @@ # Check that we are root ... so non-root users stop here -test $EUID = 0 || exit 4 +if [ $EUID -ne 0 ] ; then -+ echo $"Access denied. Only root can run this daemon" -+ rc_failed 4 -+ rc_status -v -+ rc_exit ++ echo $"Access denied. Only root can run this daemon" ++ rc_failed 4 ++ rc_status -v ++ rc_exit +fi - --# If selinux is not enabled, return success --test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled || exit 0 ++ +# Check whether SELinux is enabled +if [ ! -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled ; then -+ echo $"SELinux should be enabled to run this daemon" -+ rc_failed 1 -+ rc_status -v -+ rc_exit ++ echo $"SELinux should be enabled to run this daemon" ++ rc_failed 1 ++ rc_status -v ++ rc_exit +fi --RETVAL=0 -+mkdir -p $SETRANS_DIR +-# If selinux is not enabled, return success +-test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled || exit 0 + + RETVAL=0 start(){ test -x /sbin/mcstransd || exit 5 @@ -89,16 +89,17 @@ - return 1 - fi - - unset HOME MAIL USER USERNAME +- unset HOME MAIL USER USERNAME - daemon $prog "$EXTRAOPTIONS" - RETVAL=$? - echo - if test $RETVAL = 0 ; then -- touch /var/lock/subsys/mcstrans +- touch $lockfile - fi - return $RETVAL -+ startproc -p $LOCK_FILE $prog "$EXTRAOPTIONS" ++ startproc -p $lockfile $prog "$EXTRAOPTIONS" + rc_status -v ++ } stop(){ @@ -106,70 +107,31 @@ - killproc $prog - RETVAL=$? - echo -- rm -f /var/lock/subsys/mcstrans -- return $RETVAL -+ killproc -p $LOCK_FILE -TERM $prog -+ rc_status -v - } - - reload(){ -- echo -n $"Reloading configuration: " -- killproc $prog -HUP -- RETVAL=$? -- echo +- rm -f $lockfile - return $RETVAL -+ echo -n $"Reloading configuration of $prog: " -+ killproc -HUP $prog ++ killproc -p $lockfile -TERM $prog + rc_status -v } restart(){ -@@ -82,31 +88,30 @@ restart(){ +@@ -75,7 +82,7 @@ restart(){ } condrestart(){ -- [ -e /var/lock/subsys/mcstrans ] && restart -- return 0 -+ [ -e $LOCK_FILE ] && restart || : +- [ -e $lockfile ] && restart ++ [ -e $lockfile ] && restart || : + return 0 } -- - # See how we were called. - case "$1" in -- start) -- start -- ;; -- stop) -- stop -- ;; -- restart) -- restart -- ;; -- reload) -- reload -- ;; - condrestart) +@@ -95,8 +102,9 @@ case "$1" in condrestart ;; -- *) -- echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|rotate}" + *) +- echo $"Usage: $0 {start|stop|status|restart|force-reload|condrestart}" - RETVAL=3 -+ start) -+ start -+ ;; -+ stop) -+ stop -+ ;; -+ restart) -+ restart -+ ;; -+ reload) -+ reload -+ ;; -+ *) -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" -+ rc_failed 3 -+ rc_status -v ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" ++ rc_failed 3 ++ rc_status -v esac -exit $RETVAL -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
