rev 10126 - in branches/etch/packages/qt-x11-free/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-04-12 15:07:13 +0000 (Sat, 12 Apr 2008)
New Revision: 10126

Added:
   branches/etch/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch
Modified:
   branches/etch/packages/qt-x11-free/debian/changelog
   branches/etch/packages/qt-x11-free/debian/patches/00list
Log:
take 72_dont_trust_uname-m_use_dpkg-arch_instead from unstable and push it into etch

Modified: branches/etch/packages/qt-x11-free/debian/changelog
===================================================================
--- branches/etch/packages/qt-x11-free/debian/changelog	2008-04-12 10:01:40 UTC (rev 10125)
+++ branches/etch/packages/qt-x11-free/debian/changelog	2008-04-12 15:07:13 UTC (rev 10126)
@@ -1,3 +1,16 @@
+qt-x11-free (3:3.3.7-4etch2) stable; urgency=low
+
+  * Don't trust uname -m. Trust dpkg-arch.
+
+ -- Sune Vuorela <debian at pusling.com>  Fri, 11 Apr 2008 23:52:23 +0200
+
+qt-x11-free (3:3.3.7-4etch1) stable-security; urgency=high
+
+  * Fix format string vulnerabilities. (CVE-2007-3388)
+  * Fix off-by-one in UTF codec. (CVE-2007-4137)
+
+ -- Moritz Muehlenhoff <jmm at debian.org>  Sun,  2 Dec 2007 22:02:45 +0000
+
 qt-x11-free (3:3.3.7-4) unstable; urgency=high
 
   * Add patch to fix issue with utf8 parsing.

Modified: branches/etch/packages/qt-x11-free/debian/patches/00list
===================================================================
--- branches/etch/packages/qt-x11-free/debian/patches/00list	2008-04-12 10:01:40 UTC (rev 10125)
+++ branches/etch/packages/qt-x11-free/debian/patches/00list	2008-04-12 15:07:13 UTC (rev 10126)
@@ -42,3 +42,6 @@
 62_bengali_charfix
 63_qmake_hurd
 64_utf8-parsing-vulnerability
+65_CVE-2007-3387
+66_CVE-2007-4137
+72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch

Added: branches/etch/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch
===================================================================
--- branches/etch/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch	                        (rev 0)
+++ branches/etch/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch	2008-04-12 15:07:13 UTC (rev 10126)
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch by Sune Vuorela <debian at pusling.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad qt-x11-free-3.3.7~/configure qt-x11-free-3.3.7/configure
+--- qt-x11-free-3.3.7~/configure	2007-09-26 18:13:43.000000000 +0200
++++ qt-x11-free-3.3.7/configure	2007-09-26 18:19:43.000000000 +0200
+@@ -35,7 +35,44 @@
+ #-------------------------------------------------------------------------------
+ 
+ # need that throughout the script
+-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++DPKG_ARCH=`(dpkg-architecture -qDEB_BUILD_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown
++case $DPKG_ARCH in 
++	amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	arm)
++		UNAME_MACHINE="armv4l"
++	;;
++	armel)
++		UNAME_MACHINE="armv5tel"
++	;;
++	hppa)
++		UNAME_MACHINE="parisc64"
++	;;
++	hurd-i386)
++		UNAME_MACHINE="i686-AT386"
++	;;
++	i386)
++		UNAME_MACHINE="i686"
++	;;
++	kfreebsd-amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	kfreebsd-i386)
++		UNAME_MACHINE="i586"
++	;;
++	mipsel)
++		UNAME_MACHINE="mips"
++	;;
++	powerpc)
++		UNAME_MACHINE="ppc"
++	;;
++	*)
++		UNAME_MACHINE="$DPKG_ARCH"
++	;;
++
++
++esac
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown


Property changes on: branches/etch/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch
___________________________________________________________________
Name: svn:executable
   + *