[gentoo-commits] repo/gentoo:master commit in: sys-apps/usermode-utilities/files/, sys-apps/usermode-utilities/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/usermode-utilities/files/, sys-apps/usermode-utilities/

[Mike Frysinger]

commit:     5a7c2b8a0244b71e7f74deb45c78fdb69e6305e3
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sun Nov 27 23:56:04 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 23:56:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a7c2b8a

sys-apps/usermode-utilities: fix build w/newer glibc #580816

 .../usermode-utilities-20070815-headers.patch      | 27 ++++++++++++++++++++++
 .../usermode-utilities-20070815-r3.ebuild          |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch
new file mode 100644
index 00000000..13fd556
--- /dev/null
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/580816
+
+include headers needed by targets
+
+--- b/tools-20070815/uml_net/ethertap.c
++++ a/tools-20070815/uml_net/ethertap.c
+@@ -13,6 +13,7 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <net/if.h>
++#include <sys/select.h>
+ #include "host.h"
+ #include "output.h"
+ 
+
+for major/minor macros
+
+--- b/tools-20070815/uml_net/host.c
++++ a/tools-20070815/uml_net/host.c
+@@ -10,6 +10,7 @@
+ #include <ctype.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include "output.h"
+ #include "host.h"
+ 

diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
index b6ae228..5544e69 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
@@ -26,6 +26,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-rollup.patch
 	# Fix owner of humfsify; bug #364531
 	epatch "${FILESDIR}"/${P}-humfsify-owner.patch
+	epatch "${FILESDIR}"/${P}-headers.patch #580816
+
 	sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed"
 	sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed"
 	if ! use fuse; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/usermode-utilities/files/, sys-apps/usermode-utilities/

[Joonas Niilola]

commit:     9bcedfbc12dbdf490ae87e06eba372c5a8626d1d
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Jun 13 14:41:57 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 12:16:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bcedfbc

sys-apps/usermode-utilities: Fix call to undeclared library function

A lot of functions from string.h (including memset) couldn't be found.
Resulting in error: call to undeclared library function memset type
error.

Closes: https://bugs.gentoo.org/898550
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31415
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/usermode-utilities-fix-memset.patch      | 44 ++++++++++++++++++++
 .../usermode-utilities-20070815-r5.ebuild          | 47 ++++++++++++++++++++++
 2 files changed, 91 insertions(+)

diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-fix-memset.patch b/sys-apps/usermode-utilities/files/usermode-utilities-fix-memset.patch
new file mode 100644
index 000000000000..39c036ae52ba
--- /dev/null
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-fix-memset.patch
@@ -0,0 +1,44 @@
+Fix building with clang-16, as lot of functions from string.h (including
+memset) couldn't be found. Resulting in error: call to undeclared library
+function memset type error.
+Bug: https://bugs.gentoo.org/898550
+--- a/port-helper/port-helper.c
++++ b/port-helper/port-helper.c
+@@ -13,6 +13,7 @@ for read and write, and the console is functional.
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#include <string.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+--- a/uml_switch/port.c
++++ b/uml_switch/port.c
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <errno.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+--- a/uml_switch/uml_switch.c
++++ b/uml_switch/uml_switch.c
+@@ -6,6 +6,7 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#include <string.h>
+ #include <fcntl.h>
+ #include <stdint.h>
+ #include <sys/socket.h>
+--- a/watchdog/uml_watchdog.c
++++ b/watchdog/uml_watchdog.c
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <string.h>
+ #include <errno.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>

diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r5.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r5.ebuild
new file mode 100644
index 000000000000..4231042d1b43
--- /dev/null
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Tools for use with Usermode Linux virtual machines"
+HOMEPAGE="http://user-mode-linux.sourceforge.net/"
+SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="fuse"
+
+RDEPEND="
+	fuse? ( sys-fs/fuse:0= )
+	sys-libs/readline:0=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/tools-${PV}
+
+PATCHES=(
+	# Merge previous patches with fix for bug #331099
+	"${FILESDIR}"/${P}-rollup.patch
+	# Fix owner of humfsify; bug #364531
+	"${FILESDIR}"/${P}-humfsify-owner.patch
+	"${FILESDIR}"/${P}-headers.patch #580816
+	# Fix build /w clang-16, bug #898550
+	"${FILESDIR}"/${PN}-fix-memset.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed"
+	sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed"
+	if ! use fuse; then
+		einfo "Skipping build of umlmount to avoid sys-fs/fuse dependency."
+		sed -i -e 's/\<umlfs\>//' Makefile || die "sed to remove sys-fs/fuse dependency failed"
+	fi
+}
+
+src_compile() {
+	tc-export AR CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/usermode-utilities/files/, sys-apps/usermode-utilities/

[Joonas Niilola]

commit:     12e0d0b2fc06ce2623e3f88ed7c6e47f62f17c29
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Jun 11 14:41:39 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 07:34:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12e0d0b2

sys-apps/usermode-utilities: Fix passing incompatible pointer types

and update EAPI 7 -> 8

Closes: https://bugs.gentoo.org/933391
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37057
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/usermode-utilities-gcc14-build-fix.patch | 13 ++++++
 .../usermode-utilities-20070815-r6.ebuild          | 48 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-gcc14-build-fix.patch b/sys-apps/usermode-utilities/files/usermode-utilities-gcc14-build-fix.patch
new file mode 100644
index 000000000000..f2c06d031f96
--- /dev/null
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-gcc14-build-fix.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/933391
+--- a/umlfs/uml_mount.c
++++ b/umlfs/uml_mount.c
+@@ -11,7 +11,8 @@ static int init_fuse(int argc, char **argv)
+ 
+ 	if (fuse_parse_cmdline(&args, &mountpoint, NULL, NULL) == -1)
+ 		return -EINVAL;
+-        return fuse_mount(mountpoint, &args);
++
++	return fuse_mount(mountpoint, (char *)&args);
+ }
+ 
+ int main(int argc, char **argv)

diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r6.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r6.ebuild
new file mode 100644
index 000000000000..8c825ff1cd61
--- /dev/null
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Tools for use with Usermode Linux virtual machines"
+HOMEPAGE="http://user-mode-linux.sourceforge.net/"
+SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
+
+S="${WORKDIR}"/tools-${PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="fuse"
+
+RDEPEND="
+	fuse? ( sys-fs/fuse:0= )
+	sys-libs/readline:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# Merge previous patches with fix for bug #331099
+	"${FILESDIR}"/${P}-rollup.patch
+	# Fix owner of humfsify; bug #364531
+	"${FILESDIR}"/${P}-humfsify-owner.patch
+	"${FILESDIR}"/${P}-headers.patch #580816
+	# Fix build /w clang-16, bug #898550
+	"${FILESDIR}"/${PN}-fix-memset.patch
+	"${FILESDIR}"/${PN}-gcc14-build-fix.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed"
+	sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed"
+	if ! use fuse; then
+		einfo "Skipping build of umlmount to avoid sys-fs/fuse dependency."
+		sed -i -e 's/\<umlfs\>//' Makefile || die "sed to remove sys-fs/fuse dependency failed"
+	fi
+}
+
+src_compile() {
+	tc-export AR CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all
+}