[gentoo-commits] repo/gentoo:master commit in: net-misc/vmnet/
commit: e1c11df5ac84e28257a035e277f0c9bdd751ab52
Author: Sam James gentoo org>
AuthorDate: Thu May 9 00:21:17 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu May 9 00:21:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c11df5
net-misc/vmnet: respect CC
Signed-off-by: Sam James gentoo.org>
net-misc/vmnet/vmnet-0.4-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/vmnet/vmnet-0.4-r2.ebuild
b/net-misc/vmnet/vmnet-0.4-r2.ebuild
index 9f2519617783..543983c15c39 100644
--- a/net-misc/vmnet/vmnet-0.4-r2.ebuild
+++ b/net-misc/vmnet/vmnet-0.4-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="A simple virtual networking program - SLIP over stdin/out"
HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/;
@@ -30,7 +30,7 @@ PATCHES=(
src_compile() {
append-ldflags -Wl,-z,now
- emake
+ emake CC="$(tc-getCC)"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/vmnet/, net-misc/vmnet/files/
commit: d2d791f87eed8fed2f3acf505b4daeae047170a9
Author: NHOrus yahoo com>
AuthorDate: Tue Apr 2 08:43:32 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu May 9 00:20:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d791f8
net-misc/vmnet: replace missing function with posix one, for musl
I'd rather drop this package, instead.
[sam: Revbump.]
Closes: https://bugs.gentoo.org/897956
Closes: https://bugs.gentoo.org/907888
Signed-off-by: NHOrus yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36055
Signed-off-by: Sam James gentoo.org>
.../vmnet-0.4-replace-missing-musl-function.patch| 20
.../{vmnet-0.4-r1.ebuild => vmnet-0.4-r2.ebuild} | 3 ++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch
b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch
new file mode 100644
index ..5c4fbb152e9e
--- /dev/null
+++ b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch
@@ -0,0 +1,20 @@
+diff -ru vmnet-0.4.orig/vmnet.c vmnet-0.4/vmnet.c
+--- vmnet-0.4.orig/vmnet.c 2024-04-02 08:35:41.521216356 +
vmnet-0.4/vmnet.c 2024-04-02 08:37:34.760604906 +
+@@ -50,6 +50,7 @@
+ */
+
+ #define _GNU_SOURCE
++#define _XOPEN_SOURCE 700
+ #include
+ #include
+ #include
+@@ -197,7 +198,7 @@
+ int master, slave;
+ char name[1024];
+
+- master = getpt();
++ master = posix_openpt(O_RDWR);
+ if (master < 0) {
+ return 0;
+ }
diff --git a/net-misc/vmnet/vmnet-0.4-r1.ebuild
b/net-misc/vmnet/vmnet-0.4-r2.ebuild
similarity index 91%
rename from net-misc/vmnet/vmnet-0.4-r1.ebuild
rename to net-misc/vmnet/vmnet-0.4-r2.ebuild
index 1fadcfdf151c..9f2519617783 100644
--- a/net-misc/vmnet/vmnet-0.4-r1.ebuild
+++ b/net-misc/vmnet/vmnet-0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${WORKDIR}"/${P/-/_}-1.diff
"${FILESDIR}"/${PN}-0.4-Fix-build-with-Clang-16.patch
+ "${FILESDIR}"/${PN}-0.4-replace-missing-musl-function.patch
)
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/vmnet/
commit: 5f3f405a0c65d7a71724f65fc8151fa47400d6c8
Author: Sam James gentoo org>
AuthorDate: Thu May 9 00:21:41 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu May 9 00:21:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3f405a
net-misc/vmnet: EAPI 8
Signed-off-by: Sam James gentoo.org>
net-misc/vmnet/vmnet-0.4-r2.ebuild | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net-misc/vmnet/vmnet-0.4-r2.ebuild
b/net-misc/vmnet/vmnet-0.4-r2.ebuild
index 543983c15c39..573adbc16276 100644
--- a/net-misc/vmnet/vmnet-0.4-r2.ebuild
+++ b/net-misc/vmnet/vmnet-0.4-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic toolchain-funcs
@@ -11,13 +11,14 @@ HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/;
# So this might be better but it's a different filename
# http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz
# We use the debian patch anyway
-SRC_URI="ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz"
+SRC_URI="
+ ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz
+"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
RDEPEND="sys-apps/net-tools"
DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/vmnet/files/, net-misc/vmnet/
commit: 75b201bb72b3f4fde70f4053d11c65e0123de01d
Author: Sam James gentoo org>
AuthorDate: Fri Oct 28 16:18:41 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 28 17:01:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b201bb
net-misc/vmnet: fix build w/ Clang 16
Closes: https://bugs.gentoo.org/871171
Closes: https://bugs.gentoo.org/712470
Signed-off-by: Sam James gentoo.org>
.../files/vmnet-0.4-Fix-build-with-Clang-16.patch | 33 ++
.../{vmnet-0.4.ebuild => vmnet-0.4-r1.ebuild} | 5 ++--
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/net-misc/vmnet/files/vmnet-0.4-Fix-build-with-Clang-16.patch
b/net-misc/vmnet/files/vmnet-0.4-Fix-build-with-Clang-16.patch
new file mode 100644
index ..058d2f2d5ddb
--- /dev/null
+++ b/net-misc/vmnet/files/vmnet-0.4-Fix-build-with-Clang-16.patch
@@ -0,0 +1,33 @@
+From 6c4416e8c266c7dc10eb3f3af8f913ace1da84e2 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Fri, 28 Oct 2022 17:16:17 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/871171
+--- a/vmnet.c
b/vmnet.c
+@@ -49,12 +49,15 @@
+ * to set up the SLIP connection and parse/generated SLIP packets.
+ */
+
++#define _GNU_SOURCE
+ #include
+ #include
+ #include
+ #include
+ #include
+ #include
++#include
++#include
+ #include
+ #include
+ #include
+@@ -251,7 +254,7 @@ void tty_setup(slipconn *sc)
+ }
+ }
+
+-int slip_setup(slipconn *sc)
++void slip_setup(slipconn *sc)
+ {
+ int disc, sencap = 0;
+
diff --git a/net-misc/vmnet/vmnet-0.4.ebuild
b/net-misc/vmnet/vmnet-0.4-r1.ebuild
similarity index 89%
rename from net-misc/vmnet/vmnet-0.4.ebuild
rename to net-misc/vmnet/vmnet-0.4-r1.ebuild
index 5eaff92b3467..1fadcfdf151c 100644
--- a/net-misc/vmnet/vmnet-0.4.ebuild
+++ b/net-misc/vmnet/vmnet-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,10 +20,11 @@ KEYWORDS="~amd64 ~ppc x86"
IUSE=""
RDEPEND="sys-apps/net-tools"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
PATCHES=(
"${WORKDIR}"/${P/-/_}-1.diff
+ "${FILESDIR}"/${PN}-0.4-Fix-build-with-Clang-16.patch
)
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/vmnet/
commit: 51c12ea83534391ac5c3fb6db3aaf29444beb092
Author: Michał Górny gentoo org>
AuthorDate: Sat Nov 9 13:16:46 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Nov 9 13:18:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c12ea8
net-misc/vmnet: Bump to EAPI 7
Closes: https://bugs.gentoo.org/697228
Signed-off-by: Michał Górny gentoo.org>
net-misc/vmnet/vmnet-0.4.ebuild | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/net-misc/vmnet/vmnet-0.4.ebuild b/net-misc/vmnet/vmnet-0.4.ebuild
index 18c4f842249..b43792b7b47 100644
--- a/net-misc/vmnet/vmnet-0.4.ebuild
+++ b/net-misc/vmnet/vmnet-0.4.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
-inherit eutils flag-o-matic
+inherit flag-o-matic
DESCRIPTION="A simple virtual networking program - SLIP over stdin/out"
HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/;
@@ -12,28 +12,28 @@ HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/;
# http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz
# We use the debian patch anyway
SRC_URI="ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz"
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc x86"
IUSE=""
-DEPEND="sys-apps/net-tools"
+RDEPEND="sys-apps/net-tools"
+DEPEND=${RDEPEND}
-src_unpack() {
- unpack ${P}.tar.gz
- epatch "${DISTDIR}"/${P/-/_}-1.diff.gz
-}
+PATCHES=(
+ "${WORKDIR}"/${P/-/_}-1.diff
+)
src_compile() {
append-ldflags -Wl,-z,now
- emake || die "Emake failed"
+ emake
}
src_install() {
- dobin ${PN} || die "dobin"
- fperms 4711 /usr/bin/${PN} || die "fperms"
+ dobin ${PN}
+ fperms 4711 /usr/bin/${PN}
doman ${PN}.1
dodoc README debian/${PN}.sgml
