Re: UPDATE: openjp2 2.5.2
Le Sun, Mar 03, 2024 at 03:35:12PM -0500, Brad Smith a écrit : > On 2024-03-03 7:22 a.m., Landry Breuil wrote: > > Le Sat, Mar 02, 2024 at 08:41:02PM -0500, Brad Smith a écrit : > > > On Sat, Mar 02, 2024 at 06:04:23PM -0500, Brad Smith wrote: > > > > Here is an update to openjp2 2.5.2. > > > > > > > > CVE-2021-3575 > > > > > > > > > > > > ## OpenJPEG 2.5.2 (Feb 2024) > > > > > > > > * Make sure openjpeg.h includes opj_config.h > > > > [\#1514](https://github.com/uclouvain/openjpeg/issues/1514) > > > > > > > > ## OpenJPEG 2.5.1 (Feb 2024) > > > > > > > > * CMake: drop support for cmake < 3.5 > > > > * Several bugfixes, including > > > > [\#1509](https://github.com/uclouvain/openjpeg/pull/1509) for > > > > CVE-2021-3575 > > > > * Significant speed-up rate allocation by rate/distoratio ratio > > > > [\#1440](https://github.com/uclouvain/openjpeg/pull/1440) > > > An updated diff fixing the big endian patch the way upstream recommended. > > thanks, i had a similar diff for 2.5.2 which is in a bulk, i'll > > integrate the updated BE patch. do you have a link for 'the way upstream > > recommended' ? > > https://github.com/uclouvain/openjpeg/pull/1520 thanks - fwiw in my diff (attached) ive been able to drop patch-CMakeLists.txt, i dont remember what it was for but it seems now unneeded. ? openjp2-2.3.1-libopenjp2.so.3.1 ? openjp2-2.4.0-libopenjp2.so.3.1 ? openjp2-2.4.0-libopenjp2.so.4.0 ? openjp2-2.5.0-libopenjp2.so.4.0 ? openjp2-2.5.0-libopenjp2.so.5.0 ? openjp2-2.5.2-libopenjp2.so.6.0 ? patch-CMakeLists_txt ? patch-thirdparty_CMakeLists_txt Index: Makefile === RCS file: /cvs/ports/graphics/openjp2/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- Makefile28 Jun 2022 08:54:11 - 1.19 +++ Makefile4 Mar 2024 07:55:56 - @@ -2,14 +2,14 @@ GH_ACCOUNT=uclouvain GH_PROJECT=openjpeg -GH_TAGNAME=v2.5.0 +GH_TAGNAME=v2.5.2 DISTNAME= openjp2-${GH_TAGNAME:S/v//} -SHARED_LIBS += openjp2 5.0 +SHARED_LIBS += openjp2 6.0 CATEGORIES=graphics -HOMEPAGE= http://www.openjpeg.org/ +HOMEPAGE= https://www.openjpeg.org/ # BSD PERMIT_PACKAGE=Yes @@ -17,8 +17,7 @@ WANTLIB += c lcms2 m png pthread tiff z MODULES= devel/cmake -CONFIGURE_ARGS=-DOPENJPEG_INSTALL_MAN_DIR=man \ - -DOPJ_DATA_ROOT=${WRKDIR}/data \ +CONFIGURE_ARGS=-DOPJ_DATA_ROOT=${WRKDIR}/data \ -DBUILD_TESTING=True LIB_DEPENDS= graphics/lcms2 \ Index: distinfo === RCS file: /cvs/ports/graphics/openjp2/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- distinfo28 Jun 2022 08:54:11 - 1.9 +++ distinfo4 Mar 2024 07:55:56 - @@ -1,2 +1,2 @@ -SHA256 (openjp2-2.5.0.tar.gz) = AzOAbWrezG96kSQ7K4Of9NIFOCNjTU9u16WbyHQJEio= -SIZE (openjp2-2.5.0.tar.gz) = 1867111 +SHA256 (openjp2-2.5.2.tar.gz) = kOOJb+2RDDdqr3nN2Yvf2vmMZHLv2OHevwqFSTjL2mo= +SIZE (openjp2-2.5.2.tar.gz) = 1871948 Index: patches/patch-CMakeLists_txt === RCS file: patches/patch-CMakeLists_txt diff -N patches/patch-CMakeLists_txt --- patches/patch-CMakeLists_txt28 Jun 2022 08:54:11 - 1.10 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -Index: CMakeLists.txt CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -109,7 +109,10 @@ endif() - option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) - - string(TOLOWER ${PROJECT_NAME} projectname) --set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") -+ -+if(NOT OPENJPEG_INSTALL_SUBDIR) -+ set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") -+endif() - - if(NOT OPENJPEG_INSTALL_BIN_DIR) - set(OPENJPEG_INSTALL_BIN_DIR "bin") Index: patches/patch-src_bin_jp2_convert_c === RCS file: /cvs/ports/graphics/openjp2/patches/patch-src_bin_jp2_convert_c,v retrieving revision 1.6 diff -u -r1.6 patch-src_bin_jp2_convert_c --- patches/patch-src_bin_jp2_convert_c 28 Jun 2022 08:54:11 - 1.6 +++ patches/patch-src_bin_jp2_convert_c 4 Mar 2024 07:55:56 - @@ -1,12 +1,27 @@ +fix build on big endian + +https://github.com/uclouvain/openjpeg/pull/1520 + Index: src/bin/jp2/convert.c --- src/bin/jp2/convert.c.orig +++ src/bin/jp2/convert.c -@@ -662,7 +662,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits - return 1; - } +@@ -664,7 +664,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits --#ifdef OPJ_BIG_ENDIAN -+#if defined(OPJ_BIG_ENDIAN) && !defined(swap16) + #ifdef OPJ_BIG_ENDIAN - static INLINE OPJ_UINT16 swap16(OPJ_UINT16 x) +-static INLINE OPJ_UINT16 swap16(OPJ_UINT16 x) ++static INLINE OPJ_UINT16 opj_swap16(OPJ_UINT16 x) { + return (OPJ_UINT16)(((x & 0x00ffU) << 8
Re: [maintainer update] remind 4.2.9 -> 4.3.1 (now 4.3.2)
Am Fri, Mar 01, 2024 at 01:56:48PM +0100 schrieb Martin Ziemer: > Am Fri, Mar 01, 2024 at 10:46:02AM + schrieb Stuart Henderson: > > On 2024/03/01 11:30, Martin Ziemer wrote: > > > @@ -1,9 +1,13 @@ > > > +applications/ > > > +applications/tkremind.desktop > > .. > > > +icons/ > > > +icons/tkremind.png > > > > Wrong paths for those.. There was a new release which fixed those paths upstream. Diff below ist tested on amd64. Index: Makefile === RCS file: /cvs/ports/misc/remind/Makefile,v retrieving revision 1.70 diff -u -p -r1.70 Makefile --- Makefile5 Feb 2024 11:59:07 - 1.70 +++ Makefile1 Mar 2024 14:30:46 - @@ -1,7 +1,7 @@ COMMENT= scripting language for reminders, with a Tk front end -DISTNAME= remind-04.02.09 -PKGNAME= remind-4.2.9 +DISTNAME= remind-04.03.02 +PKGNAME= remind-4.3.2 CATEGORIES=misc @@ -31,7 +31,9 @@ RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \ devel/tcllib \ converters/p5-JSON-MaybeXS \ graphics/p5-Cairo \ - devel/p5-Pango + devel/p5-Pango \ + x11/gtk+4 \ + devel/desktop-file-utils CONFIGURE_STYLE= gnu Index: distinfo === RCS file: /cvs/ports/misc/remind/distinfo,v retrieving revision 1.39 diff -u -p -r1.39 distinfo --- distinfo5 Feb 2024 11:59:07 - 1.39 +++ distinfo1 Mar 2024 14:30:46 - @@ -1,2 +1,2 @@ -SHA256 (remind-04.02.09.tar.gz) = ZEaEYLQFpwXfp7ONsUt4I/ENqPADruooFRfdtJhrhyo= -SIZE (remind-04.02.09.tar.gz) = 515231 +SHA256 (remind-04.03.02.tar.gz) = tL5Ntb/RIoT9mKcdU1ndBo/pGwhtIsRnTV0lL6Sg1Vw= +SIZE (remind-04.03.02.tar.gz) = 523684 Index: pkg/PLIST === RCS file: /cvs/ports/misc/remind/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 13 Sep 2023 09:36:32 - 1.15 +++ pkg/PLIST 1 Mar 2024 14:30:46 - @@ -16,12 +16,15 @@ libdata/perl5/site_perl/Remind/PDF/Entry @man man/man1/tkremind.1 @man man/man3p/Remind::PDF.3p @man man/man3p/Remind::PDF::Entry.3p +share/applications/tkremind.desktop share/examples/remind/ share/examples/remind/alignment.rem share/examples/remind/ansitext share/examples/remind/astro share/examples/remind/defs.rem share/examples/remind/remind.vim +share/pixmaps/ +share/pixmaps/tkremind.png share/remind/ share/remind/ansitext.rem share/remind/holidays/ @@ -33,6 +36,7 @@ share/remind/holidays/jewish.rem share/remind/holidays/us.rem share/remind/lang/ share/remind/lang/auto.rem +share/remind/lang/ca.rem share/remind/lang/da.rem share/remind/lang/de.rem share/remind/lang/en.rem @@ -50,3 +54,5 @@ share/remind/lang/ro.rem share/remind/seasons.rem share/remind/site/ share/remind/site/README +@tag update-desktop-database +@tag gtk-update-icon-cache %D/share/icons/tkremind
Re: [MAINTAINER UPDATE] www/honk 1.2.3 -> 1.3.0
On Sat, 02 Mar 2024 at 09:20:35 -0500, Horia Racoviceanu wrote: > Upgrade to v1.3.0 > > changelog > > ### 1.3.0 Big Bonsai > > + Some performance tuning. > > + Follow .rss feeds for hashtags. > > + Easier to inline attached images. > > + Optional .json urls for activities. > > + cc, link, name, and tags fields for advanced metadata. > > + tag supported in html. > Index: Makefile > === > RCS file: /cvs/ports/www/honk/Makefile,v > diff -u -p -r1.29 Makefile > --- Makefile 27 Feb 2024 08:54:37 - 1.29 > +++ Makefile 2 Mar 2024 14:13:08 - > @@ -1,6 +1,6 @@ > COMMENT =federated status conveyance > > -DISTNAME = honk-1.2.3 > +DISTNAME = honk-1.3.0 > CATEGORIES = www > > HOMEPAGE = https://humungus.tedunangst.com/r/honk > Index: distinfo > === > RCS file: /cvs/ports/www/honk/distinfo,v > diff -u -p -r1.18 distinfo > --- distinfo 27 Feb 2024 08:54:37 - 1.18 > +++ distinfo 2 Mar 2024 14:13:08 - > @@ -1,2 +1,2 @@ > -SHA256 (honk-1.2.3.tgz) = fexremJlsTfvvEDzihNk6P92mtEOAhUGgydHtA+tHsM= > -SIZE (honk-1.2.3.tgz) = 920299 > +SHA256 (honk-1.3.0.tgz) = N6NiFvhXLQ8/oLrGV7WkYxY//A4eR6eFBpmYtpEKZeg= > +SIZE (honk-1.3.0.tgz) = 1968345 > Index: pkg/MESSAGE > === > RCS file: /cvs/ports/www/honk/pkg/MESSAGE,v > diff -u -p -r1.5 MESSAGE > --- pkg/MESSAGE 25 Jan 2024 14:30:41 - 1.5 > +++ pkg/MESSAGE 2 Mar 2024 14:13:08 - > @@ -1 +1 @@ > -The database has changed since version 1.2.0. See the pkg-readme. > +The database has changed since version 1.2.3. See the pkg-readme. > Index: pkg/README > === > RCS file: /cvs/ports/www/honk/pkg/README,v > diff -u -p -r1.10 README > --- pkg/README25 Jan 2024 14:30:41 - 1.10 > +++ pkg/README2 Mar 2024 14:13:08 - > @@ -66,7 +66,7 @@ honk$ sqlite3 blob.db vacuum > Database Upgrade > > > -If you are upgrading from a version before 1.2.0, you will need to upgrade > +If you are upgrading from a version before 1.2.3, you will need to upgrade > the database format: > > Stop the old honk process. Update to 1.3.1 OK? Index: Makefile === RCS file: /cvs/ports/www/honk/Makefile,v diff -u -p -r1.29 Makefile --- Makefile27 Feb 2024 08:54:37 - 1.29 +++ Makefile4 Mar 2024 07:43:26 - @@ -1,6 +1,6 @@ COMMENT = federated status conveyance -DISTNAME = honk-1.2.3 +DISTNAME = honk-1.3.1 CATEGORIES = www HOMEPAGE = https://humungus.tedunangst.com/r/honk Index: distinfo === RCS file: /cvs/ports/www/honk/distinfo,v diff -u -p -r1.18 distinfo --- distinfo27 Feb 2024 08:54:37 - 1.18 +++ distinfo4 Mar 2024 07:43:26 - @@ -1,2 +1,2 @@ -SHA256 (honk-1.2.3.tgz) = fexremJlsTfvvEDzihNk6P92mtEOAhUGgydHtA+tHsM= -SIZE (honk-1.2.3.tgz) = 920299 +SHA256 (honk-1.3.1.tgz) = F4Hz36nvcZv8MTh7a9Zr73kEBTS0c16Xty3T6/EzJeI= +SIZE (honk-1.3.1.tgz) = 2383830 Index: pkg/MESSAGE === RCS file: /cvs/ports/www/honk/pkg/MESSAGE,v diff -u -p -r1.5 MESSAGE --- pkg/MESSAGE 25 Jan 2024 14:30:41 - 1.5 +++ pkg/MESSAGE 4 Mar 2024 07:43:26 - @@ -1 +1 @@ -The database has changed since version 1.2.0. See the pkg-readme. +The database has changed since version 1.2.3. See the pkg-readme. Index: pkg/PLIST === RCS file: /cvs/ports/www/honk/pkg/PLIST,v diff -u -p -r1.15 PLIST --- pkg/PLIST 27 Feb 2024 08:54:37 - 1.15 +++ pkg/PLIST 4 Mar 2024 07:43:26 - @@ -27,6 +27,9 @@ share/doc/honk/activitypub.7.html @sample ${LOCALSTATEDIR}/honk/docs/activitypub.7.html share/doc/honk/changelog.txt share/doc/honk/encrypted-messages.txt +share/doc/honk/filter.png +share/doc/honk/filtermemes.png +share/doc/honk/followhonk.png share/doc/honk/hfcs.1.html @sample ${LOCALSTATEDIR}/honk/docs/hfcs.1.html share/doc/honk/honk.1.html @@ -48,6 +51,8 @@ share/doc/honk/screenshot-compose.png @sample ${LOCALSTATEDIR}/honk/docs/screenshot-compose.png share/doc/honk/screenshot-honk.png @sample ${LOCALSTATEDIR}/honk/docs/screenshot-honk.png +share/doc/honk/tagcombo.png +share/doc/honk/tagrss.png share/doc/honk/toys/ share/doc/honk/toys/README share/doc/honk/vim.3.html Index: pkg/README === RCS file: /cvs/ports/www/honk/pkg/README,v diff -u -p -r1.10 README --- pkg/README 25 Jan 2024 14:30:41 - 1.10 +++ pkg/README 4 Mar 2024 07:43:26 - @@ -66,7 +66,7 @@ honk$ sqlite3 blob.db vacuum Database U
Re: [update] games/stone-soup to 0.31.0
Two issues mentioned inline. On Sat, Mar 02, 2024 at 05:43:38PM -0500, Stefan Moran wrote: > Update games/stone-soup from 0.30.1 to 0.31.0 "The Alchemy of Forms". I > tried to simplify the Makefile patch a bit, and also installed the > included .desktop file, which was not being installed for some reason. > > OK? > > Index: Makefile > === > RCS file: /cvs/ports/games/stone-soup/Makefile,v > retrieving revision 1.47 > diff -u -p -r1.47 Makefile > --- Makefile 12 Nov 2023 14:03:31 - 1.47 > +++ Makefile 2 Mar 2024 22:30:23 - > @@ -2,7 +2,8 @@ BROKEN-hppa = ICE on dgn-shoals.cc:638 > > COMMENT =dungeon crawl stone soup > > -VERSION =0.30.1 > +VERSION =0.31.0 > +TAGNAME =The Alchemy of Forms > > DISTNAME=stone_soup-${VERSION}-nodeps > PKGNAME= stone-soup-${VERSION} > @@ -18,6 +19,7 @@ PERMIT_PACKAGE= Yes > > WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c m sqlite3 > > +# Failover to github, devs are on and off about providing source on > develz.org. > SITES = https://crawl.develz.org/release/${VERSION:R}/ \ > https://github.com/crawl/crawl/releases/download/${VERSION}/ The DISTNAME would be different at crawl.develz.org, meaning it can't download anything from there. I don't know if we have a mechnism for multiple SITES with different distfiles, but cleanest solution I see is using just github distfiles for now. > EXTRACT_SUFX=.tar.xz > @@ -41,13 +43,15 @@ MAKE_FLAGS = CC="${CC}" GCC="${GCC}" GX > INSTALL_UGRP=root:wheel \ > prefix=${PREFIX} \ > SAVEDIR="~/.crawl" \ > - NO_YACC=1 V=1 > + NO_YACC=1 V=1 \ > + SRC_VERSION=${VERSION} RECENT_TAG="${TAGNAME}" > > USE_GMAKE = Yes > CONFIGURE_STYLE = none > > MODPY_RUN_DEPENDS = No > -MODPY_ADJ_FILES = util/species-gen.py > +MODPY_ADJ_FILES =util/species-gen.py \ > + util/tag-35-upgrade.py > > FLAVORS =no_x11 > FLAVOR ?= > @@ -62,7 +66,7 @@ CXXFLAGS += -DUSE_TILE > > MAKE_FLAGS +=TILES=y \ > LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \ > - -lSDL2 -lSDL2_image -lpng -pthread" > + -lSDL2 -lSDL2_image -lpng -pthread" > WANTLIB += GL GLU SDL2 SDL2_image freetype png pthread z > RUN_DEPENDS =devel/desktop-file-utils > LIB_DEPENDS += devel/sdl2 \ > @@ -85,12 +89,11 @@ post-install: > ${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6 > .if ! ${FLAVOR:Mno_x11} > ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${PREFIX}/share/applications > + ${INSTALL_DATA} ${FILESDIR}/stone-soup.desktop \ > + ${PREFIX}/share/applications > ${INSTALL_DATA} \ > ${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \ > ${PREFIX}/share/pixmaps/stone-soup.png > - ${INSTALL_DATA} \ > - ${WRKDIST}/source/xdg-data/org.develz.Crawl_tiles.desktop \ > - ${PREFIX}/share/applications > .endif > > .include > Index: distinfo > === > RCS file: /cvs/ports/games/stone-soup/distinfo,v > retrieving revision 1.9 > diff -u -p -r1.9 distinfo > --- distinfo 12 Nov 2023 14:03:31 - 1.9 > +++ distinfo 2 Mar 2024 22:30:23 - > @@ -1,2 +1,2 @@ > -SHA256 (stone_soup-0.30.1-nodeps.tar.xz) = > kG03bvgAH7+fegUkUDD2T5MAxs44VdL43IHNjUjvCkY= > -SIZE (stone_soup-0.30.1-nodeps.tar.xz) = 18901720 > +SHA256 (stone_soup-0.31.0-nodeps.tar.xz) = > FPIEAmlYt6U8CJizwsxp33Qx+qtbrDG3xVfOSSEJvgs= > +SIZE (stone_soup-0.31.0-nodeps.tar.xz) = 19577424 > Index: patches/patch-source_Makefile > === > RCS file: /cvs/ports/games/stone-soup/patches/patch-source_Makefile,v > retrieving revision 1.9 > diff -u -p -r1.9 patch-source_Makefile > --- patches/patch-source_Makefile 12 Nov 2023 14:03:31 - 1.9 > +++ patches/patch-source_Makefile 2 Mar 2024 22:30:23 - > @@ -1,29 +1,7 @@ > Index: source/Makefile > --- source/Makefile.orig > +++ source/Makefile > -@@ -262,9 +262,6 @@ ifdef msys > - BUILD_LIBPNG = YesPlease > - COPY_FONTS = yes > - endif > --ifeq ($(shell gcc -v -static -static-libstdc++ 2>&1 | grep > 'unrecognized option'),) > --EXTRA_LIBS += -static -static-libgcc -static-libstdc++ > --endif > - endif > - ifeq ($(uname_S),Darwin) > - ifdef MAC_TARGET > -@@ -374,11 +371,8 @@ endif > - # > - ifndef NO_APPLE_PLATFORM > - ifeq ($(uname_S),Darwin) > --ifneq ($(shell gcc -v 2>&1 | grep Apple),) > --APPLE_PLATFORM = YesPlease > - endif > - endif > --endif > - > - > - ifdef WIN32 > -@@ -509,15 +503,7 @@ ifneq ($(GCC_VER),) > +@@ -509,15 +509,7 @@ ifneq ($(GCC_VER),) > GCC_VER_SUFFIX:=-$(GCC_VER) > endif > > @@ -39,7 +17,7 @@ Index: source/Makefile > > ifneq ($(FO
powerpc bulk build report
Bulk build on macppc-0.ports.openbsd.org Started : Wed Feb 7 11:50:11 MST 2024 Finished: Sun Mar 3 20:36:56 MST 2024 Duration: 25 Days 8 hours 47 minutes Built using OpenBSD 7.4-current (GENERIC) #209: Tue Feb 6 00:45:35 MST 2024 Built 10093 packages Number of packages built each day: Feb 7: 622 Feb 8: 136 Feb 9: 231 Feb 10: 458 Feb 11: 548 Feb 12: 301 Feb 13: 132 Feb 14: 341 Feb 15: 366 Feb 16: 272 Feb 17: 109 Feb 18: 227 Feb 19: 194 Feb 20: 218 Feb 21: 183 Feb 22: 163 Feb 23: 291 Feb 24: 281 Feb 25: 307 Feb 26: 350 Feb 27: 264 Feb 28: 282 Feb 29: 304 Mar 1: 444 Mar 2: 284 Mar 3: 2785 Critical path missing pkgs: http://build-failures.rhaalovely.net/powerpc/2024-02-07/summary.log Build failures: 27 http://build-failures.rhaalovely.net/powerpc/2024-02-07/devel/appstream.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/devel/py-thrift,python3.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/devel/qcoro.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/emulators/desmume.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/emulators/retroarch.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/games/cataclysm-dda,no_x11.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/games/gnukem.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/games/hyperrogue.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/games/nanosaur2.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/games/nblood.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/games/widelands.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/graphics/gegl04.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/graphics/openimageio.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/lang/compcert.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/lang/gambit.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/lang/racket-minimal.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/lang/seed7.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/math/lean.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/security/distorm3.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/sysutils/u-boot/rk356x.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/sysutils/u-boot/rk3588.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/wayland/swayimg.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/www/kiwix/libkiwix.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/www/webkitgtk4,webkitgtk41.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/x11/jgmenu.log http://build-failures.rhaalovely.net/powerpc/2024-02-07/x11/qt6/qtquick3dphysics.log Recurrent failures: failures/devel/appstream.log failures/devel/py-thrift,python3.log failures/devel/py-unicorn,python3.log failures/games/cataclysm-dda,no_x11.log failures/games/gnukem.log failures/games/hyperrogue.log failures/games/nblood.log failures/games/widelands.log failures/graphics/gegl04.log failures/sysutils/u-boot/rk3588.log failures/wayland/swayimg.log failures/www/kiwix/libkiwix.log failures/www/webkitgtk4,webkitgtk41.log failures/x11/jgmenu.log failures/x11/qt6/qtquick3dphysics.log New failures: +failures/games/nanosaur2.log Resolved failures: -failures/databases/galera.log -failures/www/sogo.log Packages newly built: +archivers/heatshrink +databases/galera +devel/c2ffi +devel/immer +devel/lager +devel/libbgcode +devel/llvm/17 +devel/llvm/17,-lldb +devel/llvm/17,-main +devel/llvm/17,-python +devel/meson-python +devel/py-pyproject-metadata,python3 +devel/py-transitions,python3 +devel/py-unique-log-filter,python3 +devel/zug +games/bugdom +games/bugdom2 +games/cromagrally +games/fna/faudio +games/fna/fna3d +games/ottomatic +games/yquake2 +graphics/py-bdfparser,python3 +lang/lucee/v5 +mail/claws-mail +mail/claws-mail, +mail/claws-mail,,-bogofilter +mail/claws-mail,,-main +mail/claws-mail,,-pdfviewer +mail/claws-mail,,-spamassassin +mail/claws-mail,-bogofilter +mail/claws-mail,-main +mail/claws-mail,-pdfviewer +mail/claws-mail,-spamassassin +mail/claws-mail,ldap +mail/claws-mail,ldap,-bogofilter +mail/claws-mail,ldap,-main +mail/claws-mail,ldap,-pdfviewer +mail/claws-mail,ldap,-spamassassin +mail/grommunio/dav +mail/grommunio/gromox +mail/grommunio/gromox,-main +mail/grommunio/gromox,-mapi +mail/grommunio/sync +net/dleyna +net/fort +net/gssdp +net/gupnp/core +net/gupnp/dlna +net/gupnp/igd +net/gupnp/tools +net/irctk +net/libnice +sysutils/firmware/qwx +textproc/py-yamlordereddictloader,python3 +www/sogo Packages not built this time: -audio/faudio -databases/ruby-hiera3,ruby31 -databases/ruby-hiera3,ruby33 -devel/ruby-deep_merge,ruby31 -devel/ruby-deep_merge,ruby33 -graphics/fna3d -mail/trojita
Re: Foliate not working
On Mon, Mar 04, 2024 at 01:42:08AM +, Chris Narkiewicz wrote: > I'm trying to open ebook using foliate, but it fails to open it. In haste I forgot to post version. OpenBSD 7.4, stable package. Best regards, Chris Narkiewicz
Foliate not working
I'm trying to open ebook using foliate, but it fails to open it. Here is the stdout/stderr output: foliate dict: unknown option -- formatted dict 1.9.15/rf on OpenBSD 7.4 Copyright 1997-2002 Rickard E. Faith (fa...@dict.org) Usage: dict [options] [word] Query a dictd server for the definition of a word -h --host specify server -p --portspecify port -d --database select a database to search -m --matchmatch instead of define -s --strategy strategy for matching or defining -c --config specify configuration file -C --nocorrectdisable attempted spelling correction -D --dbs show available databases -S --strats show available search strategies -H --serverhelp show server help -i --info show information about a database -I --serverinfo show information about the server -a --noauth disable authentication -u --user username for authentication -k --key shared secret for authentication -V --version display version information -L --license display copyright and license information --help display this help -v --verbose be verbose -r --raw trace raw transaction -P --pager programspecify program to use as pager (- for none) --debug set debugging flag --pipesize specify buffer size for pipelining (256) --client additional text for client command WARNING: Kernel has no file descriptor comparison support: Resource temporarily unavailable WARNING: Kernel has no file descriptor comparison support: Operation not supported by device (com.github.johnfactotum.Foliate:33648): Gjs-WARNING **: 01:33:26.836: JS ERROR: Error: Empty Response _init/<@resource:///com/github/johnfactotum/Foliate/js/epubView.js:623:57 _handleAction@resource:///com/github/johnfactotum/Foliate/js/epubView.js:886:22 _init/<@resource:///com/github/johnfactotum/Foliate/js/epubView.js:617:18 main@resource:///com/github/johnfactotum/Foliate/js/main.js:478:24 run@resource:///org/gnome/gjs/modules/script/package.js:206:19 @/usr/local/bin/foliate:9:17 I can see 2 issues here. 1. it calls dict with some long option and fails with goofy stdout output. 2. there is some JS issue when loading a book 3. some kernel warning messages, not sure what to think about it I'm wondering if this is a known issue? Related to epub content? The book in question is ADP 6-0 https://armypubs.army.mil/ProductMaps/PubForm/Details.aspx?PUB_ID=1007502 in epub format. I'd be grateful for any advise. Cheers, Chris
Re: UPDATE: openimageio 2.4.17.0
I forgot to mention. CVE-2023-36183, CVE-2023-42295 On 2024-02-28 9:25 p.m., Brad Smith wrote: Here is an update to OpenImageIO 2.4.17.0. https://raw.githubusercontent.com/AcademySoftwareFoundation/OpenImageIO/dev-2.4/CHANGES.md Index: Makefile === RCS file: /cvs/ports/graphics/openimageio/Makefile,v retrieving revision 1.68 diff -u -p -u -p -r1.68 Makefile --- Makefile1 Sep 2023 15:20:14 - 1.68 +++ Makefile29 Feb 2024 02:06:22 - @@ -3,21 +3,22 @@ COMMENT = library for reading and writing images +V = 2.4.17.0 +DISTNAME = openimageio-${V} GH_ACCOUNT = OpenImageIO GH_PROJECT = oiio GH_TAGNAME = v$V -V =2.4.11.0 -DISTNAME = openimageio-${V} -REVISION = 0 -SHARED_LIBS += OpenImageIO 13.0 # 2.4.10 -SHARED_LIBS += OpenImageIO_Util8.0 # 2.4.10 +WRKDIST = ${WRKDIR}/${GH_ACCOUNT}-${GH_TAGNAME:C/^[vV]([0-9])/\1/} + +SHARED_LIBS += OpenImageIO 14.0 # 2.4.10 +SHARED_LIBS += OpenImageIO_Util9.0 # 2.4.10 CATEGORIES = graphics devel HOMEPAGE = https://sites.google.com/site/openimageio/home -# BSD +# Apache 2.0 / BSD PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} GL GLU Iex-3_2 IlmThread-3_2 Imath-3_1 Index: distinfo === RCS file: /cvs/ports/graphics/openimageio/distinfo,v retrieving revision 1.18 diff -u -p -u -p -r1.18 distinfo --- distinfo14 May 2023 12:40:05 - 1.18 +++ distinfo29 Feb 2024 02:06:22 - @@ -1,2 +1,2 @@ -SHA256 (openimageio-2.4.11.0.tar.gz) = UTkLPnIiiS6H65KdInu7W5vp9787RyKakdKxBuv/s/s= -SIZE (openimageio-2.4.11.0.tar.gz) = 32158503 +SHA256 (openimageio-2.4.17.0.tar.gz) = f+gdjlvOMMxKIS8CCsPMQ0Tmt8HAhCR146BIUVCZxlw= +SIZE (openimageio-2.4.17.0.tar.gz) = 47900800
Re: UPDATE: aom 3.8.1
On Sun, Mar 03, 2024 at 04:26:14PM +0100, Peter Hessler wrote: > This fails to build for me on arm64: > > ===> Configuring for aom-3.8.1 > -- The C compiler identification is Clang 16.0.6 > -- The CXX compiler identification is Clang 16.0.6 > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Check for working C compiler: /usr/obj/ports/aom-3.8.1/bin/cc - skipped > -- Detecting C compile features > -- Detecting C compile features - done > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: /usr/obj/ports/aom-3.8.1/bin/c++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- Performing Test CMAKE_HAVE_LIBC_PTHREAD > -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed > -- Looking for pthread_create in pthreads > -- Looking for pthread_create in pthreads - not found > -- Looking for pthread_create in pthread > -- Looking for pthread_create in pthread - found > -- Found Threads: TRUE > --- aom_configure: Detected CPU: arm64 > -- The ASM compiler identification is unknown > -- Found assembler: as > CMake Error at build/cmake/aom_configure.cmake:212 (enable_language): > The CMAKE_ASM_COMPILER: > > as > > is not a full path and was not found in the PATH. > > Tell CMake where to find the compiler by setting either the environment > variable "ASM" or the CMake cache entry CMAKE_ASM_COMPILER to the full path > to the compiler, or to the compiler name if it is in the PATH. > Call Stack (most recent call first): > CMakeLists.txt:73 (include) > > > -- Warning: Did not find file Compiler/-ASM > -- Configuring incomplete, errors occurred! > > > note that there is no "as" or "llvm-as" binary on arm64. Try the following. Index: patches/patch-build_cmake_aom_configure_cmake === RCS file: patches/patch-build_cmake_aom_configure_cmake diff -N patches/patch-build_cmake_aom_configure_cmake --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-build_cmake_aom_configure_cmake 3 Mar 2024 21:29:37 - @@ -0,0 +1,16 @@ +ARM uses compiler intrinsics, so don't require GNU as. + +Index: build/cmake/aom_configure.cmake +--- build/cmake/aom_configure.cmake.orig build/cmake/aom_configure.cmake +@@ -192,6 +192,10 @@ elseif(AOM_TARGET_CPU MATCHES "arm") + if(NOT CMAKE_ASM_COMPILER) + set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} -c -mimplicit-it=always) + endif() ++ elseif(AOM_TARGET_SYSTEM STREQUAL "OpenBSD") ++if(NOT CMAKE_ASM_COMPILER) ++ set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) ++endif() + else() + if(NOT CMAKE_ASM_COMPILER) + set(CMAKE_ASM_COMPILER as)
Slowing down for the release; testing
The OpenBSD 7.5 release is quickly approaching and it's time to slow down work on the ports tree. There are no formal restrictions yet, but please refrain from commits that run the risk of introducing breakage in the tree. If you break something now, little time will remain to fix it. Also, if people don't want to find out after the release that their favorite application is broken, now is the time to test the latest packages. In particular, OpenBSD is leading the curve by enforcing indirect branch tracking (IBT) on 11th generation and later Intel CPUs. We have tried to adapt all ports one way or another, but it's possible something slipped through and will die with SIGILL at runtime. Please test. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: x11/gnustep/libobjc2 failed to build
On 2024/03/03 20:52, Stuart Henderson wrote: > On 2024/03/03 20:31, Sebastian Reitenbach wrote: > > If I understand removing the @pkgpath fixed the bigger part of the issue? PS "bigger part of the issue" = "bulk builds were breaking because the dependency loop resulted in too much disk space being eatern" but the remaining problem is still fairly important.
Re: x11/gnustep/libobjc2 failed to build
On 2024/03/03 20:31, Sebastian Reitenbach wrote: > On Sunday, March 03, 2024 13:32 CET, Stuart Henderson > wrote: > > > On 2024/03/03 10:38, Antoine Jacoutot wrote: > > > Probably because devel/libdispatch has: > > > @conflict gnustep-libobjc2-* > > > @pkgpath x11/gnustep/libobjc2 > > > > > > and x11/gnustep/libobjc2 has: > > > @conflict libdispatch-* > > > @pkgpath devel/libdispatch > > > > > > That does not make much sense... > > > > > > > > > and now my dpb got stuck in loops > > > > I've removed the incorrect @pkgpath markers fixing the worst of the > > issues, but there is still a problem. > > > > We can't have two ports which are used as build dependencies of other > > ports having @conflicts between themselves. > > > > This will need to be resolved rather than just marking the conflict. > > > > I'm sorry for the mess I created. I intended to get it in quickly, due to the > endbr64 fixes work. As the version in tree is very old, and the just recently > released 2.2 finally builds and doesn't show runtime errors in apps linked > against it. > > The only port that depends on libobjc2, that had a dependency to libdispatch > was x11/gnustep/base, but that one I "fixed", not depending on libdispatch > anymore. > gnustep-base-1.29.0 REVISION 1 should not depend on libdispatch anymore. > > If I understand removing the @pkgpath fixed the bigger part of the issue? > That there is a conflict with libdispatch, is already known for upstream. > > Sebastian > Other ports in the tree depend on libdispatch. If a machine has built a port which depends on libobjc2 it can then not build a port which depends on libdispatch, and vice-versa, until the conflicting port has been uninstalled. Unneeded packages *are* often removed periodically during a build, but there's no control of when that happens, and it cannot happen if a port with "DPB_PROPERTIES=nojunk" is built. (And, if a "nojunk" port starts building and fails, there will be no more periodic junking on that machine at all without manual intervention, so if either conflicting package is installed at the time, any ports depending on the other conflicting package will fail on that build machine).
Re: UPDATE: openjp2 2.5.2
On 2024-03-03 7:22 a.m., Landry Breuil wrote: Le Sat, Mar 02, 2024 at 08:41:02PM -0500, Brad Smith a écrit : On Sat, Mar 02, 2024 at 06:04:23PM -0500, Brad Smith wrote: Here is an update to openjp2 2.5.2. CVE-2021-3575 ## OpenJPEG 2.5.2 (Feb 2024) * Make sure openjpeg.h includes opj_config.h [\#1514](https://github.com/uclouvain/openjpeg/issues/1514) ## OpenJPEG 2.5.1 (Feb 2024) * CMake: drop support for cmake < 3.5 * Several bugfixes, including [\#1509](https://github.com/uclouvain/openjpeg/pull/1509) for CVE-2021-3575 * Significant speed-up rate allocation by rate/distoratio ratio [\#1440](https://github.com/uclouvain/openjpeg/pull/1440) An updated diff fixing the big endian patch the way upstream recommended. thanks, i had a similar diff for 2.5.2 which is in a bulk, i'll integrate the updated BE patch. do you have a link for 'the way upstream recommended' ? https://github.com/uclouvain/openjpeg/pull/1520
UPDATE security/vaultwarden-1.30.5 and www/vaultwarden-web-2024.1.2b
Simple diff for updating vaultwarden to 1.30.5 and vaultwarden-web to 2024.1.2b. Changelog: https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.4 https://github.com/dani-garcia/vaultwarden/releases/tag/1.30.5 https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.1.2b Run tested on amd64. OK? diff --git security/vaultwarden/Makefile security/vaultwarden/Makefile index c41d70343f6..477158080cd 100644 --- security/vaultwarden/Makefile +++ security/vaultwarden/Makefile @@ -5,7 +5,7 @@ BROKEN-i386 = raw-cpuid-10.2.0/src/lib.rs:80:37 "could not find `arch` in `self COMMENT = unofficial bitwarden compatible server -DIST_TUPLE = github dani-garcia vaultwarden 1.30.3 . +DIST_TUPLE = github dani-garcia vaultwarden 1.30.5 . CATEGORIES = security diff --git security/vaultwarden/crates.inc security/vaultwarden/crates.inc index 7718075f069..4fb9bad62d3 100644 --- security/vaultwarden/crates.inc +++ security/vaultwarden/crates.inc @@ -1,6 +1,6 @@ MODCARGO_CRATES += addr2line 0.21.0 # Apache-2.0 OR MIT MODCARGO_CRATES += adler 1.0.2 # 0BSD OR MIT OR Apache-2.0 -MODCARGO_CRATES += ahash 0.8.7 # MIT OR Apache-2.0 +MODCARGO_CRATES += ahash 0.8.9 # MIT OR Apache-2.0 MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT MODCARGO_CRATES += alloc-no-stdlib 2.0.4 # BSD-3-Clause MODCARGO_CRATES += alloc-stdlib0.2.2 # BSD-3-Clause @@ -9,12 +9,12 @@ MODCARGO_CRATES +=android-tzdata 0.1.1 # MIT OR Apache-2.0 MODCARGO_CRATES += android_system_properties 0.1.5 # MIT/Apache-2.0 MODCARGO_CRATES += argon2 0.5.3 # MIT OR Apache-2.0 MODCARGO_CRATES += async-channel 1.9.0 # Apache-2.0 OR MIT -MODCARGO_CRATES += async-channel 2.1.1 # Apache-2.0 OR MIT +MODCARGO_CRATES += async-channel 2.2.0 # Apache-2.0 OR MIT MODCARGO_CRATES += async-compression 0.4.6 # MIT OR Apache-2.0 MODCARGO_CRATES += async-executor 1.8.0 # Apache-2.0 OR MIT MODCARGO_CRATES += async-global-executor 2.4.1 # Apache-2.0 OR MIT MODCARGO_CRATES += async-io1.13.0 # Apache-2.0 OR MIT -MODCARGO_CRATES += async-io2.3.0 # Apache-2.0 OR MIT +MODCARGO_CRATES += async-io2.3.1 # Apache-2.0 OR MIT MODCARGO_CRATES += async-lock 2.8.0 # Apache-2.0 OR MIT MODCARGO_CRATES += async-lock 3.3.0 # Apache-2.0 OR MIT MODCARGO_CRATES += async-process 1.8.1 # Apache-2.0 OR MIT @@ -41,28 +41,27 @@ MODCARGO_CRATES += block-buffer0.10.4 # MIT OR Apache-2.0 MODCARGO_CRATES += blocking1.5.1 # Apache-2.0 OR MIT MODCARGO_CRATES += brotli 3.4.0 # BSD-3-Clause/MIT MODCARGO_CRATES += brotli-decompressor 2.5.1 # BSD-3-Clause/MIT -MODCARGO_CRATES += bumpalo 3.14.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += bytemuck1.14.1 # Zlib OR Apache-2.0 OR MIT +MODCARGO_CRATES += bumpalo 3.15.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += bytemuck1.14.3 # Zlib OR Apache-2.0 OR MIT MODCARGO_CRATES += byteorder 1.5.0 # Unlicense OR MIT MODCARGO_CRATES += bytes 1.5.0 # MIT MODCARGO_CRATES += cached 0.48.1 # MIT MODCARGO_CRATES += cached_proc_macro 0.19.1 # MIT MODCARGO_CRATES += cached_proc_macro_types 0.1.1 # MIT -MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0 +MODCARGO_CRATES += cc 1.0.86 # MIT OR Apache-2.0 MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0 -MODCARGO_CRATES += chrono 0.4.33 # MIT OR Apache-2.0 -MODCARGO_CRATES += chrono-tz 0.8.5 # MIT OR Apache-2.0 +MODCARGO_CRATES += chrono 0.4.34 # MIT OR Apache-2.0 +MODCARGO_CRATES += chrono-tz 0.8.6 # MIT OR Apache-2.0 MODCARGO_CRATES += chrono-tz-build 0.2.1 # MIT OR Apache-2.0 MODCARGO_CRATES += chumsky 0.9.3 # MIT MODCARGO_CRATES += concurrent-queue2.4.0 # Apache-2.0 OR MIT -MODCARGO_CRATES += cookie 0.16.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += cookie 0.17.0 # MIT OR Apache-2.0 MODCARGO_CRATES += cookie 0.18.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += cookie_store0.16.2 # MIT/Apache-2.0 -MODCARGO_CRATES += cookie_store0.19.1 # MIT/Apache-2.0 +MODCARGO_CRATES += cookie_store0.20.0 # MIT/Apache-2.0 MODCARGO_CRATES += core-foundation 0.9.4 # MIT OR Apache-2.0 MODCARGO_CRATES += core-foundation-sys 0.8.6 # MIT OR Apache-2.0 MODCARGO_CRATES += cpufeatures 0.2.12 # MIT OR Apache-2.0 -MODCARGO_CRATES += crc32fast 1.3.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += crc32fast 1.4.0 # MIT OR Apache-2.0 MODCARGO_CRATES += cron0.12.0 # MIT OR Apache-2.0 MODCARGO_CRATES += crossbeam-utils 0.8.19 # MIT OR Apache-2.0 MODCARGO_CRATES += crypto-common 0.1.6 # MIT OR Apache-2.0 @@ -83,7 +82,7 @@ MODCARGO_CRATES +=diesel_migrations 2.1.0 #
Re: net/isc-dhcpd: avoid uncontrolled grow of lease db
On Sun, 03 Mar 2024 19:12:30 +0100, Stuart Henderson wrote: > > The port doesn't really handle running v6 mode anyway (it would want a > second rc.d script with -6 in flags and a separate config file, it can't > run 4+6 in the same process) so I think talking about v6 will just add > to confusion. If someone has worked out how to set things up to use > it for DHCPv6 already I expect they can extrapolate from the existing > MESSAGE. > > I am pretty sure the two daemon instances will conflict if they use the > same lease database. > > For now I'll commit what I have with the fixed path in > patch-contrib_dhcp-lease-list_pl > Ah, now I see why have you used different lease files. Make sense. Thanks! -- wbr, Kirill
Re: UPDATE: aom 3.8.1
Stuart Henderson writes: > On 2024/03/03 16:26, Peter Hessler wrote: >> --- aom_configure: Detected CPU: arm64 >> -- The ASM compiler identification is unknown >> -- Found assembler: as >> CMake Error at build/cmake/aom_configure.cmake:212 (enable_language): >> The CMAKE_ASM_COMPILER: >> >> as >> >> is not a full path and was not found in the PATH. [...] > It could possibly depend on devel/gas (there is a newer version in > devel/binutils, but other ports are depending on devel/gas and the two > conflict, so better take the one which is already used) .. Another option is to remove unused dependency from the source e.g., https://github.com/freebsd/freebsd-ports/blob/main/multimedia/aom/files/patch-build_cmake_aom__configure.cmake
Re: x11/gnustep/libobjc2 failed to build
On Sunday, March 03, 2024 13:32 CET, Stuart Henderson wrote: > On 2024/03/03 10:38, Antoine Jacoutot wrote: > > Probably because devel/libdispatch has: > > @conflict gnustep-libobjc2-* > > @pkgpath x11/gnustep/libobjc2 > > > > and x11/gnustep/libobjc2 has: > > @conflict libdispatch-* > > @pkgpath devel/libdispatch > > > > That does not make much sense... > > > > > > > and now my dpb got stuck in loops > > I've removed the incorrect @pkgpath markers fixing the worst of the > issues, but there is still a problem. > > We can't have two ports which are used as build dependencies of other > ports having @conflicts between themselves. > > This will need to be resolved rather than just marking the conflict. > I'm sorry for the mess I created. I intended to get it in quickly, due to the endbr64 fixes work. As the version in tree is very old, and the just recently released 2.2 finally builds and doesn't show runtime errors in apps linked against it. The only port that depends on libobjc2, that had a dependency to libdispatch was x11/gnustep/base, but that one I "fixed", not depending on libdispatch anymore. gnustep-base-1.29.0 REVISION 1 should not depend on libdispatch anymore. If I understand removing the @pkgpath fixed the bigger part of the issue? That there is a conflict with libdispatch, is already known for upstream. Sebastian
Re: multimedia/phonon: qt5 flavor and qt6 as default
On Sun Mar 03, 2024 at 06:00:44PM +0100, Landry Breuil wrote: > Le Sat, Mar 02, 2024 at 09:07:49PM +0100, Rafael Sadowski a écrit : > > On Sat Mar 02, 2024 at 09:44:11AM +0100, Landry Breuil wrote: > > > Le Sat, Mar 02, 2024 at 09:21:59AM +0100, Rafael Sadowski a écrit : > > > > On Fri Mar 01, 2024 at 05:59:00PM +0100, Rafael Sadowski wrote: > > > > > Based on landry@'s feedback, I think it makes sense to follow the > > > > > qt6/qt5 pattern of x11/polkit-qt here. > > > > > > > > > > I need to do a proper test with all consumers but phonon-4.12.0 > > > > > updates > > > > > to phonon-qt5-4.12.0p0 correct. > > > > > > > > > > I would be very grateful for a review! > > > > > > > > > > Rafael > > > > > > > > > > > > > $ pkg_delete -X > > > > $ pkg_add -D snap khtml > > > > $ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u -D > > > > unsigned > > > > quirks-7.10->7.12: ok > > > > gettext-runtime-0.22.4->0.22.5: ok > > > > giflib-5.2.1p0->5.2.2: ok > > > > phonon-4.12.0->phonon-qt5-4.12.0p0 forward dependencies: > > > > | Dependency of khtml-5.115.0 on phonon-* doesn't match > > > > Merging khtml-5.115.0->5.115.0p0 (ok) > > > > khtml-5.115.0+phonon-4.12.0->khtml-5.115.0p0+phonon-qt5-4.12.0p0: ok > > > > > > > > > > > > Does that looks good to you? Unfortunately we need > > > > devel/kf5/extra-cmake-modules to build both the qt5 and the qt6 part. > > > > > > i havent fully followed, but your idea is to switch the port to default > > > to qt6, and add a qt5 flavor, which previous consumers depend upon ? > > > > Right, and as you can see above, it looks like it's working. > > > > > > > > i'd have been concerned about flavors for libs causing issues/conflicts > > > with bulk builds, but if that works for polkit-qt... > > > > > > > Me too and I'm too stupid for it, but the polkit-qt looks good and > > phonon can profit from the same pattern. > > > > I would like to have this in 7.5. > > i haven't tested your diff but are you sure the timing is right ? I think this is the point where I should say: No? :D We can wait until post-ports-lock. After every snapshot I have to update all the used depends again and again. > are you confident that won't create new dependency problems once ports > start depending on it ? Hm, for -current and 7.5 everything should be as it is now. New consumers are coming with the big bang KDE6 update. Why Big Bang, because a lot of addicts have to move to Qt6. See here, see gpgme, see qca-qt6 and many more :/ A ecosystem switch to Qt6.
Re: pkg_info: fold Comment newline
On 2024/03/02 17:39:10 +, Klemens Nanni wrote: > As per Makefile.template and portcheck(1) COMMENT is <=60 chars, so it'd > fit on the same Comment: line in pkg_info(1) output -- less scrolling! > > It just stands out, imho, compared to Maintainer: and WWW: where there's > no such seemingly superfluous line break. > > Thoughts? I like it! it seems better to me to keep "Comment" and the comment text in the same line; especially since we strive to have "short" comments. However, it seems to me that this has the chance of breaking other tools. Reading this diff I've discovered the -l flag for pkg_info that is meant to aid parsing the output of pkg_info. I have no clue if this option is used anywhere, but I'd prefer not to discover it when we're this close to the release :) In particular, pkg_info -lxxx quirks will change: @@ -1,7 +1,6 @@ xxxInformation for inst:quirks-7.10 -xxxComment: -exceptions to pkg_add rules +Comment: exceptions to pkg_add rules
Re: net/isc-dhcpd: avoid uncontrolled grow of lease db
On 2024/03/03 18:32, Kirill A. Korinsky wrote: > > +-my @LEASES = ('/var/db/dhcpd.leases', '/var/lib/dhcp/dhcpd.leases', > > '/var/lib/dhcp3/dhcpd.leases'); > > ++my @LEASES = ('/var/db/dhcpd/dhcpd.leases'); > > The patch need to be updates as well. Here should be two path which you > defined in Makefile: > - /var/db/isc-dhcp/dhcpd.leases > - /var/db/isc-dhcp/dhcpd6.leases > > Unfortently it reads the first file which exists and ignores the rest. oops, I decided it should use /var/db/isc-dhcp rather than just /var/db/dhcpd but forgot to update the patch to the contrib script. (dhcpd6.leases won't be useful for this, the parser skips v6 addresses as invalid). > > ++my @OUIS = ('/usr/local/share/arp-scan/ieee-oui.txt'); > > when it should be added as dependency, should it? > > > ++ " the default is to try > > /var/db/isc-dhcpd/dhcpd.leases\n". It could be added, but it's not essential in order for the script to work (and the script isn't needed for most people running the server) so I thought I'd just adjust the warning message showing people want to run if they want vendor names. > > diff -N pkg/MESSAGE-main > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ pkg/MESSAGE-main3 Mar 2024 17:03:51 - > > @@ -0,0 +1,4 @@ > > +If updating from earlier than isc-dhcp-server-4.4.3pl1p1, move/copy old > > leases: > > +# cd /var/db/isc-dhcp; mv ../dhcpd.leases .; chown _isc_dhcp:_isc_dhcp * > > +If configuring from scratch, install an empty leases file: > > +# install -o _isc_dhcp -g _isc_dhcp /dev/null /var/db/isc-dhcp/dhcpd.leases > > Seems that dhcpd6.leases is missed here as well. > > Thus, maybe keep things simple and do not split lease for IPv4 and IPv6? I > haven't test it, but after fast look to the code [1]it seems that it should > work if mix both leases into one file. The port doesn't really handle running v6 mode anyway (it would want a second rc.d script with -6 in flags and a separate config file, it can't run 4+6 in the same process) so I think talking about v6 will just add to confusion. If someone has worked out how to set things up to use it for DHCPv6 already I expect they can extrapolate from the existing MESSAGE. I am pretty sure the two daemon instances will conflict if they use the same lease database. For now I'll commit what I have with the fixed path in patch-contrib_dhcp-lease-list_pl
Re: sysutils/docker-cli: update to 25.0.3
Greetings, On Sat, 17 Feb 2024 19:22:06 +0100, Lucas Gabriel Vuotto wrote: > > So, we agree for this latest version? buildx as an RDEP, no package name > changes. Any chance that this will be part of 7.5? I run it locally and it work quite well. -- wbr, Kirill
Re: net/isc-dhcpd: avoid uncontrolled grow of lease db
On Sun, 03 Mar 2024 18:07:17 +0100, Stuart Henderson wrote: > > I don't think there's a good way to automate the move, so probably > best to just warn people and allow startup to fail if the file is not > present (i.e. remove the "touch" from rc script). At least if dhcpd > fails to start it's more obvious and likely simpler to fix than if > it starts and hands out addresses which are different from (possibly > long-standing) leases. > > I added an install message showing people what to do and modified > the path in CONFIGURE_ARGS rather than the startup script. > I agree that it seems like the right move. > +-my @LEASES = ('/var/db/dhcpd.leases', '/var/lib/dhcp/dhcpd.leases', > '/var/lib/dhcp3/dhcpd.leases'); > ++my @LEASES = ('/var/db/dhcpd/dhcpd.leases'); The patch need to be updates as well. Here should be two path which you defined in Makefile: - /var/db/isc-dhcp/dhcpd.leases - /var/db/isc-dhcp/dhcpd6.leases Unfortently it reads the first file which exists and ignores the rest. > ++my @OUIS = ('/usr/local/share/arp-scan/ieee-oui.txt'); when it should be added as dependency, should it? > ++" the default is to try > /var/db/isc-dhcpd/dhcpd.leases\n". > + "\n"); > + exit(0); > + } elsif ($arg eq '--parsable') { > Index: pkg/MESSAGE-main > === > RCS file: pkg/MESSAGE-main > diff -N pkg/MESSAGE-main > --- /dev/null 1 Jan 1970 00:00:00 - > +++ pkg/MESSAGE-main 3 Mar 2024 17:03:51 - > @@ -0,0 +1,4 @@ > +If updating from earlier than isc-dhcp-server-4.4.3pl1p1, move/copy old > leases: > +# cd /var/db/isc-dhcp; mv ../dhcpd.leases .; chown _isc_dhcp:_isc_dhcp * > +If configuring from scratch, install an empty leases file: > +# install -o _isc_dhcp -g _isc_dhcp /dev/null /var/db/isc-dhcp/dhcpd.leases Seems that dhcpd6.leases is missed here as well. Thus, maybe keep things simple and do not split lease for IPv4 and IPv6? I haven't test it, but after fast look to the code [1]it seems that it should work if mix both leases into one file. Footnotes: [1] https://github.com/isc-projects/dhcp/blob/v4_4_2_p1/server/dhcpd.c#L577-L603 -- wbr, Kirill
Re: net/isc-dhcpd: avoid uncontrolled grow of lease db
On 2024/03/03 16:17, Kirill A. Korinsky wrote: > On Wed, 10 Jan 2024 21:21:22 +0100, > Stuart Henderson wrote: > > > > hrmmm, that doesn't make sense, if it can't write to /var/db/dhcpd.leases > > due to permissions, it shouldn't be able to write to /var/db/dhcpd.leases~ > > either.. > > > > I'll try and find some time to do a test install and figure out what's > > going on, but it won't be for a few days > > Any chance that this will be fixed in 7.5? > > -- > wbr, Kirill > I don't think there's a good way to automate the move, so probably best to just warn people and allow startup to fail if the file is not present (i.e. remove the "touch" from rc script). At least if dhcpd fails to start it's more obvious and likely simpler to fix than if it starts and hands out addresses which are different from (possibly long-standing) leases. I added an install message showing people what to do and modified the path in CONFIGURE_ARGS rather than the startup script. So how does this look.. Index: Makefile === RCS file: /cvs/ports/net/isc-dhcp/Makefile,v retrieving revision 1.66 diff -u -p -r1.66 Makefile --- Makefile27 Sep 2023 14:18:12 - 1.66 +++ Makefile3 Mar 2024 17:03:51 - @@ -3,7 +3,7 @@ COMMENT-client= ISC DHCP Client COMMENT-omapi= ISC DHCP OMAPI VERSION= 4.4.3-P1 -REVISION= 0 +REVISION= 1 DISTNAME= isc-dhcp-${VERSION} PKGNAME-main= isc-dhcp-server-${VERSION:S/-P/pl/} @@ -32,7 +32,9 @@ COMPILER_LANGS= c USE_GMAKE= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-early-chroot \ - --enable-paranoia + --enable-paranoia \ + --with-srv-lease-file=/var/db/isc-dhcp/dhcpd.leases \ + --with-srv6-lease-file=/var/db/isc-dhcp/dhcpd6.leases NO_TEST= Yes @@ -60,6 +62,8 @@ post-install: ${SETENV} ${MAKE_ENV} ${FAKE_SETUP} ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} install ${INSTALL_DATA_DIR} ${PREFIX}/${EXAMPLEDIR} ${INSTALL_SCRIPT} ${FILESDIR}/dhclient-script ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/dhcp-lease-list.pl \ + ${PREFIX}/bin/dhcp-lease-list ${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf.example \ ${PREFIX}/${EXAMPLEDIR}/dhcpd.conf ${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf.example \ Index: patches/patch-contrib_dhcp-lease-list_pl === RCS file: patches/patch-contrib_dhcp-lease-list_pl diff -N patches/patch-contrib_dhcp-lease-list_pl --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-contrib_dhcp-lease-list_pl3 Mar 2024 17:03:51 - @@ -0,0 +1,51 @@ +Index: contrib/dhcp-lease-list.pl +--- contrib/dhcp-lease-list.pl.orig contrib/dhcp-lease-list.pl +@@ -27,12 +27,11 @@ use strict; + use warnings; + use POSIX qw(strftime); + +-my @LEASES = ('/var/db/dhcpd.leases', '/var/lib/dhcp/dhcpd.leases', '/var/lib/dhcp3/dhcpd.leases'); ++my @LEASES = ('/var/db/dhcpd/dhcpd.leases'); + my @all_leases; + my @leases; + +-my @OUIS = ('/usr/share/misc/oui.txt', '/usr/local/etc/oui.txt'); +-my $OUI_URL = 'http://standards-oui.ieee.org/oui.txt'; ++my @OUIS = ('/usr/local/share/arp-scan/ieee-oui.txt'); + my $oui; + + my %data; +@@ -47,8 +46,9 @@ sub get_manufactorer_for_mac($) { + my $manu = "-NA-"; + + if (defined $oui) { +- $manu = join('-', ($_[0] =~ /^(..):(..):(..):/)); +- $manu = `grep -i '$manu' $oui | cut -f3`; ++ # XXX only handles 24-bit (MA-L) entries, not MA-S/MA-M ++ $manu = join('', ($_[0] =~ /^(..):(..):(..):/)); ++ $manu = `grep -i '^$manu' $oui | cut -f2`; + $manu =~ s/^\s+|\s+$//g; + } + +@@ -66,8 +66,7 @@ sub check_oui_file() { + } + + if (not defined $oui) { +- print(STDERR "To get manufacturer names please download $OUI_URL "); +- print(STDERR "to /usr/local/etc/oui.txt\n"); ++ print(STDERR "To get manufacturer names, 'pkg_add mac-vendor'\n"); + } + } + +@@ -191,9 +190,7 @@ sub cli_processing() { + " --last prints the last (even if end
Re: multimedia/phonon: qt5 flavor and qt6 as default
Le Sat, Mar 02, 2024 at 09:07:49PM +0100, Rafael Sadowski a écrit : > On Sat Mar 02, 2024 at 09:44:11AM +0100, Landry Breuil wrote: > > Le Sat, Mar 02, 2024 at 09:21:59AM +0100, Rafael Sadowski a écrit : > > > On Fri Mar 01, 2024 at 05:59:00PM +0100, Rafael Sadowski wrote: > > > > Based on landry@'s feedback, I think it makes sense to follow the > > > > qt6/qt5 pattern of x11/polkit-qt here. > > > > > > > > I need to do a proper test with all consumers but phonon-4.12.0 updates > > > > to phonon-qt5-4.12.0p0 correct. > > > > > > > > I would be very grateful for a review! > > > > > > > > Rafael > > > > > > > > > > $ pkg_delete -X > > > $ pkg_add -D snap khtml > > > $ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u -D > > > unsigned > > > quirks-7.10->7.12: ok > > > gettext-runtime-0.22.4->0.22.5: ok > > > giflib-5.2.1p0->5.2.2: ok > > > phonon-4.12.0->phonon-qt5-4.12.0p0 forward dependencies: > > > | Dependency of khtml-5.115.0 on phonon-* doesn't match > > > Merging khtml-5.115.0->5.115.0p0 (ok) > > > khtml-5.115.0+phonon-4.12.0->khtml-5.115.0p0+phonon-qt5-4.12.0p0: ok > > > > > > > > > Does that looks good to you? Unfortunately we need > > > devel/kf5/extra-cmake-modules to build both the qt5 and the qt6 part. > > > > i havent fully followed, but your idea is to switch the port to default > > to qt6, and add a qt5 flavor, which previous consumers depend upon ? > > Right, and as you can see above, it looks like it's working. > > > > > i'd have been concerned about flavors for libs causing issues/conflicts > > with bulk builds, but if that works for polkit-qt... > > > > Me too and I'm too stupid for it, but the polkit-qt looks good and > phonon can profit from the same pattern. > > I would like to have this in 7.5. i haven't tested your diff but are you sure the timing is right ? are you confident that won't create new dependency problems once ports start depending on it ?
Re: UPDATE: aom 3.8.1
On 2024/03/03 16:26, Peter Hessler wrote: > This fails to build for me on arm64: > > ===> Configuring for aom-3.8.1 > -- The C compiler identification is Clang 16.0.6 > -- The CXX compiler identification is Clang 16.0.6 > -- Detecting C compiler ABI info > -- Detecting C compiler ABI info - done > -- Check for working C compiler: /usr/obj/ports/aom-3.8.1/bin/cc - skipped > -- Detecting C compile features > -- Detecting C compile features - done > -- Detecting CXX compiler ABI info > -- Detecting CXX compiler ABI info - done > -- Check for working CXX compiler: /usr/obj/ports/aom-3.8.1/bin/c++ - skipped > -- Detecting CXX compile features > -- Detecting CXX compile features - done > -- Performing Test CMAKE_HAVE_LIBC_PTHREAD > -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed > -- Looking for pthread_create in pthreads > -- Looking for pthread_create in pthreads - not found > -- Looking for pthread_create in pthread > -- Looking for pthread_create in pthread - found > -- Found Threads: TRUE > --- aom_configure: Detected CPU: arm64 > -- The ASM compiler identification is unknown > -- Found assembler: as > CMake Error at build/cmake/aom_configure.cmake:212 (enable_language): > The CMAKE_ASM_COMPILER: > > as > > is not a full path and was not found in the PATH. > > Tell CMake where to find the compiler by setting either the environment > variable "ASM" or the CMake cache entry CMAKE_ASM_COMPILER to the full path > to the compiler, or to the compiler name if it is in the PATH. > Call Stack (most recent call first): > CMakeLists.txt:73 (include) > > > -- Warning: Did not find file Compiler/-ASM > -- Configuring incomplete, errors occurred! > > > note that there is no "as" or "llvm-as" binary on arm64. It could possibly depend on devel/gas (there is a newer version in devel/binutils, but other ports are depending on devel/gas and the two conflict, so better take the one which is already used) .. llvm-as exists in the ports version, but AFAIK it is for something else.
Re: UPDATE: aom 3.8.1
This fails to build for me on arm64: ===> Configuring for aom-3.8.1 -- The C compiler identification is Clang 16.0.6 -- The CXX compiler identification is Clang 16.0.6 -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working C compiler: /usr/obj/ports/aom-3.8.1/bin/cc - skipped -- Detecting C compile features -- Detecting C compile features - done -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Check for working CXX compiler: /usr/obj/ports/aom-3.8.1/bin/c++ - skipped -- Detecting CXX compile features -- Detecting CXX compile features - done -- Performing Test CMAKE_HAVE_LIBC_PTHREAD -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed -- Looking for pthread_create in pthreads -- Looking for pthread_create in pthreads - not found -- Looking for pthread_create in pthread -- Looking for pthread_create in pthread - found -- Found Threads: TRUE --- aom_configure: Detected CPU: arm64 -- The ASM compiler identification is unknown -- Found assembler: as CMake Error at build/cmake/aom_configure.cmake:212 (enable_language): The CMAKE_ASM_COMPILER: as is not a full path and was not found in the PATH. Tell CMake where to find the compiler by setting either the environment variable "ASM" or the CMake cache entry CMAKE_ASM_COMPILER to the full path to the compiler, or to the compiler name if it is in the PATH. Call Stack (most recent call first): CMakeLists.txt:73 (include) -- Warning: Did not find file Compiler/-ASM -- Configuring incomplete, errors occurred! note that there is no "as" or "llvm-as" binary on arm64. On 2024 Feb 28 (Wed) at 16:40:02 + (+), Stuart Henderson wrote: :On 2024/02/28 17:28, Jan Beich wrote: :> Brad Smith writes: :> :> > GH_ACCOUNT= jbeich :> > GH_PROJECT= aom :> > -GH_TAGNAME= v3.6.1 :> > +GH_TAGNAME= v3.8.1 :> :> If you don't use snapshots or RCs better migrate off my GitHub mirror. :> According to Repology the download link would be :> :> https://storage.googleapis.com/aom-releases/libaom-3.8.1.tar.gz :> : :Updated for that. No difference in the contents of the tars after :extracting. : :Index: Makefile :=== :RCS file: /cvs/ports/multimedia/aom/Makefile,v :retrieving revision 1.20 :diff -u -p -r1.20 Makefile :--- Makefile 29 May 2023 17:52:01 - 1.20 :+++ Makefile 28 Feb 2024 16:39:18 - :@@ -1,13 +1,14 @@ : COMMENT= Alliance for Open Media AV1 video codec : :-GH_ACCOUNT= jbeich :-GH_PROJECT= aom :-GH_TAGNAME= v3.6.1 :+V=3.8.1 :+DISTNAME= libaom-$V :+PKGNAME= aom-$V : CATEGORIES= multimedia : :-SHARED_LIBS= aom 4.0 :+SHARED_LIBS= aom 4.1 : : HOMEPAGE= https://aomedia.org/ :+SITES=https://storage.googleapis.com/aom-releases/ : : MAINTAINER= Brad Smith : :Index: distinfo :=== :RCS file: /cvs/ports/multimedia/aom/distinfo,v :retrieving revision 1.17 :diff -u -p -r1.17 distinfo :--- distinfo 29 May 2023 17:52:01 - 1.17 :+++ distinfo 28 Feb 2024 16:39:18 - :@@ -1,2 +1,2 @@ :-SHA256 (aom-3.6.1.tar.gz) = Z5xBtBpQucWo+qG6kZ4MI5quf+hXUl4iP/IMVpl/EZ8= :-SIZE (aom-3.6.1.tar.gz) = 5269397 :+SHA256 (libaom-3.8.1.tar.gz) = 3txlBggSp9+AHAJwov6L13PGuwtgHyFE7PvGLcD2cco= :+SIZE (libaom-3.8.1.tar.gz) = 5450909 :Index: patches/patch-CMakeLists_txt :=== :RCS file: /cvs/ports/multimedia/aom/patches/patch-CMakeLists_txt,v :retrieving revision 1.5 :diff -u -p -r1.5 patch-CMakeLists_txt :--- patches/patch-CMakeLists_txt 9 Apr 2023 06:17:17 - 1.5 :+++ patches/patch-CMakeLists_txt 28 Feb 2024 16:39:18 - :@@ -1,12 +1,13 @@ : Index: CMakeLists.txt : --- CMakeLists.txt.orig : +++ CMakeLists.txt :-@@ -824,7 +824,7 @@ if(ENABLE_EXAMPLES AND "${CMAKE_GENERATOR}" MATCHES "M :- endif() :- :- if(BUILD_SHARED_LIBS) :-- if(NOT WIN32 AND NOT APPLE) :-+ if(NOT WIN32 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") :+@@ -828,7 +828,8 @@ if(BUILD_SHARED_LIBS) :+ # https://clang.llvm.org/docs/AddressSanitizer.html#usage. :+ if(NOT WIN32 :+ AND NOT APPLE :+- AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE)) :++ AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE) :++ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") : # The -z defs linker option reports unresolved symbol references from object : # files when building a shared library. : if("${CMAKE_VERSION}" VERSION_LESS "3.13") :Index: patches/patch-aom_ports_aarch32_cpudetect_c :=== :RCS file: patches/patch-aom_ports_aarch32_cpudetect_c :diff -N patches/patch-aom_ports_aarch32_cpudetect_c :--- /dev/null 1 Jan 1970 00:00:00 - :+++ patches/patch-aom_ports_aarch32_cpudetect_c28 Feb 2024 16:39:18 -0
Re: net/isc-dhcpd: avoid uncontrolled grow of lease db
On Wed, 10 Jan 2024 21:21:22 +0100, Stuart Henderson wrote: > > hrmmm, that doesn't make sense, if it can't write to /var/db/dhcpd.leases > due to permissions, it shouldn't be able to write to /var/db/dhcpd.leases~ > either.. > > I'll try and find some time to do a test install and figure out what's > going on, but it won't be for a few days Any chance that this will be fixed in 7.5? -- wbr, Kirill
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Fri Mar 1 14:12:08 MST 2024 Finished: Sun Mar 3 07:47:23 MST 2024 Duration: 1 Days 17 hours 35 minutes Built using OpenBSD 7.5 (GENERIC.MP) #2066: Fri Mar 1 00:07:25 MST 2024 Built 8187 packages Number of packages built each day: Mar 1: 5987 Mar 2: 1805 Mar 3: 395 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2024-03-01/summary.log Build failures: 47 http://build-failures.rhaalovely.net/sparc64/2024-03-01/audio/ncmpc.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/databases/leveldb.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/databases/ruby-amalgalite,ruby31.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/arm-none-eabi/gdb.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/avr/gcc.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/binutils.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/difftastic.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/glib2.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/libbgcode.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/mtxclient.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/py-thrift,python3.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/vim-command-t.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/devel/yder.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/emulators/libretro-pcsx-rearmed.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/bugdom.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/bugdom2.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/cataclysm-dda,no_x11.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/choria.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/colobot/colobot.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/cromagrally.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/devilutionx.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/emptyclip.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/fheroes2.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/gnukem.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/ottomatic.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/scid.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/games/widelands.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/geo/osm2pgrouting.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/graphics/spirv-tools.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/lang/bootgcc.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/mail/neomutt,sasl.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/math/gunits.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/math/openfst.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/net/iamb.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/net/proxychains-ng.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/shells/nsh.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/sysutils/borgmatic.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/sysutils/crust.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/sysutils/flashrom.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/sysutils/nix.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/sysutils/pftop.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/sysutils/u-boot-asahi.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/textproc/libmarisa,,-main.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/textproc/redland-bindings,-main.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/wayland/wf-config.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/www/redlib.log http://build-failures.rhaalovely.net/sparc64/2024-03-01/x11/mruby-zest.log Recurrent failures: failures/audio/ncmpc.log failures/databases/ruby-amalgalite,ruby31.log failures/devel/arm-none-eabi/gdb.log failures/devel/avr/gcc.log failures/devel/py-thrift,python3.log failures/devel/vim-command-t.log failures/games/fheroes2.log failures/games/gnukem.log failures/games/scid.log failures/lang/bootgcc.log failures/mail/neomutt,sasl.log failures/math/gunits.log failures/math/openfst.log failures/net/proxychains-ng.log failures/sysutils/borgmatic.log failures/sysutils/crust.log failures/sysutils/pftop.log failures/sysutils/u-boot-asahi.log failures/textproc/libmarisa,,-main.log New failures: +failures/databases/leveldb.log +failures/devel/binutils.log +failures/devel/difftastic.log +failures/devel/glib2.log +failures/devel/libbgcode.log +failures/devel/mtxclient.log +failures/devel/yder.log +failures/emulators/libretro-pcsx-rearmed.log +failures/games/bugdom.log +fail
education/freedict/*: update to 2023.05.29
Bumped with $ ftp https://freedict.org/freedict-database.json $ jq -r '.[] | select(.name) | .name,.edition' freedict-database.json | paste - - | while read _d _v; do sed -i "s/^V.*/V = $_v/" $_d/Makefile done sed: ell-deu/Makefile: No such file or directory sed: ita-nld/Makefile: No such file or directory 2022.11.18 -> 2023.05.29 is the only change, but that's over half of them: $ jq -r '.[] | .edition' freedict-database.json jq > v $ wc -l v; sort -rn v | uniq -c 206 v 111 2023.05.29 1 2022.11.18 3 2022.04.06 3 2020.10.04 2 2018.09.13 2 1.9-fd1 1 1.6 1 1.2 1 1.0.3 1 1.0.1 1 0.8.3 2 0.7.2 3 0.6.3 1 0.4.4 2 0.4.1 1 0.3.3 1 0.3.2 4 0.3.1 3 0.3 1 0.2.7 7 0.2.3 6 0.2.2 7 0.2.1 1 0.2.0 12 0.2 1 0.1.6 1 0.1.5 1 0.1.4 3 0.1.3 8 0.1.2 6 0.1.1 1 0.1.0 6 0.1 1 null Index: Makefile.inc === RCS file: /cvs/ports/education/freedict/Makefile.inc,v diff -u -p -U0 -r1.1.1.1 Makefile.inc --- Makefile.inc16 Oct 2023 13:00:37 - 1.1.1.1 +++ Makefile.inc3 Mar 2024 12:53:42 - @@ -1 +1 @@ -# See https://freedict.org/freedict-database.xml for all dictionaries +# see https://freedict.org/freedict-database.json for all dictionaries Index: deu-ell/Makefile === RCS file: /cvs/ports/education/freedict/deu-ell/Makefile,v diff -u -p -U0 -r1.1.1.1 Makefile --- deu-ell/Makefile16 Oct 2023 13:00:37 - 1.1.1.1 +++ deu-ell/Makefile3 Mar 2024 13:25:08 - @@ -3 +3 @@ DICT = deu-ell -V =2022.11.18 +V =2023.05.29 Index: deu-ell/distinfo === RCS file: /cvs/ports/education/freedict/deu-ell/distinfo,v diff -u -p -U0 -r1.1.1.1 distinfo --- deu-ell/distinfo16 Oct 2023 13:00:37 - 1.1.1.1 +++ deu-ell/distinfo3 Mar 2024 12:54:29 - @@ -1,2 +1,2 @@ -SHA256 (freedict-deu-ell-2022.11.18.dictd.tar.xz) = 3V0AYavULoIhJvlvwg+y3MiTvuAR+2sQGmH8mz9/ngc= -SIZE (freedict-deu-ell-2022.11.18.dictd.tar.xz) = 774584 +SHA256 (freedict-deu-ell-2023.05.29.dictd.tar.xz) = tFAkZ3xqxtwi+5FpYvGPtZ5U6MKpjN9N3IyoEzRgtEE= +SIZE (freedict-deu-ell-2023.05.29.dictd.tar.xz) = 791468 Index: deu-fin/Makefile === RCS file: /cvs/ports/education/freedict/deu-fin/Makefile,v diff -u -p -U0 -r1.1.1.1 Makefile --- deu-fin/Makefile16 Oct 2023 13:00:37 - 1.1.1.1 +++ deu-fin/Makefile3 Mar 2024 13:25:08 - @@ -3 +3 @@ DICT = deu-fin -V =2022.11.18 +V =2023.05.29 Index: deu-fin/distinfo === RCS file: /cvs/ports/education/freedict/deu-fin/distinfo,v diff -u -p -U0 -r1.1.1.1 distinfo --- deu-fin/distinfo16 Oct 2023 13:00:37 - 1.1.1.1 +++ deu-fin/distinfo3 Mar 2024 12:54:29 - @@ -1,2 +1,2 @@ -SHA256 (freedict-deu-fin-2022.11.18.dictd.tar.xz) = rjW0KFYZqZ6Z/2wAfMWK7ukWhgaLRMxi7XzHtirUdo0= -SIZE (freedict-deu-fin-2022.11.18.dictd.tar.xz) = 829140 +SHA256 (freedict-deu-fin-2023.05.29.dictd.tar.xz) = +lF4no1KFEmp//d9Onr2M7fVZCTcWld9M08Y4mNLOFI= +SIZE (freedict-deu-fin-2023.05.29.dictd.tar.xz) = 866888 Index: deu-fra/Makefile === RCS file: /cvs/ports/education/freedict/deu-fra/Makefile,v diff -u -p -U0 -r1.1.1.1 Makefile --- deu-fra/Makefile16 Oct 2023 13:00:37 - 1.1.1.1 +++ deu-fra/Makefile3 Mar 2024 13:25:08 - @@ -3 +3 @@ DICT = deu-fra -V =2022.11.18 +V =2023.05.29 Index: deu-fra/distinfo === RCS file: /cvs/ports/education/freedict/deu-fra/distinfo,v diff -u -p -U0 -r1.1.1.1 distinfo --- deu-fra/distinfo16 Oct 2023 13:00:37 - 1.1.1.1 +++ deu-fra/distinfo3 Mar 2024 12:54:29 - @@ -1,2 +1,2 @@ -SHA256 (freedict-deu-fra-2022.11.18.dictd.tar.xz) = Nc3d21NG3n7GuHIA1LYfmyps/NCChlVwgrMqApFwTx4= -SIZE (freedict-deu-fra-2022.11.18.dictd.tar.xz) = 3194348 +SHA256 (freedict-deu-fra-2023.05.29.dictd.tar.xz) = epfaTT57JC+Y+8OrlIigUWbgkI46+D8RWxmuaNI/uU8= +SIZE (freedict-deu-fra-2023.05.29.dictd.tar.xz) = 3380008 Index: deu-ind/Makefile === RCS file: /cvs/ports/education/freedict/deu-ind/Makefile,v diff -u -p -U0 -r1.1.1.1 Makefile --- deu-ind/Makefile16 Oct 2023 13:00:37 - 1.1.1.1 +++ deu-ind/Makefile3 Mar 2024 13:25:08 -
Re: x11/gnustep/libobjc2 failed to build
On 2024/03/03 10:38, Antoine Jacoutot wrote: > Probably because devel/libdispatch has: > @conflict gnustep-libobjc2-* > @pkgpath x11/gnustep/libobjc2 > > and x11/gnustep/libobjc2 has: > @conflict libdispatch-* > @pkgpath devel/libdispatch > > That does not make much sense... > > > > > and now my dpb got stuck in loops I've removed the incorrect @pkgpath markers fixing the worst of the issues, but there is still a problem. We can't have two ports which are used as build dependencies of other ports having @conflicts between themselves. This will need to be resolved rather than just marking the conflict.
Re: UPDATE: openjp2 2.5.2
Le Sat, Mar 02, 2024 at 08:41:02PM -0500, Brad Smith a écrit : > On Sat, Mar 02, 2024 at 06:04:23PM -0500, Brad Smith wrote: > > Here is an update to openjp2 2.5.2. > > > > CVE-2021-3575 > > > > > > ## OpenJPEG 2.5.2 (Feb 2024) > > > > * Make sure openjpeg.h includes opj_config.h > > [\#1514](https://github.com/uclouvain/openjpeg/issues/1514) > > > > ## OpenJPEG 2.5.1 (Feb 2024) > > > > * CMake: drop support for cmake < 3.5 > > * Several bugfixes, including > > [\#1509](https://github.com/uclouvain/openjpeg/pull/1509) for CVE-2021-3575 > > * Significant speed-up rate allocation by rate/distoratio ratio > > [\#1440](https://github.com/uclouvain/openjpeg/pull/1440) > > An updated diff fixing the big endian patch the way upstream recommended. thanks, i had a similar diff for 2.5.2 which is in a bulk, i'll integrate the updated BE patch. do you have a link for 'the way upstream recommended' ?
Re: x11/gnustep/libobjc2 failed to build
On Sun, Mar 03, 2024 at 09:16:50AM +0100, Theo Buehler wrote: > On Sun, Mar 03, 2024 at 09:11:47AM +0100, Antoine Jacoutot wrote: > > On Sun, Mar 03, 2024 at 09:00:17AM +0100, Theo Buehler wrote: > > > > -- Could NOT find Git (missing: GIT_EXECUTABLE) > > > > -- Could NOT find Git (missing: GIT_EXECUTABLE) (found version "") > > > > CMake Error at > > > > /usr/local/share/cmake/Modules/ExternalProject.cmake:2910 (message): > > > > error: could not find git for clone of robinmap-populate > > > > Call Stack (most recent call first): > > > > /usr/local/share/cmake/Modules/ExternalProject.cmake:4418 > > > > (_ep_add_download_command) > > > > CMakeLists.txt:29 (ExternalProject_Add) > > > > > > Sounds like it needs a bdep on git. > > > > That won't work because the build user isn't allowed to go online: > > > > This part fixes the build: > > > > +-if (NOT tls-robin-map_FOUND) > > ++if (NOT tsl-robin-map_FOUND) > > Yes, that's the typo I pointed out before sebastia sent that diff. > > But fixing the build apparently creates a dependency loop, so I think > this needs more work: Probably because devel/libdispatch has: @conflict gnustep-libobjc2-* @pkgpath x11/gnustep/libobjc2 and x11/gnustep/libobjc2 has: @conflict libdispatch-* @pkgpath devel/libdispatch That does not make much sense... > > > and now my dpb got stuck in loops > > > > > > Detected loop, merging sets ok > > > | > > > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > > > Detected loop, merging sets ok > > > | > > > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > > > Detected loop, merging sets ok > > > | > > > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > > > Detected loop, merging sets ok > > > | > > > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > > > Detected loop, merging sets ok > > > | gnustep-base-1.29.0p1+gnustep-libobjc2-2.2 -- Antoine
Re: x11/gnustep/libobjc2 failed to build
On Sun, Mar 03, 2024 at 09:11:47AM +0100, Antoine Jacoutot wrote: > On Sun, Mar 03, 2024 at 09:00:17AM +0100, Theo Buehler wrote: > > > -- Could NOT find Git (missing: GIT_EXECUTABLE) > > > -- Could NOT find Git (missing: GIT_EXECUTABLE) (found version "") > > > CMake Error at /usr/local/share/cmake/Modules/ExternalProject.cmake:2910 > > > (message): > > > error: could not find git for clone of robinmap-populate > > > Call Stack (most recent call first): > > > /usr/local/share/cmake/Modules/ExternalProject.cmake:4418 > > > (_ep_add_download_command) > > > CMakeLists.txt:29 (ExternalProject_Add) > > > > Sounds like it needs a bdep on git. > > That won't work because the build user isn't allowed to go online: > This part fixes the build: > > +-if (NOT tls-robin-map_FOUND) > ++if (NOT tsl-robin-map_FOUND) Yes, that's the typo I pointed out before sebastia sent that diff. But fixing the build apparently creates a dependency loop, so I think this needs more work: > > > > > > and now my dpb got stuck in loops > > > > Detected loop, merging sets ok > > | > > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > > Detected loop, merging sets ok > > | > > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > > Detected loop, merging sets ok > > | > > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > > Detected loop, merging sets ok > > | > > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > > Detected loop, merging sets ok > > | gnustep-base-1.29.0p1+gnustep-libobjc2-2.2 > > > > -- > Antoine
Re: x11/gnustep/libobjc2 failed to build
On Sun, Mar 03, 2024 at 09:00:17AM +0100, Theo Buehler wrote: > > -- Could NOT find Git (missing: GIT_EXECUTABLE) > > -- Could NOT find Git (missing: GIT_EXECUTABLE) (found version "") > > CMake Error at /usr/local/share/cmake/Modules/ExternalProject.cmake:2910 > > (message): > > error: could not find git for clone of robinmap-populate > > Call Stack (most recent call first): > > /usr/local/share/cmake/Modules/ExternalProject.cmake:4418 > > (_ep_add_download_command) > > CMakeLists.txt:29 (ExternalProject_Add) > > Sounds like it needs a bdep on git. That won't work because the build user isn't allowed to go online: -- Found Git: /usr/local/bin/git (found version "2.44.0") [1/9] Creating directories for 'robinmap-populate' [1/9] Performing download step (git clone) for 'robinmap-populate' Cloning into 'robinmap-src'... fatal: unable to access 'https://github.com/Tessil/robin-map/': getsockname() failed with errno 61: Connection refused Cloning into 'robinmap-src'... fatal: unable to access 'https://github.com/Tessil/robin-map/': getsockname() failed with errno 61: Connection refused Cloning into 'robinmap-src'... fatal: unable to access 'https://github.com/Tessil/robin-map/': getsockname() failed with errno 61: Connection refused -- Had to git clone more than once: 3 times. CMake Error at robinmap-subbuild/robinmap-populate-prefix/tmp/robinmap-populate-gitclone.cmake:39 (message): Failed to clone repository: 'https://github.com/Tessil/robin-map/' > I had applied this patch (which fixes other defects in this CMakeFile): > https://marc.info/?l=openbsd-ports&m=170920085418634&w=2 This part fixes the build: +-if (NOT tls-robin-map_FOUND) ++if (NOT tsl-robin-map_FOUND) > > and now my dpb got stuck in loops > > Detected loop, merging sets ok > | > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > Detected loop, merging sets ok > | > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > Detected loop, merging sets ok > | > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > Detected loop, merging sets ok > | > gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 > Detected loop, merging sets ok > | gnustep-base-1.29.0p1+gnustep-libobjc2-2.2 > -- Antoine
Re: x11/gnustep/libobjc2 failed to build
> -- Could NOT find Git (missing: GIT_EXECUTABLE) > -- Could NOT find Git (missing: GIT_EXECUTABLE) (found version "") > CMake Error at /usr/local/share/cmake/Modules/ExternalProject.cmake:2910 > (message): > error: could not find git for clone of robinmap-populate > Call Stack (most recent call first): > /usr/local/share/cmake/Modules/ExternalProject.cmake:4418 > (_ep_add_download_command) > CMakeLists.txt:29 (ExternalProject_Add) Sounds like it needs a bdep on git. I had applied this patch (which fixes other defects in this CMakeFile): https://marc.info/?l=openbsd-ports&m=170920085418634&w=2 and now my dpb got stuck in loops Detected loop, merging sets ok | gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 Detected loop, merging sets ok | gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 Detected loop, merging sets ok | gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 Detected loop, merging sets ok | gnustep-base-1.29.0p1+gnustep-libobjc2-2.2p1+sope-5.9.1->gnustep-base-1.29.0p1+libdispatch-5.5p0+sope-5.9.1 Detected loop, merging sets ok | gnustep-base-1.29.0p1+gnustep-libobjc2-2.2