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 C91D6139086 for ; Tue, 17 Jan 2017 17:39:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28D9AE0EDF; Tue, 17 Jan 2017 17:39:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC0E0E0EDF for ; Tue, 17 Jan 2017 17:39:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1085634121E for ; Tue, 17 Jan 2017 17:39:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AAE9A265F for ; Tue, 17 Jan 2017 17:39:04 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1484674737.5993df809e309937b59d1a545fe7bc9f264b5711.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/files/, app-admin/sysklogd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild X-VCS-Directories: app-admin/sysklogd/files/ app-admin/sysklogd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 5993df809e309937b59d1a545fe7bc9f264b5711 X-VCS-Branch: master Date: Tue, 17 Jan 2017 17:39:04 +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: 76cb73f3-8f01-4b71-9398-b435635540c2 X-Archives-Hash: d8250fb887838be614af611c14771c2d commit: 5993df809e309937b59d1a545fe7bc9f264b5711 Author: Rodrigo Saboya users noreply github com> AuthorDate: Mon Jan 16 17:48:08 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jan 17 17:38:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5993df80 app-admin/sysklogd: Fixing build issue with Glibc 2.24. bug #604232 Closes: https://github.com/gentoo/gentoo/pull/3508 .../sysklogd/files/sysklogd-1.5-glibc-2.24.patch | 11 ++++ app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild | 62 ++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch b/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch new file mode 100644 index 00000000..fcddb75 --- /dev/null +++ b/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch @@ -0,0 +1,11 @@ +--- sysklogd-1.5.1/syslogd.c ++++ sysklogd-1.5.1/syslogd.c +@@ -2094,7 +2094,7 @@ + (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */ + wait ((int *)0); + #else +- union wait status; ++ int status; + + while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0) + ; diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild new file mode 100644 index 00000000..9fdc76a --- /dev/null +++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs + +DEB_PV="1.5-6" +DESCRIPTION="Standard log daemons" +HOMEPAGE="http://www.infodrom.org/projects/sysklogd/" +SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz + mirror://debian/pool/main/s/sysklogd/${PN}_${DEB_PV}.diff.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="logrotate" +RESTRICT="test" + +DEPEND="" +RDEPEND="dev-lang/perl + sys-apps/debianutils" + +src_prepare() { + epatch "${WORKDIR}"/${PN}_${DEB_PV}.diff + + epatch "${FILESDIR}"/${PN}-1.5-debian-cron.patch + epatch "${FILESDIR}"/${PN}-1.5-build.patch + + # CAEN/OWL security patches + epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff + epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff + epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff + + epatch "${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601 + epatch "${FILESDIR}"/${PN}-1.5-glibc-2.24.patch #604232 +} + +src_configure() { + append-lfs-flags + tc-export CC +} + +src_install() { + dosbin syslogd klogd debian/syslog-facility debian/syslogd-listfiles + doman *.[1-9] debian/syslogd-listfiles.8 + insinto /etc + doins debian/syslog.conf + if use logrotate ; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/sysklogd.logrotate sysklogd + else + exeinto /etc/cron.daily + newexe debian/cron.daily syslog + exeinto /etc/cron.weekly + newexe debian/cron.weekly syslog + fi + dodoc ANNOUNCE CHANGES NEWS README.1st README.linux + newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd + newconfd "${FILESDIR}"/sysklogd.confd sysklogd +}