X Strike Force X.Org X11 SVN commit: r223 - in trunk/debian: . patches
Author: branden
Date: 2005-06-15 19:13:00 -0500 (Wed, 15 Jun 2005)
New Revision: 223
Modified:
trunk/debian/changelog
trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
Log:
Update patch #058 to give Xevie its own copy of the config-subst script,
instead of hard-coding a within-tree path to the copy in the Xcursor
library. (I don't know what the point of directing Xevie over to
Xcursor's copy was -- there were already four identical copies of
config-subst in X.Org 6.8.2 anyway, so this decision didn't help matters
much. :) ) Update Xevie's Imakefile to look for config-subst in the
current working directory instead of ../Xcursor.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-15 21:22:04 UTC (rev 222)
+++ trunk/debian/changelog 2005-06-16 00:13:00 UTC (rev 223)
@@ -176,8 +176,16 @@
the headers if they're not being "built". Resync patches #004, #099c,
and #600.
- -- Branden Robinson <branden@debian.org> Wed, 15 Jun 2005 00:43:52 -0500
+ * Update patch #058 to give Xevie its own copy of the config-subst script,
+ instead of hard-coding a within-tree path to the copy in the Xcursor
+ library. (I don't know what the point of directing Xevie over to
+ Xcursor's copy was -- there were already four identical copies of
+ config-subst in X.Org 6.8.2 anyway, so this decision didn't help matters
+ much. :) ) Update Xevie's Imakefile to look for config-subst in the
+ current working directory instead of ../Xcursor.
+ -- Branden Robinson <branden@debian.org> Wed, 15 Jun 2005 19:11:00 -0500
+
xfree86 (4.3.0.dfsg.1-14) unstable; urgency=high
Urgency set to high due to fix for security flaw (see below).
Modified: trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
===================================================================
--- trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff 2005-06-15 21:22:04 UTC (rev 222)
+++ trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff 2005-06-16 00:13:00 UTC (rev 223)
@@ -19,6 +19,16 @@
and Xrender build directories from system directories where those
libraries may be found (already installed).
+xc/lib/Xevie/Imakefile:
+xc/lib/Xevie/config-subst:
+* Give Xevie its own copy of the config-subst script, instead of
+ hard-coding a within-tree path to the copy in the Xcursor library.
+ (I don't know what the point of directing Xevie over to Xcursor's copy
+ was -- there were already four identical copies of config-subst in X.Org
+ 6.8.2 anyway, so this decision didn't help matters much. :) ) Update
+ Xevie's Imakefile to look for config-subst in the current working
+ directory instead of ../Xcursor.
+
xc/lib/Xft1/Imakefile:
* Give Xft1 its own Imake variable names, distinct from Xft, to
disambiguate them.
@@ -333,6 +343,32 @@
$(WINDOWSLIBDIR) $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR) $(COMPOSITELIBDIR)
SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
+diff -urN xc/lib/Xevie~/Imakefile xc/lib/Xevie/Imakefile
+--- xc/lib/Xevie~/Imakefile 2005-02-28 12:35:18.000000000 -0500
++++ xc/lib/Xevie/Imakefile 2005-06-15 16:28:51.601337553 -0500
+@@ -64,7 +64,7 @@
+
+ xevie.pc: xevie.pc.in
+ RemoveFile($@)
+- sh ../Xcursor/config-subst $(SUBSTVARS) < xevie.pc.in > $@
++ sh config-subst $(SUBSTVARS) < xevie.pc.in > $@
+
+ InstallNonExecFile(xevie.pc,$(USRLIBDIR)/pkgconfig)
+
+diff -urN xc/lib/Xevie~/config-subst xc/lib/Xevie/config-subst
+--- xc/lib/Xevie~/config-subst 1969-12-31 19:00:00.000000000 -0500
++++ xc/lib/Xevie/config-subst 2005-06-15 16:28:27.530784713 -0500
+@@ -0,0 +1,10 @@
++#!/bin/sh
++script=config-subst.$$
++trap "rm $script" 0
++rm -f $script
++for i in ${1+"$@"}; do
++ var="`echo "$i" | sed 's/=.*$//'`"
++ val="`echo "$i" | sed 's/^[^=]*=//'`"
++ echo "s;@$var@;$val;" >> $script
++done
++sed -f $script
diff -ruN xc-old/lib/Xft1/Imakefile xc/lib/Xft1/Imakefile
--- xc-old/lib/Xft1/Imakefile 2004-04-23 18:43:44.000000000 +0000
+++ xc/lib/Xft1/Imakefile 2004-10-26 10:46:37.519215392 +0000
Reply to: