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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63C551581E7 for ; Sat, 27 Apr 2024 01:11:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99212E29B4; Sat, 27 Apr 2024 01:11:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58277E29ED for ; Sat, 27 Apr 2024 01:11:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 161AB342FFD for ; Sat, 27 Apr 2024 01:11:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34428173B for ; Sat, 27 Apr 2024 01:11:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1714179329.de42887364fb0681a6045f33b48dfefe58c46298.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/pptpd/files/, net-vpn/pptpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/pptpd/files/pptpd-1.4.0-c99.patch net-vpn/pptpd/pptpd-1.4.0-r3.ebuild net-vpn/pptpd/pptpd-1.4.0-r4.ebuild X-VCS-Directories: net-vpn/pptpd/files/ net-vpn/pptpd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: de42887364fb0681a6045f33b48dfefe58c46298 X-VCS-Branch: master Date: Sat, 27 Apr 2024 01:11:30 +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: d8b080d5-cfca-410b-b5f3-f3f9929d013b X-Archives-Hash: 8da0c8c5fedf5e5afc207b43946f0493 commit: de42887364fb0681a6045f33b48dfefe58c46298 Author: Sam James gentoo org> AuthorDate: Sat Apr 27 00:55:29 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 27 00:55:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de428873 net-vpn/pptpd: fix Modern C issue Interestingly, this only seems to manifest with >=glibc-2.38, because the include had a '#ifndef HAVE_STRLCPY' guard. Closes: https://bugs.gentoo.org/920775 Closes: https://bugs.gentoo.org/927333 Signed-off-by: Sam James gentoo.org> net-vpn/pptpd/files/pptpd-1.4.0-c99.patch | 16 ++++++++++++++++ .../{pptpd-1.4.0-r3.ebuild => pptpd-1.4.0-r4.ebuild} | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch b/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch new file mode 100644 index 000000000000..902a275d5f35 --- /dev/null +++ b/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/920775 +https://bugs.gentoo.org/927333 + +--- a/compat.c ++++ b/compat.c +@@ -10,9 +10,9 @@ + + #include "compat.h" + #include "our_syslog.h" ++#include + + #ifndef HAVE_STRLCPY +-#include + #include + + void strlcpy(char *dst, const char *src, size_t size) diff --git a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild b/net-vpn/pptpd/pptpd-1.4.0-r4.ebuild similarity index 96% rename from net-vpn/pptpd/pptpd-1.4.0-r3.ebuild rename to net-vpn/pptpd/pptpd-1.4.0-r4.ebuild index 425dcbcb8d78..c5805c7696e2 100644 --- a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild +++ b/net-vpn/pptpd/pptpd-1.4.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,6 +40,7 @@ src_prepare() { "${FILESDIR}/${P}-pidfile.patch" "${FILESDIR}/${P}-libdir.patch" "${FILESDIR}/${P}-musl.patch" + "${FILESDIR}/${P}-c99.patch" ) if has_version -d ">=net-dialup/ppp-2.5.0"; then