auto-import changelog data from policycoreutils-1.13.1-2.src.rpm

* Sat Jun 12 2004 Dan Walsh <dwalsh@redhat.com> 1.13.1-2
- Fix run_init to use policy formats

* Wed Jun 02 2004 Dan Walsh <dwalsh@redhat.com> 1.13.1-1
- Update from NSA

.cvsignore

@@ -1 +1 @@
-policycoreutils-1.13.tgz
+policycoreutils-1.13.1.tgz

policycoreutils-rhat.patch

@@ -1,67 +1,43 @@
---- policycoreutils-1.13/scripts/fixfiles.rhat	2004-05-21 14:26:51.000000000 -0400
+--- policycoreutils-1.13.1/run_init/run_init.c.rhat	2004-06-02 15:20:37.000000000 -0400
-+++ policycoreutils-1.13/scripts/fixfiles	2004-05-25 15:06:03.586866792 -0400
++++ policycoreutils-1.13.1/run_init/run_init.c	2004-06-12 05:24:51.069687208 -0400
-@@ -19,24 +19,42 @@
+@@ -51,6 +51,7 @@
- # You should have received a copy of the GNU General Public License
+ #include <ctype.h>
- # along with this program; if not, write to the Free Software
+ #include <libintl.h>
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #include <locale.h>
--
++#include <limits.h>
--FC=/etc/security/selinux/file_contexts
+ #define _(msgid) gettext (msgid)
-+SELINUXTYPE="targeted"
+ #ifndef PACKAGE
-+. /etc/selinux/config
+ #define PACKAGE "policycoreutils"   /* the name of this package lang translation */
-+FC=/etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts
+@@ -60,7 +61,7 @@
- LOGFILE=`mktemp /var/tmp/fixfiles.XXXXXXXXXX`  || exit 1
+   where: <script> is the name of the init script to run,\n\
--echo "logging to $LOGFILE"
+          <args ...> are the arguments to that script.")
- SETFILES=/usr/sbin/setfiles
- FILESYSTEMS=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs).*rw/{print $3}';`
- checkLabels () {
-+echo "logging to $LOGFILE"
- ${SETFILES} -v -n ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
- }
  
- restoreLabels () {
+-#define CONTEXT_FILE "/etc/security/initrc_context"
-+echo "logging to $LOGFILE"
++#define CONTEXT_FILE "initrc_context"
- ${SETFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
+ #ifdef USE_PAM
- }
  
- relabel() {
+ /************************************************************************
-+echo "logging to $LOGFILE"
+@@ -269,10 +270,11 @@
- echo "Cleaning out /tmp"
+   FILE* fp;
- rm -rf /tmp/.??* /tmp/*
+   char  buf[255], *bufp;
--${SETFILES} ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
+   int buf_len;
-+${SETFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
+-  
-+}
+-  fp = fopen(CONTEXT_FILE, "r");
-+relabelCheck() {
++  char context_file[PATH_MAX];
-+echo -n "
++  snprintf(context_file, sizeof(context_file)-1, "%s%s", selinux_default_context_path(), CONTEXT_FILE);
-+Files in the /tmp directory may be labeled incorrectly, this command 
++  fp = fopen(context_file, "r");
-+can remove all files in /tmp.  If you choose to remove files from /tmp, 
+   if (!fp) {
-+a reboot will be required after completion.
+-    fprintf(stderr, _("Could not open file %s\n"), CONTEXT_FILE);
-+
++    fprintf(stderr, _("Could not open file %s\n"), context_file);
-+Do you wish to clean out the /tmp directory [N]? "
+     return -1;
-+read answer
+   }
-+if [ "$answer" = y -o  "$answer" = Y ]; then 
-+    relabel
-+else
-+    restoreLabels
-+fi
-+
- }
  
- # See how we were called.
+@@ -299,7 +301,7 @@
-@@ -48,10 +66,15 @@
+   }
- 		restoreLabels
+ out:
- 		;;
+   fclose(fp);
- 	relabel)
+-  fprintf(stderr, _("No context in file %s\n"), CONTEXT_FILE);
--		relabel
++  fprintf(stderr, _("No context in file %s\n"), context_file);
-+		relabelCheck
+   return -1;
- 		;;
+ 
-+        -F)
+ } /* get_init_context() */
-+	     if "$1" = "relabel"; then
-+		 relabel
-+	     fi
-+	     ;;
- 	*)
--        	echo $"Usage: $0 {check|restore|relabel}"
-+        	echo $"Usage: $0 {check|restore|[-F] relabel}"
- 		exit 1
- esac
- exit $?

policycoreutils.spec

@@ -1,7 +1,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.13
+Version: 1.13.1
-Release: 3
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -30,7 +30,6 @@ context.
 
 %prep
 %setup -q
-%patch1 -p1 -b .rhat
 
 %build
 make all 
@@ -72,6 +71,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Sat Jun 12 2004 Dan Walsh <dwalsh@redhat.com> 1.13.1-2
+- Fix run_init to use policy formats
+
+* Wed Jun 2 2004 Dan Walsh <dwalsh@redhat.com> 1.13.1-1
+- Update from NSA
+
 * Tue May 25 2004 Dan Walsh <dwalsh@redhat.com> 1.13-3
 - Change location of file_context file
 

sources

@@ -1 +1 @@
-69324b20d6fc1ddb7ad3c504ef7dc2a3  policycoreutils-1.13.tgz
+d7b3c7bf86f3f1f4c871e42d8a52a0e1  policycoreutils-1.13.1.tgz