Re: [new] games/dsda-doom
On Tue, Jul 25, 2023 at 03:34:33PM -0300, Lucas de Sena wrote:
> On 2023-07-25, Stuart Henderson wrote:
> > On 2023/07/25 12:06, Lucas de Sena wrote:
> > > On 2023-07-24, Thomas Frohwein wrote:
> > > > 1. There are dependencies/WANTLIBS missing:
> > >
> > > Fixed.
> >
> > Missing lib: mad.2 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
> > Missing lib: portmidi.0 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
> > Missing lib: vorbis.9 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
> > Missing lib: vorbisfile.6 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
> > Missing lib: zip.4 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
> >
> > you need to add LIB_DEPENDS for the "NOT REACHABLE" ones, and re-run
> > the check to pick up the additional WANTLIB.
> >
> > > > 3. What is the value of disabling fluidsynth in the Makefile? We have
> > > >it in ports...
> > >
> > > It needs fluidsynth 2.0, we have 1.1.9 packaged.
> >
> > please add a comment explaining that.
> >
> > you have this,
> >
> > CONFIGURE_ENV =CFLAGS="-I${X11BASE}/include
> > -I${LOCALBASE}/include"
> >
> > which overrides the default CFLAGS. Instead use
> >
> > CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
> >
> > also remove the two -DCMAKE_BUILD_TYPE lines, they are handled
> > by ports infrastructure.
> >
>
>
> Thanks for the explanation :)
>
> Is it ok?
This looks good to me now and builds. I'm not sure about the value of
DEBUG_PACKAGES in a port like this... It's 1.2M of space and unless you
are actively working on refining the port by studying backtraces, I
doubt that DEBUG_PACKAGES will be useful...
I like the more visually uniform use of tabs and the comment about
fluidsynth v2.0 will be useful to know when we might be able to remove
that CONFIGURE_ARG in the future...
with or without DEBUG_PACKAGES, ok thfr@
> Cheers,
> Lucas de Sena
update net/wget 1.21.4
Here is an update to net/wget 1.21.4. I introduced two new patches as a
workaround to pass unit tests, which falsely fail because of generating
unexpected output when run in the background.
see:
https://lists.gnu.org/archive/html/bug-wget/2023-07/msg1.html
NEWS:
https://git.savannah.gnu.org/cgit/wget.git/commit/?h=v1.21.4=e234354080aeb0db03d0604c8f592d472b6af489
To test I downloaded install73.img. Unit tests now pass (before, a
majority failed) and some are skipped. OK?
Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- Makefile3 Apr 2022 23:42:36 - 1.91
+++ Makefile25 Jul 2023 23:33:53 -
@@ -1,6 +1,6 @@
COMMENT = retrieve files from the web via HTTP, HTTPS and FTP
-DISTNAME = wget-1.21.3
+DISTNAME = wget-1.21.4
CATEGORIES = net
HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo3 Apr 2022 23:42:36 - 1.28
+++ distinfo25 Jul 2023 23:33:53 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.21.3.tar.gz) = Vya7i8XKD23HEQ9kFuS7cBni0v9b+T0cov/MZlbyIOU=
-SIZE (wget-1.21.3.tar.gz) = 5079864
+SHA256 (wget-1.21.4.tar.gz) = gVQvXO+4+qzDm7vGyC3tgOPkqIUFrnLqUd8nUlvN4Ew=
+SIZE (wget-1.21.4.tar.gz) = 5059591
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/wget/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in 3 Apr 2022 23:42:36 - 1.6
+++ patches/patch-Makefile_in 25 Jul 2023 23:33:53 -
@@ -1,7 +1,7 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -1691,7 +1691,7 @@ distuninstallcheck_listfiles = find . -type f | \
+@@ -1895,7 +1895,7 @@ distuninstallcheck_listfiles = find . -type f | \
ACLOCAL_AMFLAGS = -I m4
# subdirectories in the distribution
Index: patches/patch-testenv_conf_expected_files_py
===
RCS file: patches/patch-testenv_conf_expected_files_py
diff -N patches/patch-testenv_conf_expected_files_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-testenv_conf_expected_files_py25 Jul 2023 23:33:53
-
@@ -0,0 +1,13 @@
+failing tests generate unexpected output files in the background
+
+see:
+https://lists.gnu.org/archive/html/bug-wget/2023-07/msg1.html
+
+Index: testenv/conf/expected_files.py
+--- testenv/conf/expected_files.py.orig
testenv/conf/expected_files.py
+@@ -55,4 +55,3 @@ class ExpectedFiles:
+ raise TestFailed('Expected file %s not found.' % file.name)
+ if local_fs:
+ print(local_fs)
+-raise TestFailed('Extra files downloaded.')
Index: patches/patch-tests_WgetTests_pm
===
RCS file: patches/patch-tests_WgetTests_pm
diff -N patches/patch-tests_WgetTests_pm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tests_WgetTests_pm25 Jul 2023 23:33:53 -
@@ -0,0 +1,17 @@
+failing tests generate unexpected output files in the background
+
+see:
+https://lists.gnu.org/archive/html/bug-wget/2023-07/msg1.html
+
+Index: tests/WgetTests.pm
+--- tests/WgetTests.pm.orig
tests/WgetTests.pm
+@@ -365,8 +365,6 @@ sub _verify_download
+ );
+ if (@unexpected_downloads)
+ {
+-return 'Test failed: unexpected downloaded files [' .
+- (join ', ', @unexpected_downloads) . "]\n";
+
+ }
+
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/wget/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST
--- pkg/PLIST 11 Mar 2022 19:48:11 - 1.29
+++ pkg/PLIST 25 Jul 2023 23:33:53 -
@@ -50,6 +50,10 @@ share/locale/it/LC_MESSAGES/wget-gnulib.
share/locale/it/LC_MESSAGES/wget.mo
share/locale/ja/LC_MESSAGES/wget-gnulib.mo
share/locale/ja/LC_MESSAGES/wget.mo
+share/locale/ka/
+share/locale/ka/LC_MESSAGES/
+share/locale/ka/LC_MESSAGES/wget-gnulib.mo
+share/locale/ka/LC_MESSAGES/wget.mo
share/locale/ko/LC_MESSAGES/wget-gnulib.mo
share/locale/ko/LC_MESSAGES/wget.mo
share/locale/lt/
Re: arm64 BTI support for mpg123
Mark Kettenis wrote: > I'm not sure to what extent this makes IBT less effective. Can the > retpolines be used as gadgets to bypass IBT? Should we stop enabling > retpolines by default? > > What *is* obvious is that retpolines are incompatible wuth shadow > stacks. Is there an alternative that doesn't replace the indirect > branch with a return instruction? It is clear however that both AMD and Intel have seperate (yet compatible) strategies to encourage you to buy newer chips.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/07/25 13:55:54 Modified files: security/rust-openssl-tests: Makefile crates.inc distinfo security/rust-openssl-tests/pkg: PLIST Log message: Update rust-openssl-tests to 20230725
UPDATE: Nextcloud-26.0.4
Hello, Update for Nextcloud to 26.0.4: https://nextcloud.com/changelog/#latest26 OK? Comments? Cheers.- Index: Makefile === RCS file: /cvs/ports/www/nextcloud/24/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile27 Jul 2022 16:58:51 - 1.2 +++ Makefile17 Aug 2022 06:30:05 - @@ -1,3 +1,3 @@ -NC_VERSION=24.0.3 +NC_VERSION=24.0.4 .include Index: distinfo === RCS file: /cvs/ports/www/nextcloud/24/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo27 Jul 2022 16:58:51 - 1.2 +++ distinfo17 Aug 2022 06:30:05 - @@ -1,2 +1,2 @@ -SHA256 (nextcloud-24.0.3.tar.bz2) = MgyB+bkCkitLzvPqz4WFlqFDR/1Fvd0m2sGYVi0hJDk= -SIZE (nextcloud-24.0.3.tar.bz2) = 123680045 +SHA256 (nextcloud-24.0.4.tar.bz2) = 0QdCb44cGT24gqBMhE+bx+fut8IeRsRhl+UVTW1qwo4= +SIZE (nextcloud-24.0.4.tar.bz2) = 123646294 Index: pkg/PLIST === RCS file: /cvs/ports/www/nextcloud/24/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 27 Jul 2022 16:58:51 - 1.2 +++ pkg/PLIST 17 Aug 2022 06:30:06 - @@ -6931,6 +6931,7 @@ nextcloud/3rdparty/sabre/dav/lib/DAV/Aut nextcloud/3rdparty/sabre/dav/lib/DAV/Auth/Backend/File.php nextcloud/3rdparty/sabre/dav/lib/DAV/Auth/Backend/IMAP.php nextcloud/3rdparty/sabre/dav/lib/DAV/Auth/Backend/PDO.php +nextcloud/3rdparty/sabre/dav/lib/DAV/Auth/Backend/PDOBasicAuth.php nextcloud/3rdparty/sabre/dav/lib/DAV/Auth/Plugin.php nextcloud/3rdparty/sabre/dav/lib/DAV/Browser/ nextcloud/3rdparty/sabre/dav/lib/DAV/Browser/GuessContentType.php @@ -8815,8 +8816,6 @@ nextcloud/apps/activity/l10n/ia.js nextcloud/apps/activity/l10n/ia.json nextcloud/apps/activity/l10n/id.js nextcloud/apps/activity/l10n/id.json -nextcloud/apps/activity/l10n/ig.js -nextcloud/apps/activity/l10n/ig.json nextcloud/apps/activity/l10n/is.js nextcloud/apps/activity/l10n/is.json nextcloud/apps/activity/l10n/it.js @@ -8898,8 +8897,6 @@ nextcloud/apps/activity/l10n/tk.js nextcloud/apps/activity/l10n/tk.json nextcloud/apps/activity/l10n/tr.js nextcloud/apps/activity/l10n/tr.json -nextcloud/apps/activity/l10n/ug.js -nextcloud/apps/activity/l10n/ug.json nextcloud/apps/activity/l10n/uk.js nextcloud/apps/activity/l10n/uk.json nextcloud/apps/activity/l10n/uz.js @@ -9685,6 +9682,8 @@ nextcloud/apps/circles/lib/Search/Federa nextcloud/apps/circles/lib/Search/GlobalScaleUsers.php nextcloud/apps/circles/lib/Search/LocalGroups.php nextcloud/apps/circles/lib/Search/LocalUsers.php +nextcloud/apps/circles/lib/Search/UnifiedSearchProvider.php +nextcloud/apps/circles/lib/Search/UnifiedSearchResult.php nextcloud/apps/circles/lib/Service/ nextcloud/apps/circles/lib/Service/CircleService.php nextcloud/apps/circles/lib/Service/CirclesService.php @@ -10305,6 +10304,8 @@ nextcloud/apps/dashboard/l10n/lt_LT.js nextcloud/apps/dashboard/l10n/lt_LT.json nextcloud/apps/dashboard/l10n/mk.js nextcloud/apps/dashboard/l10n/mk.json +nextcloud/apps/dashboard/l10n/nb.js +nextcloud/apps/dashboard/l10n/nb.json nextcloud/apps/dashboard/l10n/nl.js nextcloud/apps/dashboard/l10n/nl.json nextcloud/apps/dashboard/l10n/oc.js @@ -10730,6 +10731,7 @@ nextcloud/apps/dav/lib/DAV/Sharing/Xml/ nextcloud/apps/dav/lib/DAV/Sharing/Xml/Invite.php nextcloud/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php nextcloud/apps/dav/lib/DAV/SystemPrincipalBackend.php +nextcloud/apps/dav/lib/DAV/ViewOnlyPlugin.php nextcloud/apps/dav/lib/Db/ nextcloud/apps/dav/lib/Db/Direct.php nextcloud/apps/dav/lib/Db/DirectMapper.php @@ -13340,6 +13342,7 @@ nextcloud/apps/files_sharing/lib/ShareBa nextcloud/apps/files_sharing/lib/SharedMount.php nextcloud/apps/files_sharing/lib/SharedStorage.php nextcloud/apps/files_sharing/lib/Updater.php +nextcloud/apps/files_sharing/lib/ViewOnly.php nextcloud/apps/files_sharing/list.php nextcloud/apps/files_sharing/public.php nextcloud/apps/files_sharing/templates/ @@ -16287,6 +16290,8 @@ nextcloud/apps/settings/l10n/nb.js nextcloud/apps/settings/l10n/nb.json nextcloud/apps/settings/l10n/nl.js nextcloud/apps/settings/l10n/nl.json +nextcloud/apps/settings/l10n/nn_NO.js +nextcloud/apps/settings/l10n/nn_NO.json nextcloud/apps/settings/l10n/oc.js nextcloud/apps/settings/l10n/oc.json nextcloud/apps/settings/l10n/pl.js @@ -17663,8 +17668,6 @@ nextcloud/apps/text/l10n/ja.js nextcloud/apps/text/l10n/ja.json nextcloud/apps/text/l10n/ka_GE.js nextcloud/apps/text/l10n/ka_GE.json -nextcloud/apps/text/l10n/km.js -nextcloud/apps/text/l10n/km.json nextcloud/apps/text/l10n/kn.js nextcloud/apps/text/l10n/kn.json nextcloud/apps/text/l10n/ko.js @@ -17679,8 +17682,6 @@ nextcloud/apps/text/l10n/mk.js nextcloud/apps/text/l10n/mk.json nextcloud/apps/text/l10n/mn.js nextcloud/apps/text/l10n/mn.json -nextcloud/apps/text/l10n/ms_MY.js
UPDATE: Nextcloud-27.0.1
Hello, Update for Nextcloud to 27.0.1: https://nextcloud.com/changelog/#latest27 OK? Comments? Cheers.- Index: Makefile === RCS file: /cvs/ports/www/nextcloud/27/Makefile,v retrieving revision 1.1 diff -u -p -r1.1 Makefile --- Makefile16 Jun 2023 08:57:33 - 1.1 +++ Makefile25 Jul 2023 19:19:56 - @@ -1,3 +1,3 @@ -NC_VERSION=27.0.0 +NC_VERSION=27.0.1 .include Index: distinfo === RCS file: /cvs/ports/www/nextcloud/27/distinfo,v retrieving revision 1.1 diff -u -p -r1.1 distinfo --- distinfo16 Jun 2023 08:57:33 - 1.1 +++ distinfo25 Jul 2023 19:19:56 - @@ -1,2 +1,2 @@ -SHA256 (nextcloud-27.0.0.tar.bz2) = PTEqCbk0WsBYdY3XtAWb888LHw8ddHJRtvrDWFumUz8= -SIZE (nextcloud-27.0.0.tar.bz2) = 168256566 +SHA256 (nextcloud-27.0.1.tar.bz2) = OXa16PWPk03b63zEmsM7Ea0629f21dCQig/DahYMJ70= +SIZE (nextcloud-27.0.1.tar.bz2) = 168768277 Index: pkg/PLIST === RCS file: /cvs/ports/www/nextcloud/27/pkg/PLIST,v retrieving revision 1.1 diff -u -p -r1.1 PLIST --- pkg/PLIST 16 Jun 2023 08:57:33 - 1.1 +++ pkg/PLIST 25 Jul 2023 19:19:57 - @@ -10154,6 +10154,8 @@ nextcloud/apps/circles/l10n/ja.js nextcloud/apps/circles/l10n/ja.json nextcloud/apps/circles/l10n/ka_GE.js nextcloud/apps/circles/l10n/ka_GE.json +nextcloud/apps/circles/l10n/kab.js +nextcloud/apps/circles/l10n/kab.json nextcloud/apps/circles/l10n/ko.js nextcloud/apps/circles/l10n/ko.json nextcloud/apps/circles/l10n/lb.js @@ -10267,6 +10269,7 @@ nextcloud/apps/circles/lib/Command/Share nextcloud/apps/circles/lib/Command/SyncContact.php nextcloud/apps/circles/lib/Controller/ nextcloud/apps/circles/lib/Controller/AdminController.php +nextcloud/apps/circles/lib/Controller/DeprecatedController.php nextcloud/apps/circles/lib/Controller/EventWrapperController.php nextcloud/apps/circles/lib/Controller/LocalController.php nextcloud/apps/circles/lib/Controller/RemoteController.php @@ -10543,6 +10546,7 @@ nextcloud/apps/circles/lib/Migration/Ver nextcloud/apps/circles/lib/Migration/Version0024Date20220203123901.php nextcloud/apps/circles/lib/Migration/Version0024Date20220203123902.php nextcloud/apps/circles/lib/Migration/Version0024Date20220317190331.php +nextcloud/apps/circles/lib/Migration/Version0028Date20230705222601.php nextcloud/apps/circles/lib/Model/ nextcloud/apps/circles/lib/Model/BaseCircle.php nextcloud/apps/circles/lib/Model/BaseMember.php @@ -10724,6 +10728,8 @@ nextcloud/apps/cloud_federation_api/comp nextcloud/apps/cloud_federation_api/composer/composer/installed.json nextcloud/apps/cloud_federation_api/composer/composer/installed.php nextcloud/apps/cloud_federation_api/l10n/ +nextcloud/apps/cloud_federation_api/l10n/ar.js +nextcloud/apps/cloud_federation_api/l10n/ar.json nextcloud/apps/cloud_federation_api/l10n/bg.js nextcloud/apps/cloud_federation_api/l10n/bg.json nextcloud/apps/cloud_federation_api/l10n/ca.js @@ -10744,6 +10750,10 @@ nextcloud/apps/cloud_federation_api/l10n nextcloud/apps/cloud_federation_api/l10n/eo.json nextcloud/apps/cloud_federation_api/l10n/es.js nextcloud/apps/cloud_federation_api/l10n/es.json +nextcloud/apps/cloud_federation_api/l10n/es_EC.js +nextcloud/apps/cloud_federation_api/l10n/es_EC.json +nextcloud/apps/cloud_federation_api/l10n/et_EE.js +nextcloud/apps/cloud_federation_api/l10n/et_EE.json nextcloud/apps/cloud_federation_api/l10n/eu.js nextcloud/apps/cloud_federation_api/l10n/eu.json nextcloud/apps/cloud_federation_api/l10n/fi.js @@ -11051,6 +11061,8 @@ nextcloud/apps/contactsinteraction/compo nextcloud/apps/contactsinteraction/composer/composer/installed.json nextcloud/apps/contactsinteraction/composer/composer/installed.php nextcloud/apps/contactsinteraction/l10n/ +nextcloud/apps/contactsinteraction/l10n/ar.js +nextcloud/apps/contactsinteraction/l10n/ar.json nextcloud/apps/contactsinteraction/l10n/bg.js nextcloud/apps/contactsinteraction/l10n/bg.json nextcloud/apps/contactsinteraction/l10n/ca.js @@ -11069,6 +11081,8 @@ nextcloud/apps/contactsinteraction/l10n/ nextcloud/apps/contactsinteraction/l10n/en_GB.json nextcloud/apps/contactsinteraction/l10n/es.js nextcloud/apps/contactsinteraction/l10n/es.json +nextcloud/apps/contactsinteraction/l10n/es_EC.js +nextcloud/apps/contactsinteraction/l10n/es_EC.json nextcloud/apps/contactsinteraction/l10n/eu.js nextcloud/apps/contactsinteraction/l10n/eu.json nextcloud/apps/contactsinteraction/l10n/fi.js @@ -11303,6 +11317,8 @@ nextcloud/apps/dav/img/LICENSES.md nextcloud/apps/dav/img/calendar.svg nextcloud/apps/dav/img/schedule.svg nextcloud/apps/dav/l10n/ +nextcloud/apps/dav/l10n/ar.js +nextcloud/apps/dav/l10n/ar.json nextcloud/apps/dav/l10n/bg.js nextcloud/apps/dav/l10n/bg.json nextcloud/apps/dav/l10n/ca.js @@ -12794,6 +12810,11 @@ nextcloud/apps/files/lib/Command/
Re: [new] games/dsda-doom
On 2023-07-25, Stuart Henderson wrote:
> On 2023/07/25 12:06, Lucas de Sena wrote:
> > On 2023-07-24, Thomas Frohwein wrote:
> > > 1. There are dependencies/WANTLIBS missing:
> >
> > Fixed.
>
> Missing lib: mad.2 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
> Missing lib: portmidi.0 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
> Missing lib: vorbis.9 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
> Missing lib: vorbisfile.6 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
> Missing lib: zip.4 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
>
> you need to add LIB_DEPENDS for the "NOT REACHABLE" ones, and re-run
> the check to pick up the additional WANTLIB.
>
> > > 3. What is the value of disabling fluidsynth in the Makefile? We have
> > >it in ports...
> >
> > It needs fluidsynth 2.0, we have 1.1.9 packaged.
>
> please add a comment explaining that.
>
> you have this,
>
> CONFIGURE_ENV =CFLAGS="-I${X11BASE}/include
> -I${LOCALBASE}/include"
>
> which overrides the default CFLAGS. Instead use
>
> CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
>
> also remove the two -DCMAKE_BUILD_TYPE lines, they are handled
> by ports infrastructure.
>
Thanks for the explanation :)
Is it ok?
Cheers,
Lucas de Sena
dsda-doom.tar.gz
Description: application/tar-gz
Re: [update] x11/pmenu
Hi everyone,
Lucas, feel free to take over as I'm not using pmenu .
This was the only port where I was a maintainer and as I'm not
involved in OpenBSD porting anymore, I think I should be clear
now :)
regards,
Jerome
Le mar. 25 juil. 2023 à 19:25, Lucas de Sena a écrit :
> On 2023-07-25, Omar Polo wrote:
> > I'd CC the previous maintainer before removing them. Or just add
> > myself to the list.
> >
> > (+cc jerome)
>
> Jerome, ok?
>
> > it does not work for me anymore. I get this BadValue error when
> > trying to use it:
> >
> > % echo 1 | pmenu
> > X Error of failed request: BadValue (integer parameter out of range for
> operation)
> > Major opcode of failed request: 53 (X_CreatePixmap)
> > Value in failed request: 0x0
> > Serial number of failed request: 33
> > Current serial number in output stream: 41
> >
> > whereas the currently packaged version (2.2.0p0) works perfectly fine.
>
> Your X server has probably has no or empty X resource (no ~/.Xdefaults
> file or `xrdb path/to/resources` in your `~/.xsession).
>
> Should be fixed now, sorry for that.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/pmenu/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile11 Mar 2022 20:16:55 - 1.3
> +++ Makefile25 Jul 2023 17:15:52 -
> @@ -2,19 +2,16 @@ COMMENT = contextual radial menu for X11
>
> GH_ACCOUNT = phillbush
> GH_PROJECT = pmenu
> -GH_TAGNAME = v2.2.0
> -REVISION = 0
> +GH_TAGNAME = v3.1.1
>
> CATEGORIES = x11
>
> -MAINTAINER = Jerome Kasper
> -
> -HOMEPAGE = https://github.com/phillbush/pmenu
> +MAINTAINER = Lucas de Sena
>
> # MIT
> PERMIT_PACKAGE =Yes
>
> -WANTLIB += Imlib2 X11 Xext Xft Xinerama Xrender c fontconfig m
> +WANTLIB += Imlib2 X11 Xext Xft Xinerama Xrender c fontconfig m
>
> LIB_DEPENDS = graphics/imlib2
>
> @@ -22,14 +19,8 @@ DEBUG_PACKAGES =${BUILD_PACKAGES}
>
> NO_TEST = Yes
>
> -MAKE_FLAGS = FREETYPEINC=${X11BASE}/include/freetype2 \
> - MANPREFIX=${PREFIX}/man
> -
> -# ${WRKSRC}/config.mk ignores the environment, i.e. it should append to
> -# (`+=') not set (`=') variables.
> -# XXX CPPFLAGS is empty added to the end; abuse it to avoid patches and
> pass
> -# CFLAGS such that DEBUG is honoured as required for DEBUG_PACKAGES to
> work.
> -MAKE_FLAGS += CPPFLAGS='${CFLAGS}'
> +MAKE_FLAGS = MANPREFIX=${PREFIX}/man \
> + PREFIX=${PREFIX}
>
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pmenu
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/pmenu/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo4 Mar 2021 22:46:21 - 1.1.1.1
> +++ distinfo25 Jul 2023 17:15:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (pmenu-2.2.0.tar.gz) = KuvF+FfxyVb6W4qnpclN3cMiOY+iUvRyiy2KCDlMOIw=
> -SIZE (pmenu-2.2.0.tar.gz) = 15264
> +SHA256 (pmenu-3.1.1.tar.gz) = 8bcMKOnv1Ky7hTWLFSL4yEplHxjzudcVjMwJvgOPvVc=
> +SIZE (pmenu-3.1.1.tar.gz) = 25414
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: kette...@cvs.openbsd.org2023/07/25 11:46:20 Modified files: audio/mpg123 : Makefile Added files: audio/mpg123/patches: patch-src_libmpg123_dct36_neon64_S Log message: Add BTI instruction to the one arm64 assembly function that gets called indirectly. Fixes mpg123 on Apple M2. ok naddy@
Re: [update] x11/pmenu
On 2023-07-25, Omar Polo wrote:
> I'd CC the previous maintainer before removing them. Or just add
> myself to the list.
>
> (+cc jerome)
Jerome, ok?
> it does not work for me anymore. I get this BadValue error when
> trying to use it:
>
> % echo 1 | pmenu
> X Error of failed request: BadValue (integer parameter out of range for
> operation)
> Major opcode of failed request: 53 (X_CreatePixmap)
> Value in failed request: 0x0
> Serial number of failed request: 33
> Current serial number in output stream: 41
>
> whereas the currently packaged version (2.2.0p0) works perfectly fine.
Your X server has probably has no or empty X resource (no ~/.Xdefaults
file or `xrdb path/to/resources` in your `~/.xsession).
Should be fixed now, sorry for that.
Index: Makefile
===
RCS file: /cvs/ports/x11/pmenu/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Mar 2022 20:16:55 - 1.3
+++ Makefile25 Jul 2023 17:15:52 -
@@ -2,19 +2,16 @@ COMMENT = contextual radial menu for X11
GH_ACCOUNT = phillbush
GH_PROJECT = pmenu
-GH_TAGNAME = v2.2.0
-REVISION = 0
+GH_TAGNAME = v3.1.1
CATEGORIES = x11
-MAINTAINER = Jerome Kasper
-
-HOMEPAGE = https://github.com/phillbush/pmenu
+MAINTAINER = Lucas de Sena
# MIT
PERMIT_PACKAGE =Yes
-WANTLIB += Imlib2 X11 Xext Xft Xinerama Xrender c fontconfig m
+WANTLIB += Imlib2 X11 Xext Xft Xinerama Xrender c fontconfig m
LIB_DEPENDS = graphics/imlib2
@@ -22,14 +19,8 @@ DEBUG_PACKAGES =${BUILD_PACKAGES}
NO_TEST = Yes
-MAKE_FLAGS = FREETYPEINC=${X11BASE}/include/freetype2 \
- MANPREFIX=${PREFIX}/man
-
-# ${WRKSRC}/config.mk ignores the environment, i.e. it should append to
-# (`+=') not set (`=') variables.
-# XXX CPPFLAGS is empty added to the end; abuse it to avoid patches and pass
-# CFLAGS such that DEBUG is honoured as required for DEBUG_PACKAGES to work.
-MAKE_FLAGS += CPPFLAGS='${CFLAGS}'
+MAKE_FLAGS = MANPREFIX=${PREFIX}/man \
+ PREFIX=${PREFIX}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pmenu
Index: distinfo
===
RCS file: /cvs/ports/x11/pmenu/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Mar 2021 22:46:21 - 1.1.1.1
+++ distinfo25 Jul 2023 17:15:52 -
@@ -1,2 +1,2 @@
-SHA256 (pmenu-2.2.0.tar.gz) = KuvF+FfxyVb6W4qnpclN3cMiOY+iUvRyiy2KCDlMOIw=
-SIZE (pmenu-2.2.0.tar.gz) = 15264
+SHA256 (pmenu-3.1.1.tar.gz) = 8bcMKOnv1Ky7hTWLFSL4yEplHxjzudcVjMwJvgOPvVc=
+SIZE (pmenu-3.1.1.tar.gz) = 25414
Re: web-eid-app-chrome: support iridium
On Tue, Jul 25, 2023 at 04:42:10PM +, Klemens Nanni wrote:
> After one of the recent www/iridum updates, the extension/native host now
> works there just like it does with www/chromium.
>
> Is this the right way to depend on either chromium or iridium?
> The way I understand this: use either iridium-* or chromium-* if installed,
> otherwise install www/chromium to satisfy the runtime dependency.
Not in practise, as I can't uninstall chromium when iridium is
installed:
$ pkg_info -S
Information for inst:web-eid-chrome-2.3.1p0
Signature:
web-eid-chrome-2.3.1p0,10,@chromium-115.0.5790.102,@web-eid-native-2.3.1p0
Mark, I checked packages-specs(7) and looked for other ports with
variant dependencies, but they use the same stemA-*|stemB-*:pkgpathA
pattern... can you tell me how this is supposed to work?
>
> diff --git a/security/web-eid-app/Makefile b/security/web-eid-app/Makefile
> index e0802355391..0f689e15ae4 100644
> --- a/security/web-eid-app/Makefile
> +++ b/security/web-eid-app/Makefile
> @@ -1,5 +1,5 @@
> COMMENT-main = native messaging host for Web eID browser
> extension
> -COMMENT-chrome = chromium extension
> +COMMENT-chrome = Chromium extension
> CATEGORIES = security www
>
> # open "release tarballs with bundled git submodules"
> @@ -11,6 +11,7 @@ DISTFILES = ${GH_DISTFILE}
> PKGNAME-main = ${PKGNAME:S/app/native/}
> REVISION-main = 0
> PKGNAME-chrome = ${PKGNAME:S/app/chrome/}
> +REVISION-chrome =0
>
> # TODO: firefox
> MULTI_PACKAGES = -main -chrome
> @@ -69,7 +70,7 @@ RUN_DEPENDS-main = devel/desktop-file-utils \
>
> # TODO support www/iridium and www/ungoogled-chromium as well
> RUN_DEPENDS-chrome = ${FULLPKGPATH-main} \
> - www/chromium
> + chromium-*|iridium-*:www/chromium
> LIB_DEPENDS-chrome = # empty
>
> # XXX pcsclite is detected with pkg-config, but its -I and -L are ignored
> diff --git a/security/web-eid-app/pkg/DESCR-chrome
> b/security/web-eid-app/pkg/DESCR-chrome
> index 5e214c12bc5..3233d177e58 100644
> --- a/security/web-eid-app/pkg/DESCR-chrome
> +++ b/security/web-eid-app/pkg/DESCR-chrome
> @@ -1 +1 @@
> -Configuration for the official Web eID extension for Chromium.
> +Configuration for the official Web eID extension for Chromium and Iridium.
> diff --git a/security/web-eid-app/pkg/PLIST-chrome
> b/security/web-eid-app/pkg/PLIST-chrome
> index b0465b00f2d..1f277f9fb0c 100644
> --- a/security/web-eid-app/pkg/PLIST-chrome
> +++ b/security/web-eid-app/pkg/PLIST-chrome
> @@ -1,10 +1,14 @@
> -share/doc/pkg-readmes/web-eid-chrome
> +share/doc/pkg-readmes/${PKGSTEM}
> share/google-chrome/
> share/google-chrome/extensions/
> @sample ${SYSCONFDIR}/chromium/extensions/
> +@sample ${SYSCONFDIR}/iridium/extensions/
> share/google-chrome/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
> @sample
> ${SYSCONFDIR}/chromium/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
> +@sample
> ${SYSCONFDIR}/iridium/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
> share/web-eid/
> @sample ${SYSCONFDIR}/chromium/native-messaging-hosts/
> +@sample ${SYSCONFDIR}/iridium/native-messaging-hosts/
> share/web-eid/eu.webeid.json
> @sample ${SYSCONFDIR}/chromium/native-messaging-hosts/eu.webeid.json
> +@sample ${SYSCONFDIR}/iridium/native-messaging-hosts/eu.webeid.json
> diff --git a/security/web-eid-app/pkg/README-chrome
> b/security/web-eid-app/pkg/README-chrome
> index 16010e12dd3..2abe2f39f1b 100644
> --- a/security/web-eid-app/pkg/README-chrome
> +++ b/security/web-eid-app/pkg/README-chrome
> @@ -4,7 +4,8 @@
>
> Install the official Web eID extension
>
> https://chrome.google.com/webstore/detail/ncibgoaomkmdpilpocfeponihegamlic
> -and add the following unveil rules to ${SYSCONFDIR}/chromium/unveil.main:
> +and add the following unveil rules to either of
> +${SYSCONFDIR}/{chromium,iridium}/unveil.main:
>
> # native messaging host
> /usr/local/bin r
>
web-eid-app-chrome: support iridium
After one of the recent www/iridum updates, the extension/native host now
works there just like it does with www/chromium.
Is this the right way to depend on either chromium or iridium?
The way I understand this: use either iridium-* or chromium-* if installed,
otherwise install www/chromium to satisfy the runtime dependency.
diff --git a/security/web-eid-app/Makefile b/security/web-eid-app/Makefile
index e0802355391..0f689e15ae4 100644
--- a/security/web-eid-app/Makefile
+++ b/security/web-eid-app/Makefile
@@ -1,5 +1,5 @@
COMMENT-main = native messaging host for Web eID browser extension
-COMMENT-chrome = chromium extension
+COMMENT-chrome = Chromium extension
CATEGORIES = security www
# open "release tarballs with bundled git submodules"
@@ -11,6 +11,7 @@ DISTFILES = ${GH_DISTFILE}
PKGNAME-main = ${PKGNAME:S/app/native/}
REVISION-main =0
PKGNAME-chrome = ${PKGNAME:S/app/chrome/}
+REVISION-chrome = 0
# TODO: firefox
MULTI_PACKAGES = -main -chrome
@@ -69,7 +70,7 @@ RUN_DEPENDS-main =devel/desktop-file-utils \
# TODO support www/iridium and www/ungoogled-chromium as well
RUN_DEPENDS-chrome = ${FULLPKGPATH-main} \
- www/chromium
+ chromium-*|iridium-*:www/chromium
LIB_DEPENDS-chrome = # empty
# XXX pcsclite is detected with pkg-config, but its -I and -L are ignored
diff --git a/security/web-eid-app/pkg/DESCR-chrome
b/security/web-eid-app/pkg/DESCR-chrome
index 5e214c12bc5..3233d177e58 100644
--- a/security/web-eid-app/pkg/DESCR-chrome
+++ b/security/web-eid-app/pkg/DESCR-chrome
@@ -1 +1 @@
-Configuration for the official Web eID extension for Chromium.
+Configuration for the official Web eID extension for Chromium and Iridium.
diff --git a/security/web-eid-app/pkg/PLIST-chrome
b/security/web-eid-app/pkg/PLIST-chrome
index b0465b00f2d..1f277f9fb0c 100644
--- a/security/web-eid-app/pkg/PLIST-chrome
+++ b/security/web-eid-app/pkg/PLIST-chrome
@@ -1,10 +1,14 @@
-share/doc/pkg-readmes/web-eid-chrome
+share/doc/pkg-readmes/${PKGSTEM}
share/google-chrome/
share/google-chrome/extensions/
@sample ${SYSCONFDIR}/chromium/extensions/
+@sample ${SYSCONFDIR}/iridium/extensions/
share/google-chrome/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
@sample ${SYSCONFDIR}/chromium/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
+@sample ${SYSCONFDIR}/iridium/extensions/ncibgoaomkmdpilpocfeponihegamlic.json
share/web-eid/
@sample ${SYSCONFDIR}/chromium/native-messaging-hosts/
+@sample ${SYSCONFDIR}/iridium/native-messaging-hosts/
share/web-eid/eu.webeid.json
@sample ${SYSCONFDIR}/chromium/native-messaging-hosts/eu.webeid.json
+@sample ${SYSCONFDIR}/iridium/native-messaging-hosts/eu.webeid.json
diff --git a/security/web-eid-app/pkg/README-chrome
b/security/web-eid-app/pkg/README-chrome
index 16010e12dd3..2abe2f39f1b 100644
--- a/security/web-eid-app/pkg/README-chrome
+++ b/security/web-eid-app/pkg/README-chrome
@@ -4,7 +4,8 @@
Install the official Web eID extension
https://chrome.google.com/webstore/detail/ncibgoaomkmdpilpocfeponihegamlic
-and add the following unveil rules to ${SYSCONFDIR}/chromium/unveil.main:
+and add the following unveil rules to either of
+${SYSCONFDIR}/{chromium,iridium}/unveil.main:
# native messaging host
/usr/local/bin r
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/07/25 10:14:22 Modified files: net/arp-scan : Makefile distinfo net/arp-scan/patches: patch-arp-scan_c Log message: update mac vendor file
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/07/25 10:10:54 Modified files: misc/feathernotes: Makefile distinfo misc/feathernotes/pkg: PLIST Log message: Update to feathernotes-1.1.0 Changelog: https://github.com/tsujan/FeatherNotes/releases
Re: [update] x11/pmenu
On 2023/07/25 10:50:00 -0300, Lucas de Sena wrote: > pmenu 2.2.0 -> 3.1.0 > > Changes include: bug fixes; support for motif-like 3D relief; a new font > mechanism supporting both Xft and XLFD; and manual rewritten from man(7) > to mdoc(7). > > I removed the HOMEPAGE, since it defaults to the github page. And added > myself (the program developer) as maintainer. The hack on MAKE_FLAGS is > not needed anymore. I'd CC the previous maintainer before removing them. Or just add myself to the list. (+cc jerome) > Ok? it does not work for me anymore. I get this BadValue error when trying to use it: % echo 1 | pmenu X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 53 (X_CreatePixmap) Value in failed request: 0x0 Serial number of failed request: 33 Current serial number in output stream: 41 whereas the currently packaged version (2.2.0p0) works perfectly fine.
Re: [new] games/dsda-doom
On 2023/07/25 12:06, Lucas de Sena wrote:
> On 2023-07-24, Thomas Frohwein wrote:
> > 1. There are dependencies/WANTLIBS missing:
>
> Fixed.
Missing lib: mad.2 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
Missing lib: portmidi.0 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
Missing lib: vorbis.9 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
Missing lib: vorbisfile.6 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
Missing lib: zip.4 (/usr/local/bin/dsda-doom) (NOT REACHABLE)
you need to add LIB_DEPENDS for the "NOT REACHABLE" ones, and re-run
the check to pick up the additional WANTLIB.
> > 3. What is the value of disabling fluidsynth in the Makefile? We have
> >it in ports...
>
> It needs fluidsynth 2.0, we have 1.1.9 packaged.
please add a comment explaining that.
you have this,
CONFIGURE_ENV =CFLAGS="-I${X11BASE}/include
-I${LOCALBASE}/include"
which overrides the default CFLAGS. Instead use
CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
also remove the two -DCMAKE_BUILD_TYPE lines, they are handled
by ports infrastructure.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/07/25 09:21:29 Modified files: x11/xfe: Makefile distinfo x11/xfe/patches: patch-Makefile_in patch-src_FilePanel_cpp patch-src_SearchWindow_cpp patch-src_xfedefs_h Log message: Update to xfe-1.45 News: http://roland65.free.fr/xfe/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/07/25 09:15:17 Modified files: graphics/feh : Makefile distinfo graphics/feh/patches: patch-man_feh_pre Log message: Update to feh-3.10 Changelog: https://feh.finalrewind.org/archive/3.10/
Re: [new] games/dsda-doom
On 2023-07-24, Thomas Frohwein wrote: > 1. There are dependencies/WANTLIBS missing: Fixed. > 2. I would prefer to make the use of tabs more uniform in Makefile, as >in that they start the values at about the same tab marker. Fixed. > 3. What is the value of disabling fluidsynth in the Makefile? We have >it in ports... It needs fluidsynth 2.0, we have 1.1.9 packaged. dsda-doom.tar.gz Description: application/tar-gz
Re: arm64 BTI support for mpg123
> Date: Tue, 25 Jul 2023 16:51:18 +0200 > From: Christian Weisgerber > > Christian Weisgerber: > > > Because amd64 should suffer from the same problem: > > > > fr->cpu_opts.the_dct36 = dct36_avx; > > ... > > fr->cpu_opts.the_dct36 = dct36_x86_64; > > > > dct36_avx and dct36_x86_64 are assembly routines that lack the > > endbr64 landing pad. And yet, on my IBT-enabled amd64 laptop, > > mpg123 plays just fine with both the avx and x86_64 decoders. > > I have examined the generated assembly on the calling side. There > is no "jmp *%r11" or such. Instead, calling the function pointer > goes through __llvm_retpoline_r11: > > <__llvm_retpoline_r11>: >0: e8 0b 00 00 00 callq 10 <__llvm_retpoline_r11+0x10> >5: f3 90 pause >7: 0f ae e8lfence %eax >a: e9 f6 ff ff ff jmpq 5 <__llvm_retpoline_r11+0x5> >f: cc int3 > 10: 4c 89 1c 24 mov%r11,(%rsp) > 14: c3 retq > 15: 0f ae e8lfence %eax Thanks! That means that retpolines explain why you're not seeing any crashes.
Re: arm64 BTI support for mpg123
Christian Weisgerber: > Because amd64 should suffer from the same problem: > > fr->cpu_opts.the_dct36 = dct36_avx; > ... > fr->cpu_opts.the_dct36 = dct36_x86_64; > > dct36_avx and dct36_x86_64 are assembly routines that lack the > endbr64 landing pad. And yet, on my IBT-enabled amd64 laptop, > mpg123 plays just fine with both the avx and x86_64 decoders. I have examined the generated assembly on the calling side. There is no "jmp *%r11" or such. Instead, calling the function pointer goes through __llvm_retpoline_r11: <__llvm_retpoline_r11>: 0: e8 0b 00 00 00 callq 10 <__llvm_retpoline_r11+0x10> 5: f3 90 pause 7: 0f ae e8lfence %eax a: e9 f6 ff ff ff jmpq 5 <__llvm_retpoline_r11+0x5> f: cc int3 10: 4c 89 1c 24 mov%r11,(%rsp) 14: c3 retq 15: 0f ae e8lfence %eax -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/07/25 08:50:51 Modified files: www/chromium/patches: patch-v8_BUILD_gn patch-v8_src_execution_isolate_cc patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic_cc www/iridium/patches: patch-v8_BUILD_gn patch-v8_src_execution_isolate_cc patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic_cc www/ungoogled-chromium/patches: patch-v8_BUILD_gn patch-v8_src_execution_isolate_cc patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic_cc Log message: resurrect the lost fix for i386 that disables putting the binary blob into rodata on i386
Re: arm64 BTI support for mpg123
> From: "Theo de Raadt"
> Date: Tue, 25 Jul 2023 08:23:14 -0600
>
> Christian Weisgerber wrote:
>
> > Mark Kettenis:
> >
> > > This port has some infrastructure to use an optimized function that
> > > uses a function pointer. Not sure why for arm64 it actually uses that
> > > infrastructure, since the only alternative is the generic C
> > > implementation. But adding a BTI instruction is the easiest fix.
> >
> > ok naddy@
> >
> > The question is whether there are any others hiding in there. How
> > did you find this in the first place? It broke on the M2?
Yes, it broke on the M2. Very few people are actually running
packages on M2, so there may be more packages that are broken.
> > Because amd64 should suffer from the same problem:
> >
> > fr->cpu_opts.the_dct36 = dct36_avx;
> > ...
> > fr->cpu_opts.the_dct36 = dct36_x86_64;
> >
> > dct36_avx and dct36_x86_64 are assembly routines that lack the
> > endbr64 landing pad. And yet, on my IBT-enabled amd64 laptop,
> > mpg123 plays just fine with both the avx and x86_64 decoders.
>
> Maybe it requires specific files to go via those code paths?
>
> Ayways, how will we know all the locations? I think we will eventually
> know based upon user reports.
>
> It feels like there is a compilers or linker option missing to proactively
> identify these problems. Please don't bring up LTO.
Well, this is probably the wrong place to bring this up, but...
...the most likely reason why this doesn't break is because we enable
repolines by default. If you look at the retpoline implementation:
https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/retpoline-branch-target-injection-mitigation.html
you'll see that it replaces an indirect branch ("jmp *%rax") with a
sequence that effectively pushes the address to the stack and returns
to that address.
I'm not sure to what extent this makes IBT less effective. Can the
retpolines be used as gadgets to bypass IBT? Should we stop enabling
retpolines by default?
What *is* obvious is that retpolines are incompatible wuth shadow
stacks. Is there an alternative that doesn't replace the indirect
branch with a return instruction?
I mentioned the retpolines at some point before but I don't think the
right people saw that, so adding tech@ and guenther@.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2023/07/25 08:32:48 Modified files: databases/sqlite3-tcl: Makefile distinfo Log message: Update to 3.42.0.
Re: arm64 BTI support for mpg123
Christian Weisgerber wrote: > Mark Kettenis: > > > This port has some infrastructure to use an optimized function that > > uses a function pointer. Not sure why for arm64 it actually uses that > > infrastructure, since the only alternative is the generic C > > implementation. But adding a BTI instruction is the easiest fix. > > ok naddy@ > > The question is whether there are any others hiding in there. How > did you find this in the first place? It broke on the M2? > > Because amd64 should suffer from the same problem: > > fr->cpu_opts.the_dct36 = dct36_avx; > ... > fr->cpu_opts.the_dct36 = dct36_x86_64; > > dct36_avx and dct36_x86_64 are assembly routines that lack the > endbr64 landing pad. And yet, on my IBT-enabled amd64 laptop, > mpg123 plays just fine with both the avx and x86_64 decoders. Maybe it requires specific files to go via those code paths? Ayways, how will we know all the locations? I think we will eventually know based upon user reports. It feels like there is a compilers or linker option missing to proactively identify these problems. Please don't bring up LTO.
Re: arm64 BTI support for mpg123
Mark Kettenis: > This port has some infrastructure to use an optimized function that > uses a function pointer. Not sure why for arm64 it actually uses that > infrastructure, since the only alternative is the generic C > implementation. But adding a BTI instruction is the easiest fix. ok naddy@ The question is whether there are any others hiding in there. How did you find this in the first place? It broke on the M2? Because amd64 should suffer from the same problem: fr->cpu_opts.the_dct36 = dct36_avx; ... fr->cpu_opts.the_dct36 = dct36_x86_64; dct36_avx and dct36_x86_64 are assembly routines that lack the endbr64 landing pad. And yet, on my IBT-enabled amd64 laptop, mpg123 plays just fine with both the avx and x86_64 decoders. -- Christian "naddy" Weisgerber na...@mips.inka.de
[update] x11/pmenu
pmenu 2.2.0 -> 3.1.0
Changes include: bug fixes; support for motif-like 3D relief; a new font
mechanism supporting both Xft and XLFD; and manual rewritten from man(7)
to mdoc(7).
I removed the HOMEPAGE, since it defaults to the github page. And added
myself (the program developer) as maintainer. The hack on MAKE_FLAGS is
not needed anymore.
Ok?
Cheers,
Lucas de Sena.
Index: Makefile
===
RCS file: /cvs/ports/x11/pmenu/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Mar 2022 20:16:55 - 1.3
+++ Makefile25 Jul 2023 13:37:14 -
@@ -2,19 +2,16 @@ COMMENT = contextual radial menu for X11
GH_ACCOUNT = phillbush
GH_PROJECT = pmenu
-GH_TAGNAME = v2.2.0
-REVISION = 0
+GH_TAGNAME = v3.1.0
CATEGORIES = x11
-MAINTAINER = Jerome Kasper
-
-HOMEPAGE = https://github.com/phillbush/pmenu
+MAINTAINER = Lucas de Sena
# MIT
PERMIT_PACKAGE =Yes
-WANTLIB += Imlib2 X11 Xext Xft Xinerama Xrender c fontconfig m
+WANTLIB += Imlib2 X11 Xext Xft Xinerama Xrender c fontconfig m
LIB_DEPENDS = graphics/imlib2
@@ -22,14 +19,8 @@ DEBUG_PACKAGES =${BUILD_PACKAGES}
NO_TEST = Yes
-MAKE_FLAGS = FREETYPEINC=${X11BASE}/include/freetype2 \
- MANPREFIX=${PREFIX}/man
-
-# ${WRKSRC}/config.mk ignores the environment, i.e. it should append to
-# (`+=') not set (`=') variables.
-# XXX CPPFLAGS is empty added to the end; abuse it to avoid patches and pass
-# CFLAGS such that DEBUG is honoured as required for DEBUG_PACKAGES to work.
-MAKE_FLAGS += CPPFLAGS='${CFLAGS}'
+MAKE_FLAGS = MANPREFIX=${PREFIX}/man \
+ PREFIX=${PREFIX}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pmenu
Index: distinfo
===
RCS file: /cvs/ports/x11/pmenu/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Mar 2021 22:46:21 - 1.1.1.1
+++ distinfo25 Jul 2023 13:37:14 -
@@ -1,2 +1,2 @@
-SHA256 (pmenu-2.2.0.tar.gz) = KuvF+FfxyVb6W4qnpclN3cMiOY+iUvRyiy2KCDlMOIw=
-SIZE (pmenu-2.2.0.tar.gz) = 15264
+SHA256 (pmenu-3.1.0.tar.gz) = 5JzdEyyagHvZziAgEMby3GQJPCeWQuRn6BgfVMCjvQc=
+SIZE (pmenu-3.1.0.tar.gz) = 25401
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/07/25 05:15:24 Modified files: devel/py-virtualenv: Makefile distinfo devel/py-virtualenv/pkg: PLIST Log message: update to py3-virtualenv-20.24.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/07/25 04:58:03 Modified files: devel/py-editables: Makefile distinfo devel/py-editables/pkg: PLIST Log message: update to py3-editables-0.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/07/25 04:37:44 Modified files: www/ungoogled-chromium: Makefile www/ungoogled-chromium/patches: patch-chrome_common_chrome_paths_cc Log message: unbreak build by fixing up a wrong reverse patch
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: flor...@cvs.openbsd.org 2023/07/25 04:15:04 Modified files: net/toot : Makefile distinfo net/toot/pkg : PLIST Log message: update to 0.38.1 OK sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/07/25 03:28:56 Modified files: mail/mozilla-thunderbird: Tag: OPENBSD_7_3 Makefile distinfo Log message: mail/mozilla-thunderbird: update to 102.13.1. see https://www.thunderbird.net/en-US/thunderbird/102.13.1/releasenotes/ fixes https://www.mozilla.org/en-US/security/advisories/mfsa2023-28/ (404 for now)
update toot to 0.38.1
I want to use toot to backup my mute and block lists from cron so I
contributed code upstream. It landed in 0.38.
I've not used toot before, tests from people who actually use it would
be appreciated.
Also I'm just smashing stones together here like an animal, I've no idea
if the diff is correct. It generates a working package though...
Tests, hand holding, OKs?
diff --git Makefile Makefile
index eb0cc6c6702..9c3077c93cb 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,6 @@
COMMENT = CLI and TUI tool to interact with Mastodon instances
-MODPY_EGG_VERSION =0.36.0
+MODPY_EGG_VERSION =0.38.1
DISTNAME = toot-${MODPY_EGG_VERSION}
CATEGORIES = net
@@ -22,7 +22,8 @@ MODPY_PYTEST_ARGS = --ignore tests/test_integration.py
RUN_DEPENDS = devel/py-wcwidth${MODPY_FLAVOR} \
www/py-beautifulsoup4${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR} \
- devel/py-urwid${MODPY_FLAVOR}
+ devel/py-urwid${MODPY_FLAVOR} \
+ textproc/py-tomlkit${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-test-cov${MODPY_FLAVOR}
MAKE_ENV = LC_CTYPE=C.UTF-8
diff --git distinfo distinfo
index 3fb08220da3..c1be292334f 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (toot-0.36.0.tar.gz) = ivXz5Vr4oOdkuy13ONc3sWhVZH5Lx5R1F8zeOTKX6dg=
-SIZE (toot-0.36.0.tar.gz) = 354577
+SHA256 (toot-0.38.1.tar.gz) = vp5UeaIeqPsTz3upjVQtquB/2H+1ayC4kjtp/6UhxrI=
+SIZE (toot-0.38.1.tar.gz) = 312495
diff --git pkg/PLIST pkg/PLIST
index 88484ae0c34..18d00c9221b 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -8,9 +8,12 @@
lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}.dist-info/WHE
lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/toot-${MODPY_EGG_VERSION}.dist-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/toot/__init__.py
+lib/python${MODPY_VERSION}/site-packages/toot/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -21,6 +24,8 @@
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}config.${MODPY_PYC
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}entities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}entities.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -29,6 +34,10 @@
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}logging.${MODPY_PY
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}logging.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}output.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}typing_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}typing_compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}wcstring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/toot/${MODPY_PYCACHE}wcstring.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/toot/api.py
@@ -36,10 +45,12 @@
Re: mpv update
On 2023/07/24 08:59:31 +0100, Stuart Henderson wrote: > I spotted this one in portroach, haven't tested beyond build yet but > the patch merges are fiddly enough that I thought I'd send it out to > avoid anyone doing duplicate work. Runtime tests welcome! reads fine and works for me (mostly local videos and youtube.) Thanks!
powerpc bulk build report
Bulk build on macppc-0.ports.openbsd.org Started : Thu Jul 13 10:12:12 MDT 2023 Finished: Tue Jul 25 02:14:19 MDT 2023 Duration: 11 Days 16 hours 2 minutes Built using OpenBSD 7.3-current (GENERIC) #137: Tue Jul 11 17:20:40 MDT 2023 Built 8402 packages Number of packages built each day: Jul 13: 813 Jul 14: 663 Jul 15: 118 Jul 16: 948 Jul 17: 265 Jul 18: 251 Jul 19: 282 Jul 20: 648 Jul 21: 416 Jul 22: 329 Jul 23: 514 Jul 24: 2046 Jul 25: 1109 Critical path missing pkgs: http://build-failures.rhaalovely.net/powerpc/2023-07-13/summary.log Build failures: 14 http://build-failures.rhaalovely.net/powerpc/2023-07-13/databases/galera.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/devel/clang-tools-extra.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/devel/py-thrift,python3.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/devel/quirks.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/games/hyperrogue.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/lang/gambit.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/lang/mruby.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/lang/racket-minimal.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/mail/maildrop,-main.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/net/icinga/core2.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/sysutils/firmware/apple-boot.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/www/kiwix/libkiwix.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/www/nginx,-geoip2.log http://build-failures.rhaalovely.net/powerpc/2023-07-13/x11/gnome/librsvg.log Recurrent failures: failures/databases/galera.log failures/devel/clang-tools-extra.log failures/devel/py-thrift,python3.log failures/devel/quirks.log failures/games/hyperrogue.log failures/lang/gambit.log failures/lang/racket-minimal.log failures/www/kiwix/libkiwix.log New failures: +failures/lang/mruby.log +failures/mail/maildrop,-main.log +failures/net/icinga/core2.log +failures/sysutils/firmware/apple-boot.log +failures/www/nginx,-geoip2.log +failures/x11/gnome/librsvg.log Resolved failures: -failures/archivers/arc.log -failures/archivers/deco.log -failures/archivers/freeze.log -failures/archivers/macutil.log -failures/archivers/par1cmdline.log -failures/archivers/ripole.log -failures/archivers/unarj.log -failures/astro/ansiweather.log -failures/astro/jday.log -failures/audio/abcde.log -failures/audio/alac_decoder.log -failures/audio/checkmate.log -failures/audio/disc-cover.log -failures/audio/midish.log -failures/audio/mp3cut.log -failures/audio/p5-Audio-CD.log -failures/audio/p5-Audio-Scan.log -failures/audio/p5-Audio-Scrobbler.log -failures/audio/p5-Audio-WMA.log -failures/audio/p5-MP3-ID3v1Tag.log -failures/audio/p5-MP3-Info.log -failures/audio/p5-MP4-Info.log -failures/audio/p5-Music-Audioscrobbler-MPD.log -failures/audio/p5-Music-Audioscrobbler-Submit.log -failures/audio/p5-Ogg-Vorbis-Header-PurePerl.log -failures/audio/p5-Ogg-Vorbis-Header.log -failures/audio/p5-cddb.log -failures/audio/squeezecenter.log -failures/audio/vlorb.log -failures/benchmarks/netpipe.log -failures/benchmarks/siege.log -failures/biology/AcePerl,opt.log -failures/biology/p5-Bio-DB-EMBL.log -failures/biology/p5-Bio-Variation.log -failures/books/AsteriskTFOT.log -failures/books/clisp-hyperspec.log -failures/books/diveintopython3.log -failures/books/grokking-the-gimp.log -failures/books/progit.log -failures/books/wndw,-ar.log -failures/cad/necpp.log -failures/chinese/cless.log -failures/comms/birda.log -failures/comms/conserver,net.log -failures/comms/lrzsz.log -failures/comms/p5-Device-Gsm.log -failures/comms/p5-Device-SerialPort.log -failures/comms/picocom.log -failures/comms/qpage.log -failures/comms/sredird.log -failures/comms/zmtx-zmrx.log -failures/converters/html2text.log -failures/converters/p5-CBOR-Free.log -failures/converters/p5-Convert-Binary-C.log -failures/converters/p5-Convert-PEM.log -failures/converters/p5-Convert-UU.log -failures/converters/p5-Date-Tolkien-Shire-Data.log -failures/converters/p5-Encode-IMAPUTF7.log -failures/converters/p5-JSON-XS-VersionOneAndTwo.log -failures/converters/p5-Jcode.log -failures/converters/p5-MARC-Record.log -failures/converters/pflogx.log -failures/converters/unsf.log -failures/converters/xlhtml.log -failures/databases/p5-AsciiDB-TagFile.log -failures/databases/p5-CDB_File.log -failures/databases/p5-Catalyst-Controller-Rose.log -failures/databases/p5-Class-DBI-AsForm.log -failures/databases/p5-Class-DBI-Pager.log -failures/databases/p5-Class-DBI-Plugin-Type.log -failures/databases/p5-Class-DBI-mysql.log -failures/databases/p5-DBD-XBase.log -failures/databases/p5-DBI-Shell.log -failures/databases/p5-DBIx-Class-Cursor-Cached.log -failures/databases/p5-DBIx-Class-DynamicDefault.log -failures/databases/p5-DBIx-Class-Schema-Loader.log -failures/databases/p5-DBIx-ContextualFetch.log -failures/databases/p5-Data-Pageset.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/07/25 02:18:09 Modified files: sysutils/libvirt: Makefile Log message: Set qemu_user and qemu_group so libvirtd can properly start. It's probably useless as is but at least it starts. reported by olp_76 at yahoo dot ca with hint from sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/07/25 01:56:27 Modified files: inputmethods/ibus-typing-booster: Makefile distinfo Log message: Update to ibus-typing-booster-2.23.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/07/25 00:58:14 Modified files: print/psutils : Makefile distinfo Log message: Update to psutils-3.0.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/07/25 00:58:05 Modified files: print/py-pypdf : Makefile distinfo print/py-pypdf/pkg: PLIST Log message: Update to py3-pypdf-3.13.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/07/25 00:41:15 Modified files: graphics/libgexiv2: Makefile distinfo Removed files: graphics/libgexiv2/patches: patch-gexiv2_gexiv2-metadata-exif_cpp patch-gexiv2_gexiv2-metadata-gps_cpp patch-gexiv2_gexiv2-metadata-iptc_cpp patch-gexiv2_gexiv2-metadata-xmp_cpp patch-gexiv2_gexiv2-metadata_cpp patch-gexiv2_gexiv2-preview-image_cpp patch-gexiv2_gexiv2-stream-io_cpp patch-gexiv2_gexiv2-stream-io_h patch-gexiv2_meson_build patch-meson_build patch-test_python_test_metadata_py Log message: Update to libgexiv2-0.14.2.
