rev 7244 - in trunk/packages/qt-x11-free/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-09-26 19:44:24 +0000 (Wed, 26 Sep 2007)
New Revision: 7244

Added:
   trunk/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch
Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/00list
Log:
work around uname -m usage.

I guess this needs to be ported to qt4 also


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2007-09-26 19:44:16 UTC (rev 7243)
+++ trunk/packages/qt-x11-free/debian/changelog	2007-09-26 19:44:24 UTC (rev 7244)
@@ -1,3 +1,11 @@
+qt-x11-free (3:3.3.7-9) unstable; urgency=low
+
+  * Map the bloody build key to debian archs with what's currently used so
+    that archs with buildd admins having /dev/random deciding their uname
+    builds correctly everywhere. Add patch 72 for that.
+
+ -- Sune Vuorela <debian at pusling.com>  Wed, 26 Sep 2007 21:42:24 +0200
+
 qt-x11-free (3:3.3.7-8) unstable; urgency=low
 
   * Add patch for utf8 parser decoder overflow. CVE-2007-4137

Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list	2007-09-26 19:44:16 UTC (rev 7243)
+++ trunk/packages/qt-x11-free/debian/patches/00list	2007-09-26 19:44:24 UTC (rev 7244)
@@ -49,3 +49,4 @@
 70_bad_typecast_amd64
 90_armeabi
 71_utf8overflow_cve_CVE-2007-4137.dpatch
+72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch

Added: trunk/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch	                        (rev 0)
+++ trunk/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch	2007-09-26 19:44:24 UTC (rev 7244)
@@ -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: trunk/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.dpatch
___________________________________________________________________
Name: svn:executable
   + *