gentoo auto-resync : 26:09:2022 - 15:08:08

5 files changed, 126 insertions, 0 deletions

diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
index da0d90d78373..dea30f072e07 100644
--- a/app-admin/xtail/Manifest
+++ b/app-admin/xtail/Manifest
@@ -1,4 +1,9 @@
+AUX xtail-2.1_p8-fix-limits-musl.patch 688 BLAKE2B f3b2c0722fb170bc46ab920984f56083b8194c385e4b916a7c083aa1286c5f9a4fd392bbc97d78eed1e3aaf1ce27542c35bd5d60f48821964d228f8b4e95cde3 SHA512 047b7a812503f2070be11a1a1d7a656841bdd751f2d97ebb9b3bff3d3eba9b90c01fdd870e158d70a756186bcf6032786c793c9d148ae6fce931831c1e38879e
+AUX xtail-2.1_p8-fix-prototype.patch 749 BLAKE2B c9c1fa301388b773296dbd0aac2318b1152027c0640a5ef88827372b6522855289da6fac6424514ba605978915e77535b8614169f3c3276c27710daf0b162e16 SHA512 2740c3c2e7791dc1e4fa82fe992d3aaf0c56f1be5c0ed880ddc7e9d62a3b871b3960d47880b94ee4951af1b34e8fe6d8e383b1a4f1dab851aaa9b82ba2c85b92
+AUX xtail-2.1_p8-rename-configure.patch 841 BLAKE2B 78a524fabd83ff46a1e2288bcd6493ce27951c46b68cbaa03cd3d1afae1d466bc2003bfaa833e6cdd943e79adb14034a4e931bc0f5c5ddd61968cc8e8506b829 SHA512 09b9e305b173ea2d94d5169360aa4ce1707f905e48b116fee97a5829ab1c0875b36a348f575df654139e148c4f281203686bd5ff0bb0e13e618e161e88d4de66
 DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e1be231b4b08b640a310f9c5e9642b9f6ea25d45c717902cdf1024509fca6d804f8e64d3bb764eac8bc3e9bd0846 SHA512 ae20448944e25aa04879bdab8d61bd910b1aa6f85c3d8287e712c6d37b1154af480edc6569467e31b3b404d7f90f771ec3e4c20c58132d9125303b40a6f102f2
 DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f
+DIST xtail_2.1-8.debian.tar.xz 7168 BLAKE2B c04a239aabd307f36b983b83384ace6f7abbe7215f84921da159da57b338affb9840e3bfb9886121fd140e1a412f017cfdc1f22afe2ac8484fc1d8b641ef196e SHA512 6c00f87f905a94c579085e5f18e27fce94642d0a5a1376deb618f464a9ca6bb2f7ac0529ef7a2439b28c5314de7ee733f86dda0d7577d3575ce085e2a02c39fc
 EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10
+EBUILD xtail-2.1_p8.ebuild 1029 BLAKE2B 553d0ea9b61428533b04a158227db5e77000175c54d70fe17a339b3c53bbff6aa00a0e7c22c8b175c51611e3dbed31d37e666554ae0a4898a6d647dd2db48e3c SHA512 2156df6b758594abc0922f798cd6212bb51dd98aa6d14b73987ea4897f160f509bc9282b9b774095f47973b61e75697677e3da5025ea005d964f5b9cd649c7e3
 MISC metadata.xml 391 BLAKE2B 5e2a05efa60fb020077edf3a5c4dc026ab1ca6d3cea217c4252ae18b175a4ba5fcc7956ca079aeab704f187105839ea2f35e330567e8d47760cff23562f2466b SHA512 786871c7f378de616b4a0dfb8222fb1ec744886c2919e364f2bc4b783c46d4e6f394a463556dcae7d6bed678886c9aefb98d71682e38ab126b8f823e0d85f607
diff --git a/app-admin/xtail/files/xtail-2.1_p8-fix-limits-musl.patch b/app-admin/xtail/files/xtail-2.1_p8-fix-limits-musl.patch
new file mode 100644
index 000000000000..c9a7ca3f2f5d
--- /dev/null
+++ b/app-admin/xtail/files/xtail-2.1_p8-fix-limits-musl.patch
@@ -0,0 +1,28 @@
+From: Sam James <sam@gentoo.org>
+Subject: [PATCH] Fix build on musl
+
+Closes: https://bugs.gentoo.org/715876
+--- a/miscfuncs.c
++++ b/miscfuncs.c
+@@ -8,6 +8,8 @@
+ #include <ctype.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <limits.h>
++
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+@@ -65,7 +67,11 @@ int scan_directory(const char *dirname)
+     char *basename;
+     struct stat sbuf;
+     DIR *dirp;
+-    static char pathname[MAXNAMLEN];
++    #ifdef NAME_MAX
++        static char pathname[NAME_MAX];
++    #else
++        static char pathname[MAXNAMLEN]
++    #endif
+ 
+     Dprintf(stderr, ">>> scanning directory '%s'\n", dirname);
+     if ((dirp = opendir(dirname)) == NULL)
diff --git a/app-admin/xtail/files/xtail-2.1_p8-fix-prototype.patch b/app-admin/xtail/files/xtail-2.1_p8-fix-prototype.patch
new file mode 100644
index 000000000000..29eff229772f
--- /dev/null
+++ b/app-admin/xtail/files/xtail-2.1_p8-fix-prototype.patch
@@ -0,0 +1,20 @@
+From: Sam James <sam@gentoo.org>
+Subject: [PATCH] Fix -Wdeprecated-non-prototype
+
+xtail.c:365:22: warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a previous declaration [-Wdeprecated-non-prototype]
+            extern unsigned sleep();
+                            ^
+/usr/include/unistd.h:464:21: note: conflicting prototype is here
+extern unsigned int sleep (unsigned int __seconds);
+                    ^
+1 warning generated.
+--- a/xtail.c
++++ b/xtail.c
+@@ -362,7 +362,6 @@ int main(int argc, char *argv[])
+ 	 * End of checking loop.
+ 	 */
+ 	{
+-	    extern unsigned sleep();
+ 	    (void) fflush(stdout);
+ 	    (void) sleep(SLEEP_TIME);
+ 	}
diff --git a/app-admin/xtail/files/xtail-2.1_p8-rename-configure.patch b/app-admin/xtail/files/xtail-2.1_p8-rename-configure.patch
new file mode 100644
index 000000000000..56d3372aceda
--- /dev/null
+++ b/app-admin/xtail/files/xtail-2.1_p8-rename-configure.patch
@@ -0,0 +1,23 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -25,7 +25,7 @@ CFLAGS = @CFLAGS@ $(DEFS)
+ TARBALL = xtail.tar
+ XTAIL_OBJECTS = xtail.o entryfuncs.o miscfuncs.o
+ DISTFILES = Makefile.in README acconfig.h config.h.in configure \
+-	configure.in entryfuncs.c install-sh miscfuncs.c xtail.1 xtail.c \
++	configure.ac entryfuncs.c install-sh miscfuncs.c xtail.1 xtail.c \
+ 	xtail.h
+ 
+ ###
+@@ -70,9 +70,9 @@ Makefile : $(srcdir)/Makefile.in  config.status
+ #config.h : $(srcdir)/config.h.in  config.status
+ #	CONFIG_FILES= CONFIG_HEADERS=$@ $(SHELL) ./config.status
+ 
+-$(srcdir)/configure : $(srcdir)/configure.in
++$(srcdir)/configure : $(srcdir)/configure.ac
+ 	cd $(srcdir) && autoconf
+ 
+-$(srcdir)/config.h.in : $(srcdir)/configure.in $(srcdir)/acconfig.h
++$(srcdir)/config.h.in : $(srcdir)/configure.ac $(srcdir)/acconfig.h
+ 	cd $(srcdir) && autoheader
+ 
diff --git a/app-admin/xtail/xtail-2.1_p8.ebuild b/app-admin/xtail/xtail-2.1_p8.ebuild
new file mode 100644
index 000000000000..1ff57c0e443a
--- /dev/null
+++ b/app-admin/xtail/xtail-2.1_p8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_PV=$(ver_cut 1-2)
+DESCRIPTION="Tail multiple logfiles at once, even if rotated"
+HOMEPAGE="http://www.unicom.com/sw/xtail/"
+SRC_URI="
+	http://www.unicom.com/sw/xtail/${PN}-${MY_PV}.tar.gz
+	http://www.unicom.com/files/20120219-patch-aalto.zip
+	mirror://debian/pool/main/x/xtail/xtail_${MY_PV}-$(ver_cut 4).debian.tar.xz
+"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-rename-configure.patch
+	"${FILESDIR}"/${P}-fix-prototype.patch
+	"${FILESDIR}"/${P}-fix-limits-musl.patch
+
+	"${WORKDIR}"/0001-xtail.1-remove-SIGQUIT.patch
+	"${WORKDIR}"/debian/patches/
+)
+
+src_prepare() {
+	default
+
+	# Needed for -Wimplicit-int in old configure
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	dobin xtail
+	doman xtail.1
+	dodoc README
+	newdoc ../README README.patches
+}