rpms/cyphesis/F-9 cyphesis-0.5.15-init.patch,1.1,1.2

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/cyphesis/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13147

Modified Files:
	cyphesis-0.5.15-init.patch 
Log Message:
Don't bother adding/removing selinux ports after the selinux bits have been moved into selinux-policy


cyphesis-0.5.15-init.patch:

Index: cyphesis-0.5.15-init.patch
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/F-9/cyphesis-0.5.15-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyphesis-0.5.15-init.patch	19 Dec 2007 05:21:06 -0000	1.1
+++ cyphesis-0.5.15-init.patch	6 Jun 2008 19:11:55 -0000	1.2
@@ -1,15 +1,8 @@
---- cyphesis-0.5.15/cyphesis.init.orig	2006-09-26 14:33:12.000000000 -0700
-+++ cyphesis-0.5.15/cyphesis.init	2007-12-18 15:57:12.000000000 -0800
-@@ -23,29 +23,35 @@
- start() {
+--- cyphesis-0.5.15/cyphesis.init.orig	2008-04-09 11:02:46.000000000 -0700
++++ cyphesis-0.5.15/cyphesis.init	2008-04-09 11:03:07.000000000 -0700
+@@ -24,28 +24,28 @@
          # Start the daemon.
  
-+        if selinuxenabled ; then
-+            /usr/sbin/semanage port -a -t cyphesis_port_t -p tcp 6767 &>/dev/null || :
-+            /usr/sbin/semanage port -a -t cyphesis_port_t -p tcp 6769 &>/dev/null || :
-+            /usr/sbin/semanage port -a -t cyphesis_port_t -p udp 32771 &>/dev/null || :
-+        fi
-+
          # Make sure postgres superuser exists
 -        if ! su $POSTGRESUSER -c true >/dev/null 2>&1; then
 +        if ! runuser $POSTGRESUSER -c true >/dev/null 2>&1; then
@@ -41,7 +34,7 @@
              RETVAL=$?
              if [ $RETVAL -eq 0 ]; then
                  echo_success
-@@ -58,10 +64,10 @@
+@@ -58,10 +58,10 @@
          fi
  
          # Make sure the database exists
@@ -54,7 +47,7 @@
              RETVAL=$?
              if [ $RETVAL -eq 0 ]; then
                  echo_success
-@@ -73,7 +79,7 @@
+@@ -73,7 +73,7 @@
              echo
              # Populate it with rules
              echo -n $"Loading database with rules: "
@@ -63,7 +56,7 @@
              RETVAL=$?
              if [ $RETVAL -eq 0 ]; then
                  echo_success
-@@ -88,7 +94,7 @@
+@@ -88,7 +88,7 @@
          echo -n $"Starting cyphesis: "
  
          # Run the server, in self daemonising mode
@@ -72,7 +65,7 @@
          RETVAL=$?
          if [ $RETVAL -eq 0 ]; then
              echo_success
-@@ -96,8 +102,24 @@
+@@ -96,8 +96,24 @@
          else
              echo_failure
              echo
@@ -97,16 +90,13 @@
          return $RETVAL
  }
  
-@@ -107,7 +129,13 @@
+@@ -107,7 +123,10 @@
          killproc cyphesis
          RETVAL=$?
          echo
 -        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/cyphesis
 +        if [ $RETVAL -eq 0 ] ; then
 +            rm -f /var/lock/subsys/cyphesis
-+            /usr/sbin/semanage port -d -t cyphesis_port_t -p tcp 6767 &>/dev/null || :
-+            /usr/sbin/semanage port -d -t cyphesis_port_t -p tcp 6769 &>/dev/null || :
-+            /usr/sbin/semanage port -d -t cyphesis_port_t -p udp 32771 &>/dev/null || :
 +        fi
 +
          return $RETVAL