summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-11-02 03:37:01 +0000
committerTim Harder <radhermit@gentoo.org>2012-11-02 03:37:01 +0000
commit8999bbc36f995b6a128976b9f09833757ad25531 (patch)
treed55323b25888a2aea2f136307098b01349b4de64 /dev-db/recutils
parentvanilla-3.6.5 + genpatches-3.6-4 + grsecurity-2.9.1-3.6.5-201210312121 (diff)
downloadhistorical-8999bbc36f995b6a128976b9f09833757ad25531.tar.gz
historical-8999bbc36f995b6a128976b9f09833757ad25531.tar.bz2
historical-8999bbc36f995b6a128976b9f09833757ad25531.zip
Fix build with glibc-2.16 (bug #426922).
Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'dev-db/recutils')
-rw-r--r--dev-db/recutils/ChangeLog6
-rw-r--r--dev-db/recutils/Manifest19
-rw-r--r--dev-db/recutils/files/recutils-1.5-glibc-2.16.patch29
-rw-r--r--dev-db/recutils/recutils-1.5.ebuild3
4 files changed, 53 insertions, 4 deletions
diff --git a/dev-db/recutils/ChangeLog b/dev-db/recutils/ChangeLog
index b51b2b8f21cf..f09d8f152871 100644
--- a/dev-db/recutils/ChangeLog
+++ b/dev-db/recutils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/recutils
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/recutils/ChangeLog,v 1.2 2012/05/03 02:33:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/recutils/ChangeLog,v 1.3 2012/11/02 03:36:52 radhermit Exp $
+
+ 02 Nov 2012; Tim Harder <radhermit@gentoo.org> recutils-1.5.ebuild,
+ +files/recutils-1.5-glibc-2.16.patch:
+ Fix build with glibc-2.16 (bug #426922).
03 May 2012; Jeff Horelick <jdhore@gentoo.org> recutils-1.5.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/dev-db/recutils/Manifest b/dev-db/recutils/Manifest
index 2b4d627f6f5d..98841fb85aa6 100644
--- a/dev-db/recutils/Manifest
+++ b/dev-db/recutils/Manifest
@@ -1,6 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX 50recutils-gentoo.el 202 SHA256 b6afb4842b3e2efceccc486c9a14042df2e31d167f1faa30eb509be57443e7eb SHA512 b5923297aef0a2d2cac3a5ef888813f2e9ed626462c5538c6f096483005a2918e08d332480d6e118e1416ab89718cdd5f79354a5a5e357bb77223ca97e38c029 WHIRLPOOL 5a94ed7f6da1753b8316b17f82b12fe6a53825b61155926ee0a4de34d79fa92fcd8e3fc574a9ce14ab8482156dfebd4c6749532b860b89db1cfb41053b186e0c
AUX recutils-1.5-automagic.patch 1717 SHA256 b9713db3892844af2ba4207e8f21e402383c7621afa94b09d5527b544a4d9513 SHA512 3a8d2befc1330f2df86ab7e988e85ed11e75a35de6ef959c2279f81952ea6df954ca2e04f0caa70604c95c2700338e27c112acfeab633447dea6d1dbed650766 WHIRLPOOL eb2846b2a2119c86058b1ed1863491b6dcd4988fc6e8b5125863acc649d67c01ad3bb4f1c233ac61e0bb05cca1d030970df51c95ad99e5aac23f03bde916c44c
+AUX recutils-1.5-glibc-2.16.patch 921 SHA256 28c169df3573748215a78b78793d45a09aeefc6194cf1185c7c0f11881eb289a SHA512 86954d99ff6970234e5a6c72a5a8ad4c6aabc6f3cfdb246b88d10dfdff1632943f8f6eecdf454dd931b28a5911d7ae437a6b63976aa5d9e7caa147f8309aedef WHIRLPOOL b6fcd45d4db60247ba7537384e8c9d8ef043bf3fcfea5efd74f5b01a2bbdaaa04ddd1ecb4cec3dd26fbf2eb7641271fd1a402debb2b65e9862380bf777dad493
DIST recutils-1.5.tar.gz 1811121 SHA256 7ed67e74468084f52ad9341e4b11c44e5fd9d5325b93b7eb2cb230c839ff5dec SHA512 6c6091618474b5e54948370ef26db3cb446b0d8719d443fa1dbbdee75f046d536ab61ce803a9443f2e31ab7e46774aaf73c3d4fe2bf9da90a2c508dbbcc611be WHIRLPOOL 25363ec7a03990d0114eb0f1cc161d1685ec7a3e4627b927ef8d0439a5e9998f3836915da12107ddb5bc759bca4b630dea25fa657b89b196c361a1156a3daef8
-EBUILD recutils-1.5.ebuild 1605 SHA256 810a72095f8ec14fc9c43608526f63fd65f77dbbb1b81c7f6e08348dc4bbba4d SHA512 fa043003d6d9bea7e353876b09fcd2fd23581fb349ed1281d6f34ff1f222e9a4dc013493ec9d99d3fff86f48d899ee0f8963d8d941c414acd87370ec2ac85f81 WHIRLPOOL 021424db7d1d8f79bc291b439b684e566dbd8b388eb62fc1b2692237aff8495224e8a5520b23bf92bd3eb67eb2973a155cd3f59dc177ba32a69807b872b077f2
-MISC ChangeLog 532 SHA256 3e4aa136a81da5a897f057c6342c63e155f9db5799c1a76acaf9e75328c71d5d SHA512 572a3573b2dfd76181d42c1deccdaae65ebc5e9868cf584a53a1ded32671a247fcc347aff0e0b3b115651feeab8e7c7b231b0b84c4202001d46a670a634b55e9 WHIRLPOOL 67d569a4a3eb6a4f954ddd818b2d338e06d66f2dc25f608be3d4dfea2ea495a3a9a2ec3f17653b3f7ba52f8cc76848474a2ebb67750eb2661fd484cfab991c11
+EBUILD recutils-1.5.ebuild 1652 SHA256 63805c9a71942184f6ee8dcaadcc7f17d882468c4fb9676b0fd334ec29bc0cf6 SHA512 0870f99f3cb7a026eed218626abf9e983dee3463f6d916522b1ce48a1958a061aae505c7444b9fe812ddd67dfa1bc9e81d183e260ea55f3820e7e2dacd26a685 WHIRLPOOL bb137ab85a4c15b439abbca78aff4e3e2b88bbe8b38a462897705fef9d439a90726f2ab8eca1e3032459f9170f78cf511f42dba5490c56fbf01d366a876c66d3
+MISC ChangeLog 689 SHA256 2a2e8b627016cfe09eb680d7bca3128171db8ce37431a5874f13e00768a3f3e4 SHA512 c870ff47decb06ab3810bc048b6d30ee149b41b2f9460d9d52d2464997059a9003c00cc08715c36f4ed590e7b1f1374391cf1b8e72c8512b5e2c893059e2b920 WHIRLPOOL 79b69196aed11cacf3426836ab82de1d52c33eeff526e79a9ba6817fe3923f7787415986b75bfabaaef05594371665f28959f114ccc67d42d2823ea34958616a
MISC metadata.xml 378 SHA256 eff5b74d202d5651c6c1f2f75c1db0d6f42727360ad914cdfb0573bc203cbf9a SHA512 739712a47455dcdc073661b9de87c0273c5b1101de9f0063bcfe27c84fb0380ebaf5b18dee0de6299bc4c7b39a7fd4396294e184ec44b052a13e5f4182a7aae5 WHIRLPOOL 7ddf43ea66b9b04153bdab89813edce12c155562264cd12a03cedbadb5245699ba1e6ceb132e880b3a07f151af15c32b2ef9ea289023a186c0db1ce37ca57575
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQkz/dAAoJEEqz6FtPBkyj63gH/3W3xlNOOp9vr+f9YyVwMDlO
+6l3CKBbNjEIXzG6hez3enob6n9+HSC9d7Dxa0MRKxYsTOCLqkrjlBmqQPevpyuNb
+73snUkcRm4e1Vw9jhcf3Hwr+9HrZ7XZVlLEZ4bBvZPJEjNm4vRkG8gEgBBuqOb4a
+OegzT8Ph3m2Jj8b9UaQjVaNkFdG2sl/kATyVvTQchhmweP162M++VknRH2/jNcL8
+g9e5Wm1G/TflhuNUT4jMgMKUi+KZbCFhICV3YnWdJvhKs3h9i/Pft1G+KMmF0zBP
+bL6IBRg0wdf/6RsuZYhNELU94u8Q2Hs+1g5Fg/2eRQdGilRTlQrw6fmHnwhKfY4=
+=jDw4
+-----END PGP SIGNATURE-----
diff --git a/dev-db/recutils/files/recutils-1.5-glibc-2.16.patch b/dev-db/recutils/files/recutils-1.5-glibc-2.16.patch
new file mode 100644
index 000000000000..8b4997f099de
--- /dev/null
+++ b/dev-db/recutils/files/recutils-1.5-glibc-2.16.patch
@@ -0,0 +1,29 @@
+--- recutils-1.5/lib/stdio.in.h
++++ recutils-1.5/lib/stdio.in.h
+@@ -699,22 +699,11 @@
+ # endif
+ #endif
+
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-# undef gets
+-# define gets rpl_gets
+-# endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-# undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+ /* 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. */
++ so any use of gets warrants an unconditional warning; besides, C11
++ removed it. */
++#undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+
diff --git a/dev-db/recutils/recutils-1.5.ebuild b/dev-db/recutils/recutils-1.5.ebuild
index 8216f7361ff4..91bc2fc6c05a 100644
--- a/dev-db/recutils/recutils-1.5.ebuild
+++ b/dev-db/recutils/recutils-1.5.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/dev-db/recutils/recutils-1.5.ebuild,v 1.2 2012/05/03 02:33:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/recutils/recutils-1.5.ebuild,v 1.3 2012/11/02 03:36:52 radhermit Exp $
EAPI=4
@@ -38,6 +38,7 @@ SITEFILE="50${PN}-gentoo.el"
src_prepare() {
epatch "${FILESDIR}"/${P}-automagic.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.16.patch
# Don't unconditionally install emacs files
sed -i -e "/^dist_lisp_DATA/d" etc/Makefile.am || die