From: izzy Meyer Subject: Re: MAINTAINER RELIABILITY FIX: disable voice support in net/abaddon to 7.9-stable to avoid end users getting banned To: Stuart Henderson Cc: ports@openbsd.org, kirill@korins.ky Date: Tue, 2 Jun 2026 18:53:08 -0500 On Wed, 3 Jun 2026 00:22:08 +0100 Stuart Henderson wrote: > That is reasonabke to do in -stable. Though (bear in mind I don't know > this software, or the chat network or whatever it is that it uses), > would it be better to just update it? I see the main libraries are > pulled in as git submodules rather than standalone libraries so it's > low risk for other ports. I think just updating the port makes more sense. Attached is the diff i sent earlier for -current that should apply on -stable just for easy access. Good to commit? > On 2026/06/02 17:40, izzy Meyer wrote: > > Hello ports@ > > > > Attached is a diff that should apply to 7.9-stable's ports tree that > > disables voice support. (not the best at CVS hopefully I produced it > > correctly) > > > > I had a friend get banned after trying to use voice support on > > net/abaddon with me on 7.9-stable. > > > > Discord migrated their voice calls to use libdave encryption and > > this version of the port available in 7.9-stable was made before > > abaddon upstream added libdave support. This puts users at risk of > > using an unsupported voice api (no libdave) and getting banned on > > accident. > > > > The idea is that if we disable the support entirely for the version > > available in 7.9-stable, the end user has less of a chance of > > accidentally banning themselves. > > > > I'm open to discussion if this isn't worthy of a commit to > > 7.9-stable's ports tree as I understand typically ports are version > > frozen with the exception of security and reliability issues. I > > feel this may be a good case for a reliability fix exception for > > the reason above. > > > > Thoughts? > > > > Thanks, > > > > -- > > iz (she/her) > > > > > I say mundane things > > > so the uninteresting > > > just might get noticed. > > > > izder456 (dot) neocities (dot) org > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/net/abaddon/Makefile,v > > diff -u -p -r1.1.1.1 Makefile > > --- Makefile 22 Mar 2026 07:04:46 -0000 1.1.1.1 > > +++ Makefile 2 Jun 2026 22:25:42 -0000 > > @@ -1,7 +1,8 @@ > > -COMMENT = alternative & light Discord client with voice > > support +COMMENT = alternative & light Discord client > > > > V = 0.2.3 > > PKGNAME = abaddon-${V} > > +REVISION= 0 > > > > DIST_TUPLE += github uowuo abaddon v${V} . > > DIST_TUPLE += github machinezone IXWebSocket \ > > @@ -25,25 +26,25 @@ PERMIT_PACKAGE = Yes > > WANTLIB += ${COMPILER_LIBCXX} atk-1.0 atkmm-1.6 c cairo cairomm-1.0 > > WANTLIB += crypto curl fmt fontconfig freetype gdk-3 gdk_pixbuf-2.0 > > WANTLIB += gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 > > gobject-2.0 -WANTLIB += gtk-3 gtkmm-3.0 handy-1 harfbuzz intl m > > opus pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 > > rnnoise secret-1 -WANTLIB += sigc-2.0 sodium spdlog sqlite3 ssl z > > +WANTLIB += gtk-3 gtkmm-3.0 handy-1 harfbuzz intl m pango-1.0 > > pangocairo-1.0 +WANTLIB += pangoft2-1.0 pangomm-1.4 secret-1 > > sigc-2.0 spdlog sqlite3 +WANTLIB += ssl z > > > > COMPILER = base-clang ports-gcc base-gcc > > > > MODULES = devel/cmake > > > > +# currently broken in this version > > +CONFIGURE_ARGS = -DENABLE_VOICE=0 > > + > > BUILD_DEPENDS = textproc/nlohmann-json > > -LIB_DEPENDS = audio/rnnoise \ > > - audio/opus \ > > - databases/sqlite3 \ > > +LIB_DEPENDS = databases/sqlite3 \ > > devel/atk2mm \ > > devel/fmt \ > > devel/glib2mm \ > > devel/harfbuzz \ > > devel/spdlog \ > > net/curl \ > > - security/libsodium \ > > x11/gnome/libsecret \ > > x11/gtk3mm \ > > x11/libhandy > -- iz (she/her) > I say mundane things > so the uninteresting > just might get noticed. izder456 (dot) neocities (dot) org diff --git net/abaddon/Makefile net/abaddon/Makefile index d4c6b61b692..98d3371264f 100755 --- net/abaddon/Makefile +++ net/abaddon/Makefile @@ -1,6 +1,6 @@ -COMMENT = alternative & light Discord client with voice support +COMMENT = alternative & light Discord client -V = 0.2.3 +V = 0.2.4 PKGNAME = abaddon-${V} DIST_TUPLE += github uowuo abaddon v${V} . @@ -8,8 +8,12 @@ DIST_TUPLE += github machinezone IXWebSocket \ bc765e73a31ea5372e36d1b1add036af3218cb17 subprojects/ixwebsocket DIST_TUPLE += github hrantzsch keychain \ 502312f59fdc44fa1103e67f8f17cec3affb82d9 subprojects/keychain +DIST_TUPLE += github discord libdave \ + 52cd56dc550f447fb354b3a06c9e2d2e2a4309c6 subprojects/libdave DIST_TUPLE += github mackron miniaudio \ - 350784a9467a79d0fa65802132668e5afbcf3777 subprojects/miniaudio + 9634bedb5b5a2ca38c1ee7108a9358a4e233f14d subprojects/miniaudio +DIST_TUPLE += github cisco mlspp \ + 1cc50a124a3bc4e143a787ec934280dc70c1034d subprojects/mlspp DIST_TUPLE += github nayuki QR-Code-generator \ 22fac31bdf81da68730c177c0e931c93234d2a30 subprojects/qrcodegen @@ -25,33 +29,27 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} atk-1.0 atkmm-1.6 c cairo cairomm-1.0 WANTLIB += crypto curl fmt fontconfig freetype gdk-3 gdk_pixbuf-2.0 WANTLIB += gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 -WANTLIB += gtk-3 gtkmm-3.0 handy-1 harfbuzz intl m opus pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 rnnoise secret-1 -WANTLIB += sigc-2.0 sodium spdlog sqlite3 ssl z +WANTLIB += gtk-3 gtkmm-3.0 handy-1 harfbuzz intl m pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pangomm-1.4 secret-1 sigc-2.0 spdlog sqlite3 +WANTLIB += ssl z COMPILER = base-clang ports-gcc base-gcc MODULES = devel/cmake +# mlspp currently broken with libressl +CONFIGURE_ARGS = -DENABLE_VOICE=0 + BUILD_DEPENDS = textproc/nlohmann-json -LIB_DEPENDS = audio/rnnoise \ - audio/opus \ - databases/sqlite3 \ +LIB_DEPENDS = databases/sqlite3 \ devel/atk2mm \ devel/fmt \ devel/glib2mm \ devel/harfbuzz \ devel/spdlog \ net/curl \ - security/libsodium \ x11/gnome/libsecret \ x11/gtk3mm \ x11/libhandy -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/abaddon - cp -R ${WRKSRC}/res/* ${PREFIX}/share/abaddon/ - ${INSTALL_PROGRAM} ${WRKBUILD}/abaddon \ - ${PREFIX}/bin/ - .include diff --git net/abaddon/distinfo net/abaddon/distinfo index 1d56921a276..06ea1d330c6 100644 --- net/abaddon/distinfo +++ net/abaddon/distinfo @@ -1,10 +1,14 @@ +SHA256 (cisco-mlspp-1cc50a124a3bc4e143a787ec934280dc70c1034d.tar.gz) = ep1jGGJ+VIkDvGXD3FpN5KkCkJg+/qmkmvhWHtP5mfU= +SHA256 (discord-libdave-52cd56dc550f447fb354b3a06c9e2d2e2a4309c6.tar.gz) = NWTg0m+hQ7u9Blm9krUPuJ2yqfF+Do7bldWGGwRvj/0= SHA256 (hrantzsch-keychain-502312f59fdc44fa1103e67f8f17cec3affb82d9.tar.gz) = PFfScqBkGe1YBo2f4UwWgHBBv5ubNyuAlQubCdCM9EE= SHA256 (machinezone-IXWebSocket-bc765e73a31ea5372e36d1b1add036af3218cb17.tar.gz) = neqQnQXogqVAUmsV+9yXZKOd61OBDrhq15f9gTWgInU= -SHA256 (mackron-miniaudio-350784a9467a79d0fa65802132668e5afbcf3777.tar.gz) = KKttDTnDKkbVe1LRBARuizY3v8Udi6sH7FrlQV3I7lI= +SHA256 (mackron-miniaudio-9634bedb5b5a2ca38c1ee7108a9358a4e233f14d.tar.gz) = Gjp5uA/G8LDMFV4ouVSlmODd+i22Tir6hGa+iMR2+lU= SHA256 (nayuki-QR-Code-generator-22fac31bdf81da68730c177c0e931c93234d2a30.tar.gz) = IY4+lt7XiA0F9Hxmiq1lQaCOYzA6xNeDcgOJCH2m9O0= -SHA256 (uowuo-abaddon-v0.2.3.tar.gz) = BjdTxqetPmodmuSySOfYkskMElOWHrUS+96DsIsIjjU= +SHA256 (uowuo-abaddon-v0.2.4.tar.gz) = aMs8oE6vJtzPfXdQpl34zyOBnJ1QGyWAijZLKRXDYM8= +SIZE (cisco-mlspp-1cc50a124a3bc4e143a787ec934280dc70c1034d.tar.gz) = 4459088 +SIZE (discord-libdave-52cd56dc550f447fb354b3a06c9e2d2e2a4309c6.tar.gz) = 112322 SIZE (hrantzsch-keychain-502312f59fdc44fa1103e67f8f17cec3affb82d9.tar.gz) = 138190 SIZE (machinezone-IXWebSocket-bc765e73a31ea5372e36d1b1add036af3218cb17.tar.gz) = 637564 -SIZE (mackron-miniaudio-350784a9467a79d0fa65802132668e5afbcf3777.tar.gz) = 4485119 +SIZE (mackron-miniaudio-9634bedb5b5a2ca38c1ee7108a9358a4e233f14d.tar.gz) = 4553616 SIZE (nayuki-QR-Code-generator-22fac31bdf81da68730c177c0e931c93234d2a30.tar.gz) = 193445 -SIZE (uowuo-abaddon-v0.2.3.tar.gz) = 14516137 +SIZE (uowuo-abaddon-v0.2.4.tar.gz) = 14522194 diff --git net/abaddon/patches/patch-src_platform_cpp net/abaddon/patches/patch-src_platform_cpp deleted file mode 100644 index 36e84262d77..00000000000 --- net/abaddon/patches/patch-src_platform_cpp +++ /dev/null @@ -1,13 +0,0 @@ -# https://github.com/uowuo/abaddon/pull/408 -Index: src/platform.cpp ---- src/platform.cpp.orig -+++ src/platform.cpp -@@ -93,7 +93,7 @@ std::string Platform::FindStateCacheFolder() { - return "."; - } - --#elif defined(__linux__) || defined(__FreeBSD__) -+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) - std::string Platform::FindResourceFolder() { - static std::string found_path; - static bool found = false; diff --git net/abaddon/pkg/PLIST net/abaddon/pkg/PLIST index 2951a1d0541..62799a98b80 100644 --- net/abaddon/pkg/PLIST +++ net/abaddon/pkg/PLIST @@ -2,10 +2,6 @@ share/abaddon/ share/abaddon/css/ share/abaddon/css/main.css -share/abaddon/desktop/ -share/abaddon/desktop/icon.svg -share/abaddon/desktop/io.github.uowuo.abaddon.desktop -share/abaddon/desktop/io.github.uowuo.abaddon.metainfo.xml share/abaddon/fonts/ share/abaddon/fonts/Twemoji-15.0.3.ttf share/abaddon/fonts/conf.d/ @@ -85,4 +81,7 @@ share/abaddon/res/twitter.png share/abaddon/res/typing_indicator.gif share/abaddon/res/xbox.png share/abaddon/res/youtube.png +share/applications/icon.svg +share/applications/io.github.uowuo.abaddon.desktop +share/applications/io.github.uowuo.abaddon.metainfo.xml share/doc/pkg-readmes/${PKGSTEM}