Add a patch to compile on recent glib/g++

3 files changed, 61 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d66cb1b236b..76fcd1d5e525 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,37 @@
 pkgbase = apt-cacher-ng
-pkgdesc = A caching proxy specialized for package files
-pkgver = 3.7.4
-pkgrel = 8
-url = http://www.unix-ag.uni-kl.de/~bloch/acng/
-install = apt-cacher-ng.install
-arch = i686
-arch = x86_64
-arch = armv7h
-arch = aarch64
-license = custom
-makedepends = cmake
-depends = zlib
-depends = bzip2
-depends = fuse
-depends = xz
-depends = openssl
-depends = libwrap
-depends = libevent
-depends = c-ares
-optdepends = mailcap: to get correct Content-Type header on doc html served by apt-cacher-ng
-backup = etc/apt-cacher-ng/acng.conf
-backup = etc/apt-cacher-ng/security.conf
-source = http://deb.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.7.4.orig.tar.xz
-source = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/core/pacman-mirrorlist/mirrorlist
-source = acng.conf.patch
-source = apt-cacher-ng.service.patch
-source = apt-cacher-ng.tmpfile
-sha256sums = 63140473a669c42f5e2219e38fa9d7c733f9047699dde52c3bd828e372929a5f
-sha256sums = 5d622ca30f7a47e6e9cd536720912e0ef0a1ee96d4a5f3fe7c119cb495aec76f
-sha256sums = 695c074de35a75730e6b711960993f00f120634276349c8640db2ad883a5ad09
-sha256sums = c89335ea833fc04ec2ce6598e3fdaf86aa8f2fa0892203eef4c0a5cb24d6c188
-sha256sums = ead4e80771f88b42d922aff6c62da93ae9c9b001a071043e2092949f2337b459
+	pkgdesc = A caching proxy specialized for package files
+	pkgver = 3.7.4
+	pkgrel = 9
+	url = http://www.unix-ag.uni-kl.de/~bloch/acng/
+	install = apt-cacher-ng.install
+	arch = i686
+	arch = x86_64
+	arch = armv7h
+	arch = aarch64
+	license = custom
+	makedepends = cmake
+	depends = zlib
+	depends = bzip2
+	depends = fuse
+	depends = xz
+	depends = openssl
+	depends = libwrap
+	depends = libevent
+	depends = c-ares
+	optdepends = mailcap: to get correct Content-Type header on doc html served by apt-cacher-ng
+	backup = etc/apt-cacher-ng/acng.conf
+	backup = etc/apt-cacher-ng/security.conf
+	source = http://deb.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.7.4.orig.tar.xz
+	source = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/core/pacman-mirrorlist/mirrorlist
+	source = acng.conf.patch
+	source = apt-cacher-ng.service.patch
+	source = have_strlcpy.patch
+	source = apt-cacher-ng.tmpfile
+	sha256sums = 63140473a669c42f5e2219e38fa9d7c733f9047699dde52c3bd828e372929a5f
+	sha256sums = 5d622ca30f7a47e6e9cd536720912e0ef0a1ee96d4a5f3fe7c119cb495aec76f
+	sha256sums = 695c074de35a75730e6b711960993f00f120634276349c8640db2ad883a5ad09
+	sha256sums = c89335ea833fc04ec2ce6598e3fdaf86aa8f2fa0892203eef4c0a5cb24d6c188
+	sha256sums = 0d584e8193ab2c63d4d629c4fdca23e09dc369953a60c57cbb4a6138b5136265
+	sha256sums = ead4e80771f88b42d922aff6c62da93ae9c9b001a071043e2092949f2337b459
 
 pkgname = apt-cacher-ng
diff --git a/PKGBUILD b/PKGBUILD
index 3f0e63df57ba..dbd3c65df4e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=apt-cacher-ng
 pkgver=3.7.4
-pkgrel=8
+pkgrel=9
 pkgdesc="A caching proxy specialized for package files"
 url="http://www.unix-ag.uni-kl.de/~bloch/acng/"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
@@ -22,6 +22,7 @@ source=("http://deb.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${
         'https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/core/pacman-mirrorlist/mirrorlist'
         'acng.conf.patch'
         'apt-cacher-ng.service.patch'
+        'have_strlcpy.patch'
         'apt-cacher-ng.tmpfile'
 )
 
@@ -31,10 +32,13 @@ sha256sums=('63140473a669c42f5e2219e38fa9d7c733f9047699dde52c3bd828e372929a5f'
             '5d622ca30f7a47e6e9cd536720912e0ef0a1ee96d4a5f3fe7c119cb495aec76f'
             '695c074de35a75730e6b711960993f00f120634276349c8640db2ad883a5ad09'
             'c89335ea833fc04ec2ce6598e3fdaf86aa8f2fa0892203eef4c0a5cb24d6c188'
+            '0d584e8193ab2c63d4d629c4fdca23e09dc369953a60c57cbb4a6138b5136265'
             'ead4e80771f88b42d922aff6c62da93ae9c9b001a071043e2092949f2337b459')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -i ${srcdir}/have_strlcpy.patch -p0
+
   # === uncomment the next line to update mirrors [w3m package is needed]; it will take some time ===
   #make -f scripts/Makefile.release gendbs
 
diff --git a/have_strlcpy.patch b/have_strlcpy.patch
new file mode 100644
index 000000000000..01a775caaa90
--- /dev/null
+++ b/have_strlcpy.patch
@@ -0,0 +1,22 @@
+--- src/meta.cc	2021-12-07 15:43:56.000000000 +0100
++++ src/meta.cc	2024-01-29 10:37:54.364239368 +0100
+@@ -831,7 +831,7 @@
+     return true;
+ }
+ 
+-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY
++#if !defined(HAVE_STRLCPY) || !(HAVE_STRLCPY + 0)
+ size_t strlcpy(char *tgt, const char *src, size_t tgtSize)
+ {
+     auto p = src;
+--- src/meta.h	2021-12-07 15:43:56.000000000 +0100
++++ src/meta.h	2024-01-29 10:38:22.020015700 +0100
+@@ -323,7 +323,7 @@
+ static constexpr string_view svRN = szRN;
+ static constexpr string_view svLF = "\n";
+ 
+-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY
++#if !defined(HAVE_STRLCPY) || !(HAVE_STRLCPY + 0)
+ size_t strlcpy(char *tgt, const char *src, size_t tgtSize);
+ #endif
+ }