diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-01 09:17:53 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-01 09:18:03 +0000 |
| commit | 1a88e52e31e566932e34366843861c92f641d202 (patch) | |
| tree | c567d2a96fe61335f9a24c83cc865dd85a749337 | |
| parent | b4b4859ace40c66919d89f00acefd3edb6d89a4d (diff) | |
| download | aports-1a88e52e31e566932e34366843861c92f641d202.tar.bz2 aports-1a88e52e31e566932e34366843861c92f641d202.tar.xz | |
main/cpufrequtils: upgrade to 008
| -rw-r--r-- | main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch | 33 | ||||
| -rw-r--r-- | main/cpufrequtils/APKBUILD | 8 |
2 files changed, 38 insertions, 3 deletions
diff --git a/main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch b/main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch new file mode 100644 index 0000000000..b10d2e5635 --- /dev/null +++ b/main/cpufrequtils/0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch @@ -0,0 +1,33 @@ +From 4c6552d2df2912a710cab6acf476347a7fbf15a0 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 1 Sep 2010 09:12:44 +0000 +Subject: [PATCH] Support for Position Independet Code by aboid clobbering PIC register + +Do not use the PIC register (ebx) +See http://www.gentoo.org/proj/en/hardened/pic-fix-guide.xml#doc_chap5 +--- + utils/cpuid.h | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/utils/cpuid.h b/utils/cpuid.h +index 2bac69a..ebcec7c 100644 +--- a/utils/cpuid.h ++++ b/utils/cpuid.h +@@ -5,9 +5,12 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx, + unsigned int *ecx, unsigned int *edx) + { + /* ecx is often an input as well as an output. */ +- asm volatile("cpuid" ++ asm volatile( ++ "movl %%ebx, %%esi;" ++ "cpuid;" ++ "xchg %%ebx, %%esi;" + : "=a" (*eax), +- "=b" (*ebx), ++ "=S" (*ebx), + "=c" (*ecx), + "=d" (*edx) + : "0" (*eax), "2" (*ecx)); +-- +1.7.2.2 + diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD index 1f9fd530b8..068b475a76 100644 --- a/main/cpufrequtils/APKBUILD +++ b/main/cpufrequtils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cpufrequtils -pkgver=007 -pkgrel=2 +pkgver=008 +pkgrel=0 pkgdesc="Userspace tools for the kernel cpufreq subsystem" url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html" license="GPL" @@ -10,6 +10,7 @@ depends="sysfsutils" makedepends="sysfsutils-dev libtool" source="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/$pkgname-$pkgver.tar.bz2 cpufrequtils-006-nls.patch + 0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch $pkgname.initd $pkgname.confd" @@ -37,7 +38,8 @@ package() { install -D -m755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -D -m644 ../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -md5sums="fdd833ce70a9ae40ae8bce5b18f2becf cpufrequtils-007.tar.bz2 +md5sums="c59b71c044d463896f3247e8dd83dd7e cpufrequtils-008.tar.bz2 aa4c6f19766a741a68ae1ad352c6bad9 cpufrequtils-006-nls.patch +9f999b70138d84580894df48340e50cc 0001-Support-for-Position-Independet-Code-by-aboid-clobbe.patch b9b80ef2f1b6c5e7ce0476037a8bce6b cpufrequtils.initd d47ff635eef03248c633486eaeec191d cpufrequtils.confd" |