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 C2876138334 for ; Tue, 20 Aug 2019 20:43:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4F40E0817; Tue, 20 Aug 2019 20:43:28 +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 A2B5DE0817 for ; Tue, 20 Aug 2019 20:43:28 +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 E599B349FED for ; Tue, 20 Aug 2019 20:43:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BA51783 for ; Tue, 20 Aug 2019 20:43:25 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1566333792.7b09219f15e8a105248b7ac1c07d8ab239ada118.blueness@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/ X-VCS-Repository: proj/musl X-VCS-Files: x11-base/xorg-server/Manifest x11-base/xorg-server/files/xdm.initd-11 x11-base/xorg-server/xorg-server-1.20.4.ebuild x11-base/xorg-server/xorg-server-1.20.5.ebuild X-VCS-Directories: x11-base/xorg-server/ x11-base/xorg-server/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 7b09219f15e8a105248b7ac1c07d8ab239ada118 X-VCS-Branch: master Date: Tue, 20 Aug 2019 20:43:25 +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: 7404a7a6-c6bc-4486-8863-9b2ff5363018 X-Archives-Hash: 0c5b3420ba0349b7f190c8044f08dc36 commit: 7b09219f15e8a105248b7ac1c07d8ab239ada118 Author: stefson yahoo de> AuthorDate: Tue Jul 30 04:48:14 2019 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Aug 20 20:43:12 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b09219f x11-base/xorg-server: revbump to 1.20.5 Signed-off-by: Steffen Kuhn yahoo.de> Signed-off-by: Anthony G. Basile gentoo.org> x11-base/xorg-server/Manifest | 2 +- x11-base/xorg-server/files/xdm.initd-11 | 2 +- .../{xorg-server-1.20.4.ebuild => xorg-server-1.20.5.ebuild} | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 3dd24c9..f978f86 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1 +1 @@ -DIST xorg-server-1.20.4.tar.bz2 6123780 BLAKE2B 224dda54f433315f6614cbee5bc54db91d9d9e190c06ac7f26e334b80b9d4a612ff4b2a4f10f50a6f928ecdbea40172d5578289fbf88411f006bcd473253b05d SHA512 f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8 +DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11 index 70b81c0..ce76c56 100644 --- a/x11-base/xorg-server/files/xdm.initd-11 +++ b/x11-base/xorg-server/files/xdm.initd-11 @@ -208,7 +208,7 @@ stop() { ebegin "Stopping ${myservice}" - if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then + if start-stop-daemon --quiet --test --stop --exec "${myexe}" 2>/dev/null; then start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ ${mypidfile:+--pidfile} ${mypidfile} \ ${myname:+--name} ${myname} diff --git a/x11-base/xorg-server/xorg-server-1.20.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild similarity index 95% rename from x11-base/xorg-server/xorg-server-1.20.4.ebuild rename to x11-base/xorg-server/xorg-server-1.20.5.ebuild index ec78441..dfc7110 100644 --- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild @@ -91,7 +91,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0 DEPEND="${CDEPEND} sys-devel/flex - >=x11-base/xorg-proto-2018.3 + >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( @@ -119,9 +119,9 @@ REQUIRED_USE="!minimal? ( xephyr? ( kdrive )" UPSTREAMED_PATCHES=( - "${FILESDIR}"/${P}-shm-reindent-shm_tmpfile-to-follow-our-standards.patch - "${FILESDIR}"/${P}-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch - "${FILESDIR}"/${P}-shm-Use-memfd_create-when-possible.patch + "${FILESDIR}"/${PN}-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch + "${FILESDIR}"/${PN}-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch + "${FILESDIR}"/${PN}-1.20.4-shm-Use-memfd_create-when-possible.patch ) PATCHES=(