From bfc40232af1d3d1d6fd961cfc47ffa321b8ef6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 22 Oct 2023 11:01:50 +0200
Subject: [PATCH] community/outils: use upstream patch for implicit function
declarations
---
community/outils/APKBUILD | 4 +--
community/outils/implicit-int.patch | 54 ++++++++++++++---------------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/community/outils/APKBUILD b/community/outils/APKBUILD
index 993f56ad6984..600fb38c279f 100644
--- a/community/outils/APKBUILD
+++ b/community/outils/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=outils
pkgver=0.13
-pkgrel=0
+pkgrel=1
pkgdesc="Port of some non-standard OpenBSD tools to Linux"
url="https://github.com/leahneukirchen/outils"
arch="all"
@@ -65,5 +65,5 @@ _tool() {
sha512sums="
8838dbce8e4df56846f1ad2ec1012f072584e5ac11000f378fb3303e615c084e5903f6d759078f8c24b836cc771652d815b737a50e69e99f6a55346f23e98bfd outils-0.13.tar.gz
-aeb3c7be722a2a2d04596dcfb15a2e10d529ea0d0133c0c8bb484f1145069645fe4cbdeb43fc55610f07ad50a33309596734d3c5b13ce3da44d777db30f28b1e implicit-int.patch
+1f6dca9ebe9b231b7041fb49bd48dbc09ab9a90f85d47075a6301d00269c1274a190562df0b61ea974618700d1160ef30c0f2aea2c003113f07b0c7fd4ba389c implicit-int.patch
"
diff --git a/community/outils/implicit-int.patch b/community/outils/implicit-int.patch
index 547aed84139f..2f973bb118dc 100644
--- a/community/outils/implicit-int.patch
+++ b/community/outils/implicit-int.patch
@@ -1,30 +1,30 @@
-fixes implicit use of this in these, defined in other files
-just a dirty hotfix
+From 50877e1bf7c905044e0b50b227ecff48cfec394b Mon Sep 17 00:00:00 2001
+From: Leah Neukirchen <leah@vuxu.org>
+Date: Sun, 22 Oct 2023 20:44:23 +0200
+Subject: [PATCH] add prototypes for recallocarray and b64_ntop
+
+---
+ src/liboutils/outils.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
diff --git a/src/liboutils/outils.h b/src/liboutils/outils.h
-index 7e9a7ec..faee8ed 100644
+index 7e9a7ec..463032a 100644
--- a/src/liboutils/outils.h
+++ b/src/liboutils/outils.h
-@@ -8,6 +8,9 @@
- #define __BEGIN_DECLS
- #define __END_DECLS
-
-+int
-+__b64_ntop(src, srclength, target, targsize);
-+
- #define b64_ntop __b64_ntop
- #define b64_pton __b64_pton
-
-diff --git a/src/usr.bin/lam/lam.c b/src/usr.bin/lam/lam.c
-index 9c009f2..4e0219d 100644
---- a/src/usr.bin/lam/lam.c
-+++ b/src/usr.bin/lam/lam.c
-@@ -48,6 +48,9 @@
-
- #define BIGBUFSIZ 5 * BUFSIZ
-
-+void *
-+recallocarray(void *ptr, size_t oldnmemb, size_t newnmemb, size_t size);
-+
- struct openfile { /* open file structure */
- FILE *fp; /* file pointer */
- int minwidth; /* pad this column to this width */
+@@ -1,5 +1,4 @@
+ #define DEF_WEAK(x)
+-
+ #define __weak_alias(new, old) \
+ extern __typeof(old) new __attribute__((weak, alias(#old)))
+ #define MAKE_CLONE(new, old) \
+@@ -59,8 +58,9 @@ uint32_t arc4random_uniform(uint32_t);
+ void arc4random_buf(void *, size_t);
+ int timingsafe_bcmp(const void *, const void *, size_t);
+ void *reallocarray(void *, size_t, size_t);
++void *recallocarray(void *, size_t, size_t, size_t);
+ int pledge(const char *, const char **);
+ void explicit_bzero(void *buf, size_t len);
+ int getentropy(void *buf, size_t len);
+ void freezero(void *ptr, size_t size);
+-
++int b64_ntop(u_char const *, size_t, char *, size_t);
--
GitLab