summaryrefslogtreecommitdiff
path: root/net-misc/apt-cacher-ng/files
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/apt-cacher-ng/files')
-rw-r--r--net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch39
-rw-r--r--net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch11
-rw-r--r--net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch41
3 files changed, 91 insertions, 0 deletions
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
+