Add patch from bug #318287 by Sven Eden <yamakuzure@gmx.net> fixing glibc abort() for potential buffer overflow on startup when compiled with gcc-4.5 and CFLAGS="-O1" and passed the -f flag. OKed by steev_.

Package-Manager: portage-2.2.0_alpha71-r1/cvs/Linux x86_64

4 files changed, 136 insertions, 3 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index 4e4d488798d4..bae3e63b276e 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/cpufreqd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.63 2010/07/19 19:18:34 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.64 2011/10/30 04:58:01 binki Exp $
+
+*cpufreqd-2.4.2-r1 (30 Oct 2011)
+
+  30 Oct 2011; Nathan Phillip Brink <binki@gentoo.org>
+  +cpufreqd-2.4.2-r1.ebuild, +files/cpufreqd-2.4.2-PATH_MAX.patch:
+  Add patch from bug #318287 by Sven Eden <yamakuzure@gmx.net> fixing glibc
+  abort() for potential buffer overflow on startup when compiled with gcc-4.5
+  and CFLAGS="-O1" and passed the -f flag. OKed by steev_.
 
   19 Jul 2010; Joseph Jezak <josejx@gentoo.org> cpufreqd-2.4.2.ebuild:
   Marked ppc stable for bug #323195.
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index d696297bc99f..7c486ab402dd 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cpufreqd-2.4.2-PATH_MAX.patch 411 RMD160 9e2f33fc15233e3c8a4693b0a634748a6964f0ab SHA1 d2ae5f919530c7ff704cecc4aaf2c0c9018b116f SHA256 3923a28fd4a99f242e07e9596f53871f1274cee2c91af5e3836c6ef0abb6c7a9
 AUX cpufreqd-conf.d.patch 269 RMD160 7d597a9fefff26dc0270a94ee6c360e1322390b7 SHA1 9ce182311b269da517f4f126aa485af1dded5423 SHA256 2e4c34e87daffb5929717ba6e91a36c0e85db1e042ff10a1483617f5f4d424e1
 AUX cpufreqd-init.d 1156 RMD160 b64937c969717b5d7234a447b6e548b4c4269638 SHA1 9159187780cd31f657c8f771e534d7d55e2d68c3 SHA256 3fe98f8535e2e7e67f834865d0c3c18d2594d0aa1066e42b06b160955e1c8cf9
 AUX nvclock0.8b-fpic.patch 641 RMD160 08f803b690e1ebf69859b48604bc746a1ee3c0fd SHA1 57581e5b9201c57d811f5ebee61e7dc28bf2efad SHA256 c6dfdc3ecf84b7bd8f0eb7729aff4b3f9fde0bcce2ade0aa1765483bd486e159
 DIST cpufreqd-2.4.2.tar.bz2 299946 RMD160 a6c762dd34f5a74387b37b64843dbf968bc3c28d SHA1 88ff75f3f3d457c49178f1e557ba5435651e1427 SHA256 3b7810a3d244d9b10c8c151fd6037e7d14c9889cdf5cdff1867bd978b9f7482a
 DIST nvclock0.8b.tar.gz 353127 RMD160 66cac5993dc141d00efaa95d8f5ec38ed53854f6 SHA1 ff0a9fe81a8f3227338ffccae143310df1b18551 SHA256 a1fbdb82837c33869c0ebfcb95b6e11fc53b86919e8d1d17265d1af71eb04393
+EBUILD cpufreqd-2.4.2-r1.ebuild 2059 RMD160 5c0e6de91f6ac23c2e6dcf7d44a34b30dbea4034 SHA1 e713556ebdaa49f7f94d09284d7d51edb813f9f8 SHA256 edcc6e4a3b7ff8fbd962c4b7c24378c7f49d38a06130bbf323aebf0a56de0617
 EBUILD cpufreqd-2.4.2.ebuild 2004 RMD160 ee2f5dfe809b5fee1cb2a1301c1413c3ec7a125e SHA1 d0addd727880525a90ed4158713e9e4fe5ee7037 SHA256 f10aa2b7ee325e3b1318180e28ba19b8119d8d2a3ad1dfade5b207ba4fd4dcb9
-MISC ChangeLog 13247 RMD160 d6755074d5bbd276b361f39ec67c88ed626775e9 SHA1 3578007c8229cccd2a6d8c08bb67c23df69d510e SHA256 21c155b67a60ef60418284775cc855c5d0a89293906cf5dc6dd2f1cd61add887
+MISC ChangeLog 13616 RMD160 b4acc94efb9afc3fa05e7473b24a7416adac8027 SHA1 9e18e195d3d8d0d45c8a5f027a298775942e5240 SHA256 3340df38831cf261b5bb27b1a67de7f2dbf68f600e083b17b83a0d88d8c9838e
 MISC metadata.xml 423 RMD160 d843208101d0e0aef245a5d5219e23ba0c7a38a6 SHA1 a88afdeb4b95664870a648ee552b15c329b6a8a9 SHA256 acc4e407d32dcef3e0806c8fec555d9b5bc59cfc5d38f5e989dd5fea62723c93
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOrNlhAAoJEHQ6UuhrqBBQmQ8P/0PmdYLVRxJcynSEvv3D8clY
+aENtDLb/2E24BQpXOe7dYl+Uw15reESjIahqhJegq1BHVPiH/iTq8NVrqKkJwAOE
+rLmSK40ZfOYBNO723rqNLgFlFvvRKiDFRrPwxgp0D5TioBGYk5kVzW4ymwNXUSkV
+mzSefERxrE+sq82VmHloht14wraCd8Y1gBNI93Oyca1to36iiLd1cRFlzpvhFfmV
+YI8bgroNBx1OVobFiWqusvug66dLVp7yZEmeYGtFqPbEbc1P9IwvxEu23SdUS6ZP
+MFwY4mZ/hGTPjzWOl/1dQ/GV/7N3sZPeEvA3Gr2V6iVgL7p4aftc+AlwqJUuSWlh
+EJFL3jKEMYXtShhIgFDY5XNh7Z3gyGu+XrhBRub1gfaOHWgy+9GrSPNtAG9rqh8W
+O989qvV4qpLiC4GGoaSz8ETgcXaZLjJAZwTU9BcYG5peG/4DNKxS9RYcPdzJ+4zv
+P2HT8GajYJwhGMbMtL7UnHN86E3BbzOUCTbwCSI+XmQPUO1l52nHQdiqKe69ey5O
+dSylyWEmjByLM+NGEXn5Fwv/2dNHpWj4Fv3V4RjK8wePV8NQoNkAb6OQWai9rMSs
+32i9blPRauMPk2JqndpvM3IKwDrPcykiRsB3FnLrhJ0/pmXQLi7lVj3urSHhKnaq
+t72R3sv3zHSo7Xk6/dtO
+=BYCr
+-----END PGP SIGNATURE-----
diff --git a/sys-power/cpufreqd/cpufreqd-2.4.2-r1.ebuild b/sys-power/cpufreqd/cpufreqd-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..18dca0520252
--- /dev/null
+++ b/sys-power/cpufreqd/cpufreqd-2.4.2-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.4.2-r1.ebuild,v 1.1 2011/10/30 04:58:01 binki Exp $
+
+EAPI="2"
+
+inherit eutils
+
+NVCLOCK_VERSION="0.8b"
+
+DESCRIPTION="CPU Frequency Daemon"
+HOMEPAGE="http://www.linux.it/~malattia/wiki/index.php/Cpufreqd"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+		nvidia? ( http://www.linuxhardware.org/nvclock/nvclock${NVCLOCK_VERSION}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="acpi apm lm_sensors nforce2 nvidia pmu"
+RDEPEND=">=sys-power/cpufrequtils-002
+		sys-fs/sysfsutils
+		lm_sensors? ( >sys-apps/lm_sensors-3 )"
+DEPEND="sys-apps/sed
+		${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-conf.d.patch
+	epatch "${FILESDIR}"/${P}-PATH_MAX.patch #318287
+
+	if use nvidia; then
+		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
+		epatch "${FILESDIR}"/nvclock${NVCLOCK_VERSION}-fpic.patch
+	fi
+}
+
+src_configure() {
+	local config
+
+	if use nvidia; then
+		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
+		econf \
+			--disable-gtk \
+			--disable-qt \
+			--disable-nvcontrol \
+			|| die "econf nvclock failed"
+		emake -j1 || die "emake nvclock failed"
+		config="--enable-nvclock=${WORKDIR}/nvclock${NVCLOCK_VERSION}"
+	fi
+
+	cd "${S}"
+	econf \
+		$(use_enable acpi) \
+		$(use_enable apm) \
+		$(use_enable lm_sensors sensors) \
+		$(use_enable nforce2) \
+		$(use_enable pmu) \
+		${config} \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if use nvidia; then
+		cd "${WORKDIR}"/nvclock${NVCLOCK_VERSION}
+	fi
+
+	cd "${S}"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	rm -rf "${D}"/usr/$(get_libdir)/*.la
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+}
+
+pkg_postinst() {
+	if [ -f "${ROOT}"/etc/conf.d/cpufreqd ] ; then
+		ewarn "An old \"/etc/conf.d/cpufreqd\" file was found. It breaks"
+		ewarn "the new init script! Please remove it."
+		ewarn "# rm /etc/conf.d/cpufreqd"
+	fi
+}
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.4.2-PATH_MAX.patch b/sys-power/cpufreqd/files/cpufreqd-2.4.2-PATH_MAX.patch
new file mode 100644
index 000000000000..c628f43401ea
--- /dev/null
+++ b/sys-power/cpufreqd/files/cpufreqd-2.4.2-PATH_MAX.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/318287: Fix buffer bound checks causing an
+abort when -f commandline parameter is passed.
+
+--- a/src/cpufreqd.h
++++ b/src/cpufreqd.h
+@@ -54,6 +54,12 @@
+ #define DEFAULT_VERBOSITY	3
+ 
+ #define MAX_STRING_LEN		255
+-#define MAX_PATH_LEN		512
++
++#ifdef HAVE_LIMITS_H
++#include <limits.h>
++#define MAX_PATH_LEN PATH_MAX
++#else
++#define MAX_PATH_LEN 512
++#endif
+ 
+ #endif /* __CPUFREQD_H__ */