gentoo auto-resync : 24:03:2024 - 19:00:40

5 files changed, 99 insertions, 2 deletions

diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 53d3ff0d2e6a..1b0df1c47df8 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,11 +1,14 @@
 AUX apt-cacher-ng-3.3.1-flags.patch 340 BLAKE2B e9de81bc2a73a24c99fc7f3509d5e94e148e5ec1c4c672c28428aec398344a37b180084f26f7050fc39a92942ffb2a743b87e13dda7b21d9085516c7847e29f7 SHA512 f57cf0f6d74f1326feb2796a92ed22c6e19dcfed923f6c3a130ca82e0a0abd3c7e629ca29eb1512aefd2500e2da75cdffbd32d53c727a1be52ea3d4664f4cceb
 AUX apt-cacher-ng-3.5-perl-syntax.patch 365 BLAKE2B db71cf58c61ef6192f0d2955f64dbbe89ea580c4dbdd6cabc150f5cdebbf383f916dcfc1379e0caa1792be7dbda18898e71fc7a4f1829ae77160dc4a9ca83a74 SHA512 fe933eac743b13974cd7451f9a8fcbd32d6f779b992aaa07526eb291eeb64dbd48050ec08ae141fee55df2f1c415799073a78236c6fa10d5eb12733e2919ca16
 AUX apt-cacher-ng-3.6-optional-systemd.patch 2307 BLAKE2B aaf31601172f378c403dea6fc9f5d0ace9a6bb5f4d1eb2a4cdfd5198c15b59ad5f98663618d2303fd52147de40cfb2f8ac6e0b149ea73e9bf4cdba27c647a14c SHA512 b337dbaf7379e1cdbfab32c93046312e7e69ffebc5229f056c11434ae2fd1248ff94595eaeb0810d7a8a6e127fb663919c5d4311be06e6b0013e057912062aeb
+AUX apt-cacher-ng-3.7.4-gcc14.patch 685 BLAKE2B 28a7ae9dc7d25683d34d6c37afd13e0779e84f9e94f3f727be29a2260bb3cd2d44e392f09488bd01d13993983ef6d3c644f466eb56ab3eaa1a3ff266fe9495d6 SHA512 93ac03de3c772da8d775ef67212ca062e10d61f15462bb6ac303885674a0a0065011513113c930d18f5e69d5f9a146d895c1eb61b4782801f76d5d2c4b455859
+AUX apt-cacher-ng-3.7.4-musl.patch 193 BLAKE2B 2b08c2cf6229473de18138ff0b112040665736ccec1725c056d29b2b6240e7873a194e5234e2dda95761403c893e103ba4a5d03e29e70d77415e0c969505840c SHA512 27e2f88054669c63c6d0d560461ef12514f1e8493f970fdc76bef8cc50d47315b3e61a2613fc30188d3631d563fd238a1f85e19d3f0b08880e17fd53292c57a5
+AUX apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch 1097 BLAKE2B eeaad0cf7865e7b8ec461e63d447fd2c212b6f09acddb4fda87a29ad54db2bdde204ff707acfd3387d3ca0e926409556ec6cfb694e095d486f17a6d0612225f4 SHA512 67d010458841b02aabc0ac408b3ce88647837101431a87c8cd57012edc4a076a5c85d43aaf2f4c00bbd7116ff43794d096f4ca06740c467bddd080e4aee9f515
 AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38184b905d6ecd372bfa8e13b52babba18da0c8f364a6ba66890d6de96ce6970c7c8ff3b2d2 SHA512 4a7cd8ee8125def9290d2e7a369f76308bcf8faf22eb908c974cedb7206d1d02417636cc14ccec9047bd25d7f4fd0d245189353cb2b0266f8c8122e019460666
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
 AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
 DIST apt-cacher-ng-debian-3.7.4-1.tar.gz 524480 BLAKE2B ebb450af29439910fe35a558ae6f7ea02337bfbbe5a8efcb20a803e779deedd7901358a71b69745a53036fb8db9db3c9112fc09b47055f07dfe225f3df95202d SHA512 a2aa3218d8cf216cef7177f30bfb90b9961460add2a90823e15952e38d19b0dd527e3cecd029bbf1f10abcfcfd11d406bc9019919d1efccf0d9d69bb7cc1a173
-EBUILD apt-cacher-ng-3.7.4_p1-r2.ebuild 2705 BLAKE2B b9c35fdfbeff143bd353d5bcf0c1a6d701449b0cb83db5bf351d8a32319812f39425414ca0b37a5b64558690351ac1c220cbb083068e74d4efe2cf78d7b4b3c4 SHA512 68f139102b7c56f736071225e41e4ad6d1109fd707f48713b5256ee157f64957ff741274b971cf7757f83cf43262e641df42337f0c41b37a8afa7fe734b0e9e9
+EBUILD apt-cacher-ng-3.7.4_p1-r2.ebuild 2834 BLAKE2B 1af2657e13bd362021956e36459e4f8375ecd456561ba263f3506541c1370f47c0404e834bfcb89cf4cb8be4b3655d6a330a61493318a6c6bbb020d37046778b SHA512 c451aadd775b52249e774bf058584e2412124e38675714f4bd156ed8ea74ce3ff1da325caa3f2e23f78bfacf6117d732a8b7790a93f745514bc117333f3f4d38
 EBUILD apt-cacher-ng-9999.ebuild 2574 BLAKE2B a9bed998884e1a32b706e89b9e9eb2666e2d44ec5ad1b812107ea1b72b049b0292efc3a80e16a994b1947efa1ff84289b45845c75a9e34856857730ae26907bc SHA512 cbb85cd9e4daf2a01790c9b54d944dbd60b3c32c8b0a5f996491a6c723f4db7bc9ffc0d66aef0dd917f12591465a32056e93345d64967e03faa1e9a620c525aa
 MISC metadata.xml 388 BLAKE2B 5f7ddcd8cc39af27c73c68d4225cdea159ba54c45e54e20b384afe591c227ac4be20d818cf9b47a7d297326583b0b2d18855dc4176f37c36eb257e5c26810c1f SHA512 06d02f487d476a0f9c4aa387f64857b5d42d9ffb79ea451429b3464d9ec2de66243bfd8080848eed76af95350fcc36944c756326c2c54ed72824a0a0e1976f52
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..a97170d14427 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,9 @@ 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"
+	"${FILESDIR}/${PN}-3.7.4-musl.patch"
+	"${FILESDIR}/${PN}-3.7.4-gcc14.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
new file mode 100644
index 000000000000..345d7d5c80e4
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
@@ -0,0 +1,39 @@
+--- a/src/aconnect.cc
++++ b/src/aconnect.cc
+@@ -6,6 +6,7 @@
+ #include "debug.h"
+ #include "portutils.h"
+ 
++#include <algorithm>
+ #include <future>
+ 
+ #include <sys/types.h>
+--- a/src/acregistry.cc
++++ b/src/acregistry.cc
+@@ -5,6 +5,7 @@
+ #include "cleaner.h"
+ #include "evabase.h"
+ 
++#include <algorithm>
+ #include <list>
+ 
+ #define IN_ABOUT_ONE_DAY 100000
+--- a/src/caddrinfo.cc
++++ b/src/caddrinfo.cc
+@@ -1,5 +1,6 @@
+ #include "meta.h"
+ 
++#include <algorithm>
+ #include <deque>
+ #include <memory>
+ #include <list>
+--- a/src/header.cc
++++ b/src/header.cc
+@@ -10,6 +10,7 @@
+ #include "filereader.h"
+ #include "httpdate.h"
+ 
++#include <algorithm>
+ #include <map>
+ #include <iostream>
+ 
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch
new file mode 100644
index 000000000000..01fb990fc98c
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/716564
+--- a/src/meta.h
++++ b/src/meta.h
+@@ -20,6 +20,7 @@
+ #include <strings.h>
+ #include <cstdlib>
+ #include <errno.h>
++#include <sys/time.h>
+ 
+ #include "astrop.h"
+ 
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
+