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 16E2D1382C5 for ; Thu, 4 Jan 2018 23:18:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D055E0A8D; Thu, 4 Jan 2018 23:18: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 0CE5FE0A8D for ; Thu, 4 Jan 2018 23:18: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 861FA335C38 for ; Thu, 4 Jan 2018 23:18:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C5BC1A1 for ; Thu, 4 Jan 2018 23:18:54 +0000 (UTC) From: "Sven Wegener" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Wegener" Message-ID: <1515107920.10f7f30cb2ade13389c2a104128a9b86355f52c6.swegener@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/screen/files/screen-4.6.2-utmp-exit.patch app-misc/screen/screen-4.6.2.ebuild X-VCS-Directories: app-misc/screen/files/ app-misc/screen/ X-VCS-Committer: swegener X-VCS-Committer-Name: Sven Wegener X-VCS-Revision: 10f7f30cb2ade13389c2a104128a9b86355f52c6 X-VCS-Branch: master Date: Thu, 4 Jan 2018 23:18:54 +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-Archives-Salt: 5db28a5a-664f-44e1-a69e-5a72ff06ffeb X-Archives-Hash: b682a371adcf800e9e31aa26dcd4b3f9 commit: 10f7f30cb2ade13389c2a104128a9b86355f52c6 Author: Sven Wegener gentoo org> AuthorDate: Thu Jan 4 23:16:48 2018 +0000 Commit: Sven Wegener gentoo org> CommitDate: Thu Jan 4 23:18:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f7f30c app-misc/screen: Fix building on uclibc, bug #562752 Closes: https://bugs.gentoo.org/562752 Package-Manager: Portage-2.3.14, Repoman-2.3.6 app-misc/screen/files/screen-4.6.2-utmp-exit.patch | 55 ++++++++++++++++++++++ app-misc/screen/screen-4.6.2.ebuild | 3 +- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/app-misc/screen/files/screen-4.6.2-utmp-exit.patch b/app-misc/screen/files/screen-4.6.2-utmp-exit.patch new file mode 100644 index 00000000000..11adf69a536 --- /dev/null +++ b/app-misc/screen/files/screen-4.6.2-utmp-exit.patch @@ -0,0 +1,55 @@ +From 2f1b9dfe03133c9b77ea450aed088d65128dc547 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= +Date: Tue, 5 Apr 2016 12:47:08 +0200 +Subject: [PATCH] check if we have ut_exit in utmpx struct + +--- + acconfig.h | 5 +++++ + configure.ac | 4 ++++ + utmp.c | 2 ++ + 3 files changed, 11 insertions(+) + +diff --git a/acconfig.h b/acconfig.h +index 656e117..d173c9c 100644 +--- a/acconfig.h ++++ b/acconfig.h +@@ -215,6 +215,11 @@ + #undef HAVE_UTEMPTER + + /* ++ * Define if your utmpx has ut_exit struct ++ */ ++#undef HAVE_UT_EXIT ++ ++/* + * If your system has the calls setreuid() and setregid(), + * define HAVE_SETREUID. Otherwise screen will use a forked process to + * safely create output files without retaining any special privileges. +diff --git a/configure.ac b/configure.ac +index 1a75020..8457619 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -374,6 +374,10 @@ if test "$have_utempter" = yes; then + AC_DEFINE(HAVE_UTEMPTER) + LIBS="$LIBS -lutempter" + fi ++AC_CHECKING(ut_exit) ++AC_TRY_COMPILE([ ++#include ++],[struct utmpx u; u.ut_exit.e_exit;], AC_DEFINE(HAVE_UT_EXIT)) + + dnl + dnl **** signal handling **** +diff --git a/utmp.c b/utmp.c +index da8d7ff..c864d07 100644 +--- a/utmp.c ++++ b/utmp.c +@@ -381,7 +381,7 @@ static int pututslot(slot_t slot, struct utmpx *u, char *host, Window *win) + struct utmp *u; + { + u->ut_type = DEAD_PROCESS; +-#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__) ++#if defined(HAVE_UT_EXIT) + u->ut_exit.e_termination = 0; + u->ut_exit.e_exit = 0; + #endif diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild index 01169b42901..7b571355fa9 100644 --- a/app-misc/screen/screen-4.6.2.ebuild +++ b/app-misc/screen/screen-4.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,6 +35,7 @@ DEPEND="${CDEPEND} PATCHES=( # Don't use utempter even if it is found on the system. "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch + "${FILESDIR}"/${P}-utmp-exit.patch ) pkg_setup() {