diff options
| author |   Sam James <sam@gentoo.org> | 2024-03-24 14:15:10 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-03-24 14:15:10 +0000 |
| commit | 32043b1ee1d7473b06ddddd83c5c12505273bd91 (patch) | |
| tree | ae30075222e1b0a32d823cba43cf1ec2861431d6 | |
| parent | toolchain.eclass: improve hybrid check (diff) | |
| download | gentoo-32043b1ee1d7473b06ddddd83c5c12505273bd91.tar.gz gentoo-32043b1ee1d7473b06ddddd83c5c12505273bd91.tar.bz2 gentoo-32043b1ee1d7473b06ddddd83c5c12505273bd91.zip | |
net-misc/apt-cacher-ng: fix build with glibc-2.38
Closes: https://bugs.gentoo.org/913133
Thanks-to: Richard Liu <richliu@techarea.org>
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild | 3 | ||||
| -rw-r--r-- | net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch | 41 |
2 files changed, 43 insertions, 1 deletions
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 <richliu@techarea.org> +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<mstring, mstring, ltstring> + 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 + |