From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6DD31138350 for ; Tue, 10 Mar 2020 19:35:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31777E087F; Tue, 10 Mar 2020 19:35:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EB210E087F for ; Tue, 10 Mar 2020 19:35:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15D0934F295 for ; Tue, 10 Mar 2020 19:35:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6B55162 for ; Tue, 10 Mar 2020 19:35:51 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1583868944.18402f2ef1d009c5141c7dd628ab1cc7edea2d91.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild X-VCS-Directories: sys-apps/heirloom-tools/files/ sys-apps/heirloom-tools/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 18402f2ef1d009c5141c7dd628ab1cc7edea2d91 X-VCS-Branch: master Date: Tue, 10 Mar 2020 19:35:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7316b32c-cbe2-4636-a901-38616cb82644 X-Archives-Hash: 4b1cefef39cd82bf938ff6e052ed1826 commit: 18402f2ef1d009c5141c7dd628ab1cc7edea2d91 Author: Stephan Hartmann googlemail com> AuthorDate: Tue Feb 18 15:31:45 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Mar 10 19:35:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18402f2e sys-apps/heirloom-tools: fix building with glibc 2.30 While at it, fix patching with fuzz. Closes: https://bugs.gentoo.org/692770 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Stephan Hartmann googlemail.com> Closes: https://github.com/gentoo/gentoo/pull/14693 Signed-off-by: Sergei Trofimovich gentoo.org> .../files/heirloom-tools-070715-glibc-2.30.patch | 13 ++++ .../files/heirloom-tools-070715-major.patch | 70 +++++++++++++++++++++- .../heirloom-tools/heirloom-tools-070715-r1.ebuild | 8 +-- 3 files changed, 82 insertions(+), 9 deletions(-) diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch new file mode 100644 index 00000000000..19b90cea6d2 --- /dev/null +++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch @@ -0,0 +1,13 @@ +diff --git a/shl/shl.c b/shl/shl.c +index 6f5c2df..30d296c 100644 +--- a/shl/shl.c ++++ b/shl/shl.c +@@ -86,7 +86,7 @@ extern int sysv3; + #include + #include + #include +-#if !defined (__dietlibc__) && !defined (__UCLIBC__) ++#if !defined (__dietlibc__) && !defined (__UCLIBC__) && !defined(__linux__) + #include + #endif + #include diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch index 82d32315d81..81e6755e7e3 100644 --- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch +++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch @@ -1,6 +1,8 @@ +diff --git a/cpio/cpio.c b/cpio/cpio.c +index 89c5cbc..210287b 100644 --- a/cpio/cpio.c +++ b/cpio/cpio.c -@@ -91,9 +91,9 @@ +@@ -91,11 +91,12 @@ #include #include @@ -10,11 +12,45 @@ -#endif /* _AIX */ +#endif /* _AIX || __GLIBC__ */ - #ifndef major +-#ifndef major ++#include ++#if 0 #include + #endif /* !major */ + +diff --git a/file/file.c b/file/file.c +index 6609734..d90af86 100644 +--- a/file/file.c ++++ b/file/file.c +@@ -66,7 +66,8 @@ static const char sccsid[] USED = "@(#)file.sl 1.33 (gritter) 4/14/06"; + #include + #include + #include +-#ifndef major ++#include ++#if 0 + #include + #endif + #include "iblok.h" +diff --git a/find/find.c b/find/find.c +index fac70f0..28e1b7f 100644 +--- a/find/find.c ++++ b/find/find.c +@@ -83,7 +83,8 @@ static const char sccsid[] USED = "@(#)find.sl 1.45 (gritter) 5/8/06"; + #ifdef _AIX + #include + #endif +-#ifndef major ++#include ++#if 0 + #include + #endif + #if __NetBSD_Version__>= 300000000 +diff --git a/ls/ls.c b/ls/ls.c +index e4480d0..17186ba 100644 --- a/ls/ls.c +++ b/ls/ls.c -@@ -119,7 +119,7 @@ +@@ -119,7 +119,7 @@ static char ifmt_c[] = "-pc-d-b--nl-SD--"; #include #endif /* USE_TERMCAP */ @@ -23,3 +59,31 @@ #include #endif +diff --git a/mknod/mknod.c b/mknod/mknod.c +index b772b88..f465883 100644 +--- a/mknod/mknod.c ++++ b/mknod/mknod.c +@@ -45,7 +45,8 @@ static const char sccsid[] USED = "@(#)mknod.sl 1.8 (gritter) 5/29/05"; + #include + #include + #include +-#ifndef major ++#include ++#if 0 + #include + #endif /* !major */ + +diff --git a/tar/tar.c b/tar/tar.c +index 2d3dada..a8f1ccb 100644 +--- a/tar/tar.c ++++ b/tar/tar.c +@@ -98,7 +98,8 @@ static const char sccsid[] USED = "@(#)tar.sl 1.177 (gritter) 4/14/07"; + #include + #endif + +-#ifndef major ++#include ++#if 0 + #include + #endif /* !major */ + diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild index 9d55edab0b4..80d2232221a 100644 --- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild +++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,16 +23,12 @@ DEPEND=" S="${WORKDIR}/heirloom-${PV}" PATCHES=( "${FILESDIR}"/${P}-major.patch + "${FILESDIR}"/${P}-glibc-2.30.patch ) # slightly broken RESTRICT="test" -src_prepare() { - find . -name '*.c' -exec sed -i -e 's|#ifndef[[:space:]]*major|#include \n#if 0|g' {} + || die - - default -} src_compile() { append-cppflags -D_GNU_SOURCE emake -j1 \