5 files changed, 202 insertions, 0 deletions
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index a32eee554f45..53fdb002a0d9 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/mwavem/Manifest b/net-dialup/mwavem/Manifest
index cdc72a91ae06..647a2f801c8c 100644
--- a/net-dialup/mwavem/Manifest
+++ b/net-dialup/mwavem/Manifest
@@ -1,10 +1,13 @@
 AUX mwave-dev-handler 210 BLAKE2B 0b5e6285e3c05279920a446b174a03ff2fc594639597a6b120cc38fc0f10533872a11ac7f4111be941e78e1b9a952db8f84a8e41307d9eb21b482b94c6dadb8a SHA512 5f9806aa690f465a188ec48692ac27e755b58480f8e329e519dd64766ceed20bb7342b15fd7d8981fefe133975a8dd593f2ed03c673bccfcb95582c990901248
 AUX mwave.devfs 150 BLAKE2B 8eb566bce37c62b96b32324ac65cad1ceb5b60cfd34b0bab0f2daf8324de2ff7544899ee1037b178c391d5ee74eaf1381e3a59f3d159a89ba05fec42cbda6cdb SHA512 e283fa56e535e69ac5ae602301bf36ae1bf58e6e3a4abf68056c0082bc0bbf82b20cd0293c2853ff10bcc09fc39ebb294f812086cc39ef8e2d06e07b9ace128b
 AUX mwave.modules 30 BLAKE2B 6dd8f901ed35314e8ea4b6b1bc5e56943bb2d9f7ba5dccd9bd666af2a280b1c65d935ae7e6d7d1244a80c8bc23b64f4b128f8fa73c01398ba7350d766dd48a64 SHA512 062bb44acbb71fba0a1807a4c0a618d80e40be7c31c5185441be6e8c845e29aa9c702391081e1c28eb65bb19b2c1dca1cabacc96c8c0b26b4d132406374cd145
+AUX mwavem-2.0-C23.patch 3886 BLAKE2B c1c25a7c98f8473ce05b2d6983886e29ce8e45a39da7dd5267d3d4702f7f28a3ddc42db24f282bdaf513db47b10dbbaabb924c09c92818d71cbc3e8a884e9a6a SHA512 616e00df90cf53031c309868dd080b034c11338dd90a3f00b3f4e1dda24f4bb94ccbbb227307e5516b5ede4d9d48118f7c5a21b7ee72c4774beae9afa1040885
 AUX mwavem-2.0-ar.patch 218 BLAKE2B 433f97b0b9417d98aa420e148db4efcfb6c6b0f3bdc95aa9959e1a0126be7e0498cd767fb653bdf48327779c961c5eeb1982dcedcdaa103ca9a62108fc8ca47c SHA512 5c9b3e65e2d05d84222c50f393b1ba8ba7c442b61169910131d3d8711946773f8821664dec16c3376c477d490f7fff18d5abb6501dacfb04195b51886e187da6
 AUX mwavem-2.0-fno-common.patch 648 BLAKE2B 29ea7460a86caae6c2033923f1ef6e9c43db4202f1802061e03fcc8f9eb16db6fde5a907960644bdeead3514a01a7f9901288d3a535f9bc657ef4bbfb1e3a3e9 SHA512 6087f5c42a3b3a57a87367e6fae41fccfdefbfcba681406903230c1ae88305787da0acb969c56f19b24255f78f4a44f35627e3ec2ba8417c9babff86a7bbf452
 AUX mwavem-2.0-gentoo.patch 1010 BLAKE2B 1a3d7126af9201bf8bcd2440f362b13a7037c8f4b3e6356f87103b2c315508b292d20946c87e93d8d939f19d95a9f781b3948c8caf0d003578fb8fe223f2eaaa SHA512 e0a97cfe59d7ecffc1199e9ad1380c9965546e554536747f593a69e0920f022e9667554fcb6633e1814163243b98ffc695ec25d98471d41b2e08ed112653dccf
 AUX mwavem-2.0-glibc-2.10.patch 1389 BLAKE2B 93073cdb8ef48b89b6f2603730d5a970e04202d1f249b1afeb3edbbde413fced88cfd31c2b56e0e9f981271a3830725047b98c1b3f9e8914460a730b5a86403a SHA512 a946530d607361c189d4cda8d8dcd3454caed695894dea8e7c25f53a2ae33a0e4684f738527f635eb0ddcbd238ce5007b9bd54c0c34f5b78d83d49ad530ba474
+AUX mwavem-2.0-pthread.patch 703 BLAKE2B 712b439273f3ac9a79fa28944c413e252c44c3a2cf3814ac40711cd3b4c5bcceecdee32cac00d8c8b1535d21bb936abce22b41df062ba69a7144d5f288149926 SHA512 194c7da811f7ff47315bd1270712a4a04db5a5d2f8ef85eabded910a4577201199ea027a734f24c22bffae4dd5a1a5458fdcfc11d58188ffb3df7b02c3956ed0
 DIST mwavem-2.0.tar.gz 1443167 BLAKE2B d70e3088b13a83f5dfd93690e67fa68497ef793b840fa3cba45efe4e72448abeba5312e0bbf1176825a62c366d47829ebd135461bf9600ba1b971b1db00a55e7 SHA512 e1bb3c7e5511abc784b0359b844498389a9cb970fe46752775aaae6146d8cf25998a6e12dfc70df5c5f4287fd57abb49252f81a00528db5f7c2c96e3e7efb516
 EBUILD mwavem-2.0-r2.ebuild 1201 BLAKE2B 129960805253e8e17fd41188bb9ca40125352bf762067e868bec343ebad84fde9ad3e6c993a9236f73efcd5a8b0ce756435a8ca431eb58283ae6bbd8d19cd3f4 SHA512 6788d27903f4e1d7ec0c4d57453a3e8a899f436b6373956a38ccc2747c8fea44e45e459dac6b365227cc853f3ed19387c095bff5f817d2869cdd2a6c7206a1c1
+EBUILD mwavem-2.0-r3.ebuild 1240 BLAKE2B bc50fee9d81fbd02a62e05c861ec17b489a6386479a579faf87a631d3cc52271b5cacb079ffc654c871a1b2a0b8c3d969056e120c4051b7f488e4deb166e4408 SHA512 a1bc098dc7f2822aa11154c16cf6db976a22cc483a311450130a5f3b222750285cff0f4f9fb3549ee83d2c7db96df7abaff98e3722e45b77e670cd50e0399527
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-dialup/mwavem/files/mwavem-2.0-C23.patch b/net-dialup/mwavem/files/mwavem-2.0-C23.patch
new file mode 100644
index 000000000000..d9c269b45d12
--- /dev/null
+++ b/net-dialup/mwavem/files/mwavem-2.0-C23.patch
@@ -0,0 +1,128 @@
+Just use system definitions and don't shortcut externs,
+wherever possible.
+There's a default way to use va_args, don't reinvent wheel
+https://bugs.gentoo.org/715926
+https://bugs.gentoo.org/921186
+https://bugs.gentoo.org/945184
+--- a/configure.in
++++ b/configure.in
+@@ -5,6 +5,7 @@
+ 
+ dnl Find operating system, vendor, architecture
+ AC_CANONICAL_SYSTEM
++AC_USE_SYSTEM_EXTENSIONS
+ 
+ AM_INIT_AUTOMAKE(mwavem,2.0)
+ 
+--- a/src/meio/meiovect.c
++++ b/src/meio/meiovect.c
+@@ -65,14 +65,14 @@
+ /*   external function declarations					  */
+ /*------------------------------------------------------------------------*/
+ 
+-extern ULONG APIENTRY dspMeioOpeni();
+-extern ULONG dspMeioClosei();
+-extern ULONG APIENTRY dspMeioQueryi();
+-extern ULONG APIENTRY dspMeioConnecti();
+-extern ULONG APIENTRY dspMeioDisconnecti();
+-extern ULONG APIENTRY dspMeioUpdateConnectioni();
+-extern ULONG APIENTRY dspMeioQueryConnectioni();
+-extern ULONG APIENTRY dspMeioResynci();
++extern ULONG APIENTRY dspMeioOpeni(HDSP hDsp, HMEIO FAR *phMeio, ULONG Options);
++extern ULONG dspMeioClosei(HMEIO hMeio, ULONG Options);
++extern ULONG APIENTRY dspMeioQueryi(HMEIO MMeio, MEIO_QUERYTYPE Request, ULONG FAR *fpBufferSize, VOID FAR *fpBuffer);
++extern ULONG APIENTRY dspMeioConnecti(HMEIO hMeio, HCONNECTION FAR *fpConnection, ULONG OwnerPort, ULONG UserPort, ULONG SharingOptions, ULONG ulState, ULONG Reserved);
++extern ULONG APIENTRY dspMeioDisconnecti(HCONNECTION hConnection, ULONG ulReserved);
++extern ULONG APIENTRY dspMeioUpdateConnectioni(HCONNECTION hConnection, MEIO_CONNECTATTRIBUTE Attribute, LONG lValue);
++extern ULONG APIENTRY dspMeioQueryConnectioni(HCONNECTION hConnection, MEIO_CONNECTATTRIBUTE Attribute, LONG FAR *fpValue);
++extern ULONG APIENTRY dspMeioResynci(MEIO_OBJ_TYPE ObjectType, ULONG Object, ULONG ulOptions);
+ 
+ /*------------------------------------------------------------------------*/
+ /* MeioAPIDispatch()                                                      */
+--- a/src/mwmlw32/mwmload.c
++++ b/src/mwmlw32/mwmload.c
+@@ -53,6 +53,7 @@
+ #include <sys/timeb.h>
+ #include <time.h>
+ #include <mwqservr.h>
++#include <stdarg.h>
+ #include "mww32.h"
+ /*#include <pbmplus.h>*/
+ #include <mwave.h>
+@@ -74,6 +75,8 @@
+ #define MODNAME "MWMODEM"
+ void mwavem_dprintf(char *szFormat, ...)
+ {
++  va_list args;
++  va_start(args, szFormat);
+   /*if (usDebugWindow)
+   {*/
+     struct timeb timebuffer;
+@@ -91,11 +94,12 @@
+       else
+         strcpy(ach, MODNAME ": ");
+ 
+-    vsprintf(ach+strlen(ach),szFormat,(char *)(&szFormat+1));
++    vsprintf(ach+strlen(ach),szFormat, args);
+     strcat(ach, "\r\n");
+ 
+     OutputDebugString(ach);
+  /* } */
++  va_end(args);
+ }
+ 
+ 
+--- a/src/mwmlw32/mwmrsp.c
++++ b/src/mwmlw32/mwmrsp.c
+@@ -44,9 +44,9 @@
+  *            First release to the public
+  *
+  */
++#include <unistd.h>
+ #include <mwmspcfc.h>
+ static char szThisFile[] = "MWMRSP.C";
+-extern void swab();
+ 
+ ULONG mwmrspEchoFAXResponse(PMWM_DSPINFO pmwmDspInfo,USHORT usControlStat)
+ {
+--- a/src/mwmpw32/mwmclss2.c
++++ b/src/mwmpw32/mwmclss2.c
+@@ -1227,8 +1227,6 @@
+ 
+ 
+ 
+-extern void swab() __THROW;
+-
+ USHORT  mwmClss2FLIDCommand(STATEINFO *psi)
+ {
+   USHORT usParserStatus = 0;
+--- a/src/mwmpw32/mwmparse.c
++++ b/src/mwmpw32/mwmparse.c
+@@ -54,6 +54,7 @@
+ #include <stddef.h>
+ #include <sys/timeb.h>
+ #include <time.h>
++#include <unistd.h>
+ 
+ #include <port_types.h>
+ #include <port_functions.h>
+@@ -324,8 +325,6 @@
+   return 0;
+ }
+ 
+-extern void swab() __THROW;
+-
+ USHORT mwmParseEchoString(STATEINFO *psi,PSZ achString)
+ {
+   USHORT usParserStatus = 0;
+--- a/src/mwmutil/mwmutil.c
++++ b/src/mwmutil/mwmutil.c
+@@ -189,8 +189,6 @@
+ 
+ } /*readFile*/
+ 
+-extern char *strcasestr () __THROW __attribute_pure__;
+-
+ /* Give a file buffer, find a return ptr to section name (or NULL if not found) */
+ char * getSection(LPCTSTR lpSectionName,char *file) {    // Section name, bracket delimited
+   char *line;
diff --git a/net-dialup/mwavem/files/mwavem-2.0-pthread.patch b/net-dialup/mwavem/files/mwavem-2.0-pthread.patch
new file mode 100644
index 000000000000..27713035b000
--- /dev/null
+++ b/net-dialup/mwavem/files/mwavem-2.0-pthread.patch
@@ -0,0 +1,14 @@
+Use correct type for thread handle. It already uses pthread_t for other half of the
+assignment
+https://bugs.gentoo.org/897844
+--- a/src/manager/mwaveapi.c
++++ b/src/manager/mwaveapi.c
+@@ -79,7 +79,7 @@
+ BOOL g_bIPCSupportActive = FALSE;         // True if our IPC support layer is initialized and active
+ unsigned g_uIPCsInUse;                    // One bit per IPC in use for this subsystem
+ BOOL g_abCancellingIPCs[MWAPI_MaxIPCs];   // TRUE if we're attempting to cancel an IPC thread
+-HANDLE g_ahIPCThreads[MWAPI_MaxIPCs];     // Thread handle of IPC thread
++pthread_t g_ahIPCThreads[MWAPI_MaxIPCs];  // Thread handle of IPC thread
+ PFN g_pfnIPCNotice[MWAPI_MaxIPCs];
+ 
+ BOOL   bDspDisabled = FALSE;
diff --git a/net-dialup/mwavem/mwavem-2.0-r3.ebuild b/net-dialup/mwavem/mwavem-2.0-r3.ebuild
new file mode 100644
index 000000000000..953bbaa51b10
--- /dev/null
+++ b/net-dialup/mwavem/mwavem-2.0-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="User level application for IBM Mwave modem"
+HOMEPAGE="http://oss.software.ibm.com/acpmodem/"
+SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-C23.patch
+	"${FILESDIR}"/${P}-pthread.patch
+)
+
+HTML_DOCS=( doc/mwave.html )
+DOCS=( doc/mwave.sgml doc/mwave.txt )
+
+src_prepare() {
+	default
+	rm README.freebsd || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_install() {
+	default
+
+	dosbin "${FILESDIR}"/mwave-dev-handler
+
+	insinto /etc/devfs.d
+	newins "${FILESDIR}"/mwave.devfs mwave
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/mwave.modules mwave.conf
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT}"/dev/.devfsd ]]; then
+		# device node is created by devfs
+		ebegin "Restarting devfsd to reread devfs rules"
+			killall -HUP devfsd
+		eend $?
+	else
+		elog "Create device node if needed, using command like this:"
+		elog "# mknod --mode=0660 \"${EROOT}/dev/modems/mwave\" c 10 219"
+	fi
+}