summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-07-15 22:21:32 +0000
committerMike Frysinger <vapier@gentoo.org>2012-07-15 22:21:32 +0000
commit6c215d876021bcb1c39ecc83df4b683a4b1f0455 (patch)
tree748e78564a833c4fa05cb16c7aa334ecdfd70abf /app-admin/metalog
parentgnome-screensaver-3.4.2 is now gone from portage. (diff)
downloadgentoo-2-6c215d876021bcb1c39ecc83df4b683a4b1f0455.tar.gz
gentoo-2-6c215d876021bcb1c39ecc83df4b683a4b1f0455.tar.bz2
gentoo-2-6c215d876021bcb1c39ecc83df4b683a4b1f0455.zip
Fix building with glibc-2.16+ #426632 by Christian Hagau.
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/metalog')
-rw-r--r--app-admin/metalog/ChangeLog6
-rw-r--r--app-admin/metalog/files/metalog-2-no-gets.patch24
-rw-r--r--app-admin/metalog/metalog-2.ebuild3
3 files changed, 31 insertions, 2 deletions
diff --git a/app-admin/metalog/ChangeLog b/app-admin/metalog/ChangeLog
index aeb783fb6f79..47b3db326c8e 100644
--- a/app-admin/metalog/ChangeLog
+++ b/app-admin/metalog/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/metalog
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.102 2012/05/06 16:27:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.103 2012/07/15 22:21:32 vapier Exp $
+
+ 15 Jul 2012; Mike Frysinger <vapier@gentoo.org>
+ +files/metalog-2-no-gets.patch, metalog-2.ebuild:
+ Fix building with glibc-2.16+ #426632 by Christian Hagau.
06 May 2012; Raúl Porcel <armin76@gentoo.org> metalog-2.ebuild:
ia64/s390/sh/sparc stable wrt #390033
diff --git a/app-admin/metalog/files/metalog-2-no-gets.patch b/app-admin/metalog/files/metalog-2-no-gets.patch
new file mode 100644
index 000000000000..24d457611b3b
--- /dev/null
+++ b/app-admin/metalog/files/metalog-2-no-gets.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/426632
+
+hack until gzip pulls a newer gnulib version
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- a/gnulib/lib/stdio.in.h
++++ b/gnulib/lib/stdio.in.h
+@@ -125,7 +125,6 @@
+ /* It is very rare that the developer ever has full control of stdin,
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+
+
diff --git a/app-admin/metalog/metalog-2.ebuild b/app-admin/metalog/metalog-2.ebuild
index 38b1c9bfde0d..3622317399e4 100644
--- a/app-admin/metalog/metalog-2.ebuild
+++ b/app-admin/metalog/metalog-2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-2.ebuild,v 1.9 2012/05/06 16:27:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-2.ebuild,v 1.10 2012/07/15 22:21:32 vapier Exp $
EAPI="3"
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.9-metalog-conf.patch
+ epatch "${FILESDIR}"/${P}-no-gets.patch #426632
}
src_configure() {