gentoo xmass resync : 25.12.2021

3 files changed, 81 insertions, 4 deletions

diff --git a/app-admin/sud/Manifest b/app-admin/sud/Manifest
index fdea5be98670..7deb32b3dc85 100644
--- a/app-admin/sud/Manifest
+++ b/app-admin/sud/Manifest
@@ -1,5 +1,6 @@
 AUX sud-1.3-fix-build-system.patch 649 BLAKE2B 00563b734e50ef85636603e09b32f9db3ad0d072aac61291ae0a0447cbdf2aa04dd40ac0d37e0d03147dac242bf4251eb4c1cbb9b3897008b9fb3e6e06622374 SHA512 9c8151b09d9a1cb06a523c9ddc34ddf18adcc1a45c89805f9c8865a69890810403e7e6b5d9fe6d034f3f68700d88044ce318dd1345ec5843540a404dc54d4e34
+AUX sud-1.3-use-system-queue.patch 1544 BLAKE2B 4018e6a33c8457d83d3d734d8abea305eb2628dd28a43461282924398d4d2097ae281ec6689e24d92361d64a376cc50ea5427a9b5cb759245a420f8f97aeefd6 SHA512 4ff57f937a9104f6a935b32b540f34ce51a83c014c6d06dbe11bf062c79f001a14566e42ea7f0b533f4dc1421b6a28c79fbeaacbef27a296521b27f4b9f1dfff
 AUX sud.rc6 387 BLAKE2B a1eef9ef30a73c15ea8daf2f2a266cacbcf38dfc2fda1e481b9693c24c5fe5ba726a9154b8dc4a072aa008d5d96ec820f8b1dff375b16ef28f5b5230961fbac1 SHA512 07feba04e36df02e5cab6260f5943d4a72c3549a604d9db33a2f4734b39a60a3514899c0831bf1fe5ce073889989d42f0ae64d1f7bb0735fca7fd2584887364b
 DIST sud-1.3.tar.gz 117542 BLAKE2B e9d28c119e25d3cf0434d10c04d34fbdd0a52fbea84ee09b2dc835ec9eabf30fc91895fd691febbf57590b790febe04b1b45d354f7e2fcab513608de85419746 SHA512 54b58b54e665133dcc40f00708a929bc038df1e2ce18514d830e3f3f823110bd27a209771fc378c2bcd372692e168f55150f12893e2fbd433b51e2173dbd410e
-EBUILD sud-1.3-r1.ebuild 697 BLAKE2B 8f4b85dfc0efbbbe4e63627f22e6e98eb11aeda2a95f8a486cfd7fdb1bc614a3b15a9c6e6fde6a0012606252a4a1a8f3bd26b8fb0176a438eb421ee60134bb15 SHA512 0eaa293326637f1456527a97d68118471bc897643ad6766c19f4c7828b31c23648dffc73827e429555c06727c58d5330d04cd36ad48b0d34d3568060ec5ce87a
+EBUILD sud-1.3-r1.ebuild 827 BLAKE2B 89bdbe9d6110cfd238301f5d6bac5edf1c21c889f0266569c1ace2fa6f2653b19a73b07c1c6e363d6177dd4ccfba5607a03d3c392dc566569f669a9cfd886fc3 SHA512 193d1218f08b6f31fe2c52bad9afbdfd2dcf63e378ffe6c5289d90e31ed9ff097886d4ea6a0432b02e9db14119438b7157390a46af7a25c1a4ae26df236d4741
 MISC metadata.xml 720 BLAKE2B aa97353214fcd2beea5ecfc2552c46a35100e9e3ce91badfdccc9c4b84fe813d9b42f6421b9cd99522a30ca1dd3f5f50fded6a07871b57d5f3b91321c4791366 SHA512 8e635784e1fd55695b509fac93e34bc42564399643989e0447db1a1ada32e43db34692eacfe56cfe1c90eeb2394c7c19cd43a1ebebd8da6ae5e03fa3d5903d8f
diff --git a/app-admin/sud/files/sud-1.3-use-system-queue.patch b/app-admin/sud/files/sud-1.3-use-system-queue.patch
new file mode 100644
index 000000000000..c36b359d76ef
--- /dev/null
+++ b/app-admin/sud/files/sud-1.3-use-system-queue.patch
@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/713470
+
+--- a/sud/Makefile.am
++++ b/sud/Makefile.am
+@@ -1,7 +1,7 @@
+ AM_YFLAGS = -d
+ 
+ sbin_PROGRAMS = sud
+-sud_SOURCES = conf.c conf_parser.y conf_lexer.l interactive.c noninteractive.c control.c main.c popen.c request.c session.c service.c utility.c extern.h conf.h control.h queue.h session.h
++sud_SOURCES = conf.c conf_parser.y conf_lexer.l interactive.c noninteractive.c control.c main.c popen.c request.c session.c service.c utility.c extern.h conf.h control.h session.h
+ sud_CFLAGS = -Wall -DYY_NO_UNPUT
+ 
+ #INCLUDES = -I..
+--- a/sud/conf.h
++++ b/sud/conf.h
+@@ -31,7 +31,7 @@
+ #include <sys/types.h>
+ #include <grp.h>
+ 
+-#include "queue.h"
++#include <sys/queue.h>
+ /*
+  * XXX: have* variables are oversized, perhaps these could be implemented using
+  * for example gid_t negative values
+--- a/sud/conf_lexer.c
++++ b/sud/conf_lexer.c
+@@ -537,7 +537,7 @@ char *yytext;
+ #include "conf.h"
+ #include "conf_parser.h"
+ #include "extern.h"
+-#include "queue.h"
++#include <sys/queue.h>
+ 
+ extern int nline;
+ 
+--- a/sud/conf_lexer.l
++++ b/sud/conf_lexer.l
+@@ -40,7 +40,7 @@
+ #include "conf.h"
+ #include "conf_parser.h"
+ #include "extern.h"
+-#include "queue.h"
++#include <sys/queue.h>
+ 
+ extern int nline;
+ 
+--- a/sud/service.c
++++ b/sud/service.c
+@@ -47,7 +47,7 @@
+ 
+ #include "conf.h"
+ #include "extern.h"
+-#include "queue.h"
++#include <sys/queue.h>
+ #include "session.h"
+ 
+ 
+--- a/sud/session.h
++++ b/sud/session.h
+@@ -32,7 +32,7 @@
+ 
+ #include <unistd.h>
+ 
+-#include "queue.h"
++#include <sys/queue.h>
+ 
+ 
+ struct sctl {
diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild
index 7c72435d9c4d..8b715d598fab 100644
--- a/app-admin/sud/sud-1.3-r1.ebuild
+++ b/app-admin/sud/sud-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,12 +12,20 @@ SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-build-system.patch )
+DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.3-use-system-queue.patch
+)
 
 src_prepare() {
 	default
+
+	# bug #713470
+	rm sud/queue.h || die
+
 	eautoreconf
 }