rpms/tetex/devel tetex-3.0-selinux.patch, 1.1, 1.2 tetex.spec, 1.110, 1.111 tetex-3.0-mktexlsrfix.patch, 1.1, NONE

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/tetex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15638

Modified Files:
	tetex-3.0-selinux.patch tetex.spec 
Removed Files:
	tetex-3.0-mktexlsrfix.patch 
Log Message:
- don't mess up file contexts while running texhash (#235032)


tetex-3.0-selinux.patch:

Index: tetex-3.0-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/tetex/devel/tetex-3.0-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-3.0-selinux.patch	16 Sep 2006 08:46:02 -0000	1.1
+++ tetex-3.0-selinux.patch	5 Jun 2007 14:03:25 -0000	1.2
@@ -1,11 +1,17 @@
---- tetex-src-3.0/texk/kpathsea/mktexlsr.selinux	2006-09-13 06:38:14.000000000 -0400
-+++ tetex-src-3.0/texk/kpathsea/mktexlsr	2006-09-13 06:37:52.000000000 -0400
-@@ -140,7 +140,7 @@
-   until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
-   chmod $PERMS "$db_file_tmp"
+--- tetex-src-3.0/texk/kpathsea/mktexlsr.selinux	2007-06-05 15:37:24.000000000 +0200
++++ tetex-src-3.0/texk/kpathsea/mktexlsr	2007-06-05 15:48:15.000000000 +0200
+@@ -136,11 +136,10 @@ for TEXMFLS_R in "$@"; do
+   (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) |
+     sed '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^[\.\/]*lsR[0-9]*\.tmp:*$/d' >>"$db_file_tmp"
+ 
+-  # To be really safe, a loop.
+-  until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
+-  chmod $PERMS "$db_file_tmp"
++  # Don't inherit bad permissions for ls-R files (#220239)
++  chmod 0644 "$db_file_tmp"
    rm -f "$db_file"
 -  mv "$db_file_tmp" "$db_file"
-+  install "$db_file_tmp" "$db_file"
++  cp "$db_file_tmp" "$db_file"
    rm -rf "$db_dir_tmp"
  done
  tty -s && echo "$progname: Done." >&2


Index: tetex.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- tetex.spec	4 May 2007 10:29:16 -0000	1.110
+++ tetex.spec	5 Jun 2007 14:03:25 -0000	1.111
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 40%{?dist}
+Release: 41%{?dist}
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -88,8 +88,7 @@
 Patch21: tetex-3.0-dvipdfm.patch
 Patch22: tetex-3.0-selinux.patch
 Patch23: tetex-3.0-footfix.patch
-Patch24: tetex-3.0-mktexlsrfix.patch
-Patch25: tetex-3.0-CVE-2007-0650.patch
+Patch24: tetex-3.0-CVE-2007-0650.patch
 
 ######
 # Japanization patches
@@ -309,10 +308,8 @@
 %patch22 -p1 -b .selinux
 # fix para option in footmisc package (#188701)
 %patch23 -p1 -b .footfix
-# don't inherit incorrect permissions for ls-R from parent directory (#220239)
-%patch24 -p1 -b .mktexlsrfix
 # fix a couple of string overflows in makeindex - CVE-2007-0650 (#225491)
-%patch25 -p1 -b .CVE-2007-0650
+%patch24 -p1 -b .CVE-2007-0650
 
 %if %{enable_japanese}
 mkdir texmf/ptex-texmf
@@ -865,6 +862,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Jun  5 2007 Jindrich Novy <jnovy at redhat.com> 3.0-41
+- don't mess up file contexts while running texhash (#235032)
+
 * Fri May  4 2007 Jindrich Novy <jnovy at redhat.com> 3.0-40
 - fix dvipdft and xdvizilla scripts (#238761)
 


--- tetex-3.0-mktexlsrfix.patch DELETED ---