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 B751F158041 for ; Sun, 24 Mar 2024 14:16:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAB77E29BC; Sun, 24 Mar 2024 14:16:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEC50E29BC for ; Sun, 24 Mar 2024 14:16:27 +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 E830334306C for ; Sun, 24 Mar 2024 14:16:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55E15B91 for ; Sun, 24 Mar 2024 14:16:25 +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: <1711289710.32043b1ee1d7473b06ddddd83c5c12505273bd91.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/, net-misc/apt-cacher-ng/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch X-VCS-Directories: net-misc/apt-cacher-ng/ net-misc/apt-cacher-ng/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 32043b1ee1d7473b06ddddd83c5c12505273bd91 X-VCS-Branch: master Date: Sun, 24 Mar 2024 14:16: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: f6331025-4a46-4703-84ae-5218709cb977 X-Archives-Hash: 780a3f5fef9e0f6303c128fbbe2ba66f commit: 32043b1ee1d7473b06ddddd83c5c12505273bd91 Author: Sam James gentoo org> AuthorDate: Sun Mar 24 14:15:10 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 24 14:15:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32043b1e net-misc/apt-cacher-ng: fix build with glibc-2.38 Closes: https://bugs.gentoo.org/913133 Thanks-to: Richard Liu techarea.org> Signed-off-by: Sam James gentoo.org> .../apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild | 3 +- .../apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch | 41 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild index 3f1113b4af76..390dc77a0974 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.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=8 @@ -36,6 +36,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.3.1-flags.patch" "${FILESDIR}/${PN}-3.5-perl-syntax.patch" "${FILESDIR}/${PN}-3.6-optional-systemd.patch" + "${FILESDIR}/${PN}-3.7.4-strlcpy-glibc-2.38.patch" ) S="${WORKDIR}/${MY_P}" diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch new file mode 100644 index 000000000000..4d97d6b0d05c --- /dev/null +++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/913133 + +From 7f4bb9de7c84bf55c446c98056259e4e6d8b61e7 Mon Sep 17 00:00:00 2001 +From: Richard Liu +Date: Fri, 19 Jan 2024 00:38:27 +0800 +Subject: [PATCH] fix compile error + +--- + src/meta.cc | 2 +- + src/meta.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/meta.cc b/src/meta.cc +index 9a2053f..5b15eff 100644 +--- a/src/meta.cc ++++ b/src/meta.cc +@@ -831,7 +831,7 @@ bool scaseequals(string_view a, string_view b) + return true; + } + +-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY ++#if !defined(HAVE_STRLCPY) + size_t strlcpy(char *tgt, const char *src, size_t tgtSize) + { + auto p = src; +diff --git a/src/meta.h b/src/meta.h +index a1f4080..dafb754 100644 +--- a/src/meta.h ++++ b/src/meta.h +@@ -323,7 +323,7 @@ class NoCaseStringMap : public std::map + static constexpr string_view svRN = szRN; + static constexpr string_view svLF = "\n"; + +-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY ++#if !defined(HAVE_STRLCPY) + size_t strlcpy(char *tgt, const char *src, size_t tgtSize); + #endif + } +-- +2.43.0 +