testing/conserver: upgrade to 8.3.0

testing/conserver/APKBUILD

@@ -1,7 +1,7 @@
 # Contributor: Henrik Riomar <henrik.riomar@gmail.com>
 # Maintainer: Henrik Riomar <henrik.riomar@gmail.com>
 pkgname=conserver
-pkgver=8.2.7
+pkgver=8.3.0
 pkgrel=0
 pkgdesc="Serial console remote sharing and logging daemon"
 url="https://www.conserver.com"
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-openrc"
 source="https://github.com/bstansell/conserver/releases/download/v$pkgver/conserver-$pkgver.tar.gz
 	conserver.cf
 	conserver.initd
-	Don-t-reference-true.patch
 	"
 
 build() {
@@ -52,8 +51,7 @@ package() {
 }
 
 sha512sums="
-b9a63061c149d7c400ba28fbeb290572e3893cb56d3abcfd2d32fdda3e35bdb5f7fba4ba742aed2ad945749ee54a36e21ab1af096428113eb242d3a1a946b353  conserver-8.2.7.tar.gz
+65070cf61a746debd52ea4dea2b3a6ebb7c69c145728d074fcad6d2334b8848819f95c826b3c507f297beab39b891efc11cd745b7cdcdecdc9e65ffdb31a76d1  conserver-8.3.0.tar.gz
 3d531e7e41ef25a69a9ce06cd4f885da6bf7e10c8a277b8350ef31813710dfd1d04a6f1d1cb5b4d4c8470910d4badbbd684ae8aa6e1b71451f3e5175037be16c  conserver.cf
 32d4e6f0572eb01462bd2c4e1f6642c59a947e6b22125ae0067f084c14cb0e5761c03837c6e8c45180b3af748afe86fc9ce9f599c37efca920983217968c23d3  conserver.initd
-c127a2032a212575b2e58bcb176211585366f29cf5dceeeda99ae6de5bf74eaf5f550f47d13c2ba43b78087f21973598a7010ede9b852cf0102730fbd45171bc  Don-t-reference-true.patch
 "

testing/conserver/Don-t-reference-true.patch

@@ -1,85 +0,0 @@
-From 42e9de6b947b16251f58c63c06e79d14a52c4e75 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <stan.pitucha@envato.com>
-Date: Fri, 15 Jul 2022 16:06:29 +1000
-Subject: [PATCH] Don't reference `true`
-
-`true` coming from some macos configurations is a define in `stdbool`. This
-means it can't be redefined or turned into a reference.
-
-Use a different variable name.
----
- conserver/group.c  |  8 ++++----
- conserver/master.c | 10 +++++-----
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/conserver/group.c b/conserver/group.c
-index 27c102b..0c5435b 100644
---- a/conserver/group.c
-+++ b/conserver/group.c
-@@ -5038,7 +5038,7 @@ Spawn(GRPENT *pGE, int msfd)
-     struct sockaddr_in lstn_port;
- # endif
- # if HAVE_SETSOCKOPT
--    int true = 1;
-+    int sock_opt_true = 1;
- # endif
-     unsigned short portInc = 0;
- #else
-@@ -5065,8 +5065,8 @@ Spawn(GRPENT *pGE, int msfd)
- 	}
- # if HAVE_SETSOCKOPT
- 	if (setsockopt
--	    (sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
--	     sizeof(true)) < 0) {
-+	    (sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
-+	     sizeof(sock_opt_true)) < 0) {
- 	    Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
- 		  strerror(errno));
- 	    return;
-@@ -5197,7 +5197,7 @@ Spawn(GRPENT *pGE, int msfd)
-     }
- # if HAVE_SETSOCKOPT
-     if (setsockopt
--	(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true, sizeof(true))
-+	(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true, sizeof(sock_opt_true))
- 	< 0) {
- 	Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
- 	      strerror(errno));
-diff --git a/conserver/master.c b/conserver/master.c
-index cebd5ba..6684ae3 100644
---- a/conserver/master.c
-+++ b/conserver/master.c
-@@ -690,7 +690,7 @@ Master(void)
-     struct sockaddr_in master_port;
- # endif
- # if HAVE_SETSOCKOPT
--    int true = 1;
-+    int sock_opt_true = 1;
- # endif
- #else
-     struct sockaddr_un master_port;
-@@ -750,8 +750,8 @@ Master(void)
- 
- # if HAVE_SETSOCKOPT
- 	if (setsockopt
--	    (msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
--	     sizeof(true)) < 0)
-+	    (msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
-+	     sizeof(sock_opt_true)) < 0)
- 	    goto fail;
- # endif
- 	if (!SetFlags(msfd, O_NONBLOCK, 0))
-@@ -821,8 +821,8 @@ Master(void)
-     }
- # if HAVE_SETSOCKOPT
-     if (setsockopt
--	(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
--	 sizeof(true)) < 0) {
-+	(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
-+	 sizeof(sock_opt_true)) < 0) {
- 	Error("Master(): setsockopt(%u,SO_REUSEADDR): %s", msfd,
- 	      strerror(errno));
- 	return;
--- 
-2.51.2
-