from:"Caspar Schutijser"

CVS: cvs.openbsd.org: ports

2024-05-20 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/05/20 09:58:13

Modified files:
devel/sccache  : Makefile crates.inc distinfo 

Log message:
devel/sccache: update to 0.8.0

CVS: cvs.openbsd.org: ports

2024-05-15 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/05/15 09:30:09

Modified files:
meta/tor-browser: Tag: OPENBSD_7_5 Makefile 
www/tor-browser: Tag: OPENBSD_7_5 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_5 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.15

CVS: cvs.openbsd.org: ports

2024-05-15 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/05/15 09:29:36

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.15

Re: [WIP/Import] x11/py-qt6 at 6.5.2

2024-05-06 Thread Caspar Schutijser

Hi,

You named the attachments '*.tgz' which suggests that the attachments
are gzipped, but they are just plain tar archives, in which case
the .tar suffix makes more sense. Confused me for a second, but
no big deal.

On Mon, Nov 27, 2023 at 04:39:20PM +0100, Justin Berthault wrote:
> Hi,
> 
> wanted to share my work in progress to bring py-qt6 for OpenBSD.
> 
> It is attached with two new ports:
> 
>   - x11/py-qt6
>   - x11/py-sip-qt6

Your py-sip-qt6 port looks like a straightforward copy of py-sip-qt5,
adapted to package the Qt6 variant of the software. Looks good to me
from a ports perspective.

Some more comments on py-qt6 below.

> Built on arm64, testing in progress.

How is the testing going? And are you willing to send a new version of
the x11/py-qt6 port that packages the most recent version of the
software, which is version 6.7.0? Otherwise I can have a look at that.

> For now I think I managed to get most of it the right way.
> 
> One thing that bothers me is the result of `make port-lib-depends-check`
> for py-qt6:
> 
> Extra: Qt6QtPositioning.2
> 
> What does it mean ?
> 
> Testing and feedbacks welcome.

Some comments on the x11/py-qt6 port:

 * remove REVISION since it's a new port.
 * update the following comment in Makefile:
-# 
https://www.riverbankcomputing.com/static/Docs/PyQt6/installation.html#building-pyqt5
+# 
https://www.riverbankcomputing.com/static/Docs/PyQt6/installation.html#building-pyqt6
 * update pkg/DESCR to say Qt6 instead of Qt5.
 * I think the @conflict and @pkgpath annotations can be removed
   (instead of updating them to py-qt6), but I'm not sure. Can someone
   else chime in? It's about these lines in pkg/PLIST that were copied
   from the x11/py-qt5 port:
 @conflict py-qt5-*
 @pkgpath x11/py-qt5,-main
 @pkgpath x11/py-qt5

I tried to build py-qt6 but that failed with the message below.
I briefly tried to update your py-qt6 port to 6.7.0 but that requires
a py3-sip that's newer (version >= 6.8) so that's a bit more work.

The final build messages:
c++ -c -pipe -fno-exceptions -Wall -Wextra -fno-direct-access-external-data 
-pthread -fPIC -DPy_LIMITED_API=0x0307 -DSIP_PROTECTED_IS_PUBLIC 
-Dprotected=public -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_PLUGIN 
-DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_SQL_LIB -DQT_CORE_LIB  -I/usr/include/c++/v1 
-I. -I. -I.. -I/usr/local/include/python3.10 -I/usr/local/include/X11/qt6 
-I/usr/local/include/X11/qt6/QtWidgets -I/usr/local/include/X11/qt6/QtGui 
-I/usr/local/include/X11/qt6/QtSql -I/usr/local/include/X11/qt6/QtCore -I. 
-I/usr/X11R6/include -I/usr/X11R6/include -I/usr/local/include 
-I/usr/local/lib/qt6/mkspecs/openbsd-clang -o sipQtSqlQSqlResult.o 
sipQtSqlQSqlResult.cpp
/home/ports/pobj/py-qt6-6.5.2-python3/PyQt6-6.5.2/build/QtSql/sipQtSqlQSqlResult.cpp:1201:22:
 error: taking the address of a temporary object of type 'QVariantList' (aka 
'QList') [-Waddress-of-temporary]
sipRes = >boundValues();
 ^~
1 error generated.
*** Error 1 in QtSql (Makefile:1877 'sipQtSqlQSqlResult.o')
*** Error 2 in /home/ports/pobj/py-qt6-6.5.2-python3/PyQt6-6.5.2/build 
(Makefile:816 'sub-QtSql-make_first-ordered')
sip-build: 'make' failed returning 2
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3022 'do-configure': 
@cd /usr/ports/pobj/py-qt6-6.5.2-python
3/PyQt6-6.5.2 && /usr...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3042 
'/usr/ports/pobj/py-qt6-6.5.2-python3/.configure_done':
 @cd /usr/ports/x11/p...)
*** Error 2 in /usr/ports/x11/py-qt6 
(/usr/ports/infrastructure/mk/bsd.port.mk:2704 'update-plist': 
@lock=py3-qt6-6.5.2p1;  export _LOCKS_HE...)


Caspar


> 
> cc rsadowsky@
> -- 
> ~Justin

CVS: cvs.openbsd.org: ports

2024-04-18 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/18 14:45:57

Modified files:
converters/k2pdfopt: Makefile 

Log message:
converters/k2pdfopt: limit FIX_CRLF_FILES to limited types of files
instead of all files, which could potentially also contain binary files.

Idea from and OK bentley@

Re: converters/k2pdfopt: unbreak/update to 2.55

2024-04-18 Thread Caspar Schutijser

On Thu, Apr 18, 2024 at 09:55:20AM -0600, Anthony J. Bentley wrote:
> Stuart Henderson writes:
> > Perhaps consider replacing pre-patch with this which I think is a little
> > clearer:
> >
> > FIX_CRLF_FILES = `find . -type f`
> 
> Can this be tweaked to limit it to text files, without making it too
> complicated?
> 
> I only see a single binary file in the distfile, but still...

I see this message now after I already committed the diff. I think
that makes sense, yes. Limiting it to .txt, .c and .h files (the files
we're patching) also works.

Comments or OK?

Caspar


Index: Makefile
===
RCS file: /cvs/ports/converters/k2pdfopt/Makefile,v
diff -u -p -r1.13 Makefile
--- Makefile18 Apr 2024 16:15:44 -  1.13
+++ Makefile18 Apr 2024 16:28:35 -
@@ -38,7 +38,7 @@ RUN_DEPENDS +=print/ghostscript/gnu
 
 WRKDIST =  ${WRKDIR}/k2pdfopt_v${V}
 
-FIX_CRLF_FILES =   `find . -type f`
+FIX_CRLF_FILES =   `find . -type f \( -name '*.txt' -o -name '*.[ch]' \)`
 
 post-install:
${INSTALL_MAN} ${WRKDIR}/debian/k2pdfopt.1 ${PREFIX}/man/man1

CVS: cvs.openbsd.org: ports

2024-04-18 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/18 10:15:44

Modified files:
converters/k2pdfopt: Makefile distinfo 
converters/k2pdfopt/patches: patch-CMakeLists_txt 
 patch-k2pdfoptlib_k2pdfopt_h 
 patch-k2pdfoptlib_textrows_c 
 patch-willuslib_CMakeLists_txt 
 patch-willuslib_willus_h 
converters/k2pdfopt/pkg: PLIST 
Added files:
converters/k2pdfopt/patches: patch-k2pdfoptlib_k2ocr_c 
 patch-willuslib_bmpdjvu_c 
 patch-willuslib_gslpolyfit_c 
 patch-willuslib_ocrtess_c 
 patch-willuslib_wleptonica_c 
Removed files:
converters/k2pdfopt/patches: patch-k2pdfoptlib_k2master_c 
 patch-leptonica_mod_allheaders_h 
 patch-mupdf_mod_font_c 
 patch-mupdf_mod_pdf-colorspace_c 
 patch-mupdf_mod_stext-device_c 
 patch-willuslib_wmupdf_c 
 patch-willuslib_wmupdfinfo_c 

Log message:
converters/k2pdfopt: unbreak and update to 2.55

I borrowed some patches from Debian. Contrary to the earlier non-broken
situation, integration with Tesseract is not enabled right now.

Take MAINTAINER.

Suggestion to replace pre-patch target with FIX_CRLF_FILES from sthen@
OK sthen@

Re: converters/k2pdfopt: unbreak/update to 2.55

2024-04-18 Thread Caspar Schutijser

On Wed, Apr 17, 2024 at 10:59:07PM +0200, Caspar Schutijser wrote:
> Hi,
> 
> At the end of the email is a diff that unbreaks and updates
> converters/k2pdfopt to 2.55.

Hi,

I spent some more time on it today and I have a new diff. Changes
compared to the last diff:
- using mupdf now works;
- ship a manual page, borrowed from Debian;
- sort dependencies in LIB_DEPENDS (I know it causes churn, but this
is already a noisy update anyway);
- improve comments in patches/patch-CMakeLists_txt;
- add another comment in patches/patch-k2pdfoptlib_k2pdfopt_h.

Feedback still welcome.

Caspar


Index: Makefile
===
RCS file: /cvs/ports/converters/k2pdfopt/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile13 Nov 2023 09:40:49 -  1.12
+++ Makefile18 Apr 2024 15:11:48 -
@@ -1,76 +1,47 @@
-BROKEN =   k2pdfopt uses modified builds of MuPDF, Leptonica, Tesseract; 
at least some of these have been updated causing mods to fail
-
-BROKEN +=  also depends on graphics/opejpeg which no longer exists
-
-# Notes on updating:
-# - go to https://www.willus.com/k2pdfopt/k2pdfopt_version.txt;
-#   some of the dependencies need modifying by replacing source
-#   files with files from XXX_mod in k2pdfopt source; using the
-#   above file you can figure out which version of those libs
-#   is needed
-# - modify the port to:
-#   1. fetch those files
-#   2. move the files from XXX_mod/somefile to replace the relevant
-#  file in the library (you'll also need to figure out where in
-#  the library source that file is; they are dumped into the
-#  one XXX_mod dir per library)
-#   3. replicate the library build process (make them static)
-#   4. build k2pdfopt, pointed at the newly built libraries
-#
-# Alternatively you may get away with removing use of mupdf (there's
-# some fallback to ghostscript) and patching use of the libraries;
-# debian packaging takes this approach. It's still very fragile though.
-
 COMMENT =  optimizes PDF/DJVU files for mobile e-readers
 
-V =2.42
+V =2.55
 DISTNAME = k2pdfopt_v${V}_src
 PKGNAME =  k2pdfopt-${V}
-SITES =http://willus.com/k2pdfopt/src/
+SITES =https://willus.com/k2pdfopt/src/
 EXTRACT_SUFX = .zip
-REVISION = 3
+
+SITES.deb =${SITE_DEBIAN:=main/k/k2pdfopt/}
+DISTFILES.deb =k2pdfopt_${V}+ds-2.debian.tar.xz
 
 CATEGORIES =   converters
 
-HOMEPAGE = http://willus.com/k2pdfopt/
-MAINTAINER =   Paul Irofti 
+HOMEPAGE = https://willus.com/k2pdfopt/
+MAINTAINER =   Caspar Schutijser 
 
 # GPLv3
 PERMIT_PACKAGE =   Yes
 
 MODULES =  devel/cmake
 
-WANTLIB += ${COMPILER_LIBCXX} c freetype jbig2dec jpeg m png z \
-   djvulibre jasper lept mupdf openjpeg tesseract
+WANTLIB += c djvulibre freetype gsl gslcblas gumbo jasper jbig2dec
+WANTLIB += jpeg lcms leptonica m mupdf png pthread z
 
 COMPILER = base-clang ports-gcc base-gcc
 
-BUILD_DEPENDS +=   textproc/mupdf:patch \
-   graphics/leptonica:configure \
-   graphics/tesseract/tesseract:patch
-
-LIB_DEPENDS += graphics/png \
-   graphics/jpeg \
-   graphics/jbig2dec \
-   textproc/mupdf \
+LIB_DEPENDS += devel/gsl \
graphics/djvulibre \
+   graphics/jasper \
+   graphics/jpeg \
+   graphics/lcms \
graphics/leptonica \
-   graphics/tesseract/tesseract
-
-# XXX we no longer have this port
-# LIB_DEPENDS +=   graphics/openjpeg
+   graphics/png \
+   textproc/mupdf \
+   www/gumbo
 
 RUN_DEPENDS += print/ghostscript/gnu
 
 WRKDIST =  ${WRKDIR}/k2pdfopt_v${V}
 
-post-extract:
-   ln -s ${WRKDIR}/graphics/leptonica/leptonica-* ${WRKSRC}/leptonica
-   ln -s ${WRKDIR}/graphics/tesseract/tesseract/tesseract-* \
-   ${WRKSRC}/tesseract
-   ln -s ${WRKDIR}/textproc/mupdf/mupdf-* ${WRKSRC}/mupdf
-
 pre-patch:
@cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f`
+
+post-install:
+   ${INSTALL_MAN} ${WRKDIR}/debian/k2pdfopt.1 ${PREFIX}/man/man1
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/converters/k2pdfopt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo18 Aug 2017 12:07:51 -  1.1.1.1
+++ distinfo18 Apr 2024 15:11:48 -
@@ -1,2 +1,4 @@
-SHA256 (k2pdfopt_v2.42_src.zip) = mqvWsZzhFbl/wM0xlclaMPO60FBl2LtHkfVynU2gOuk=
-SIZE (k2pdfopt_v2.42_src.zip) = 2829697
+SHA256 (k2pdfopt_2.55+ds-2.debian.tar.xz) = 
500cs10RualNV6sFM9SJbuMzcd5s7dME/39s68bVl34=
+SHA256 (k2pdfopt_v2.55_src.zip) = Pni0x91iJ/3hITj9JGjdE8DEW1JRWSpPCqxn/ROauVM=
+SIZE (k2pdfopt_2.55+ds-2.debian.tar.xz) = 34168
+SIZE (k2pdfopt_v2.55_src.zip) = 1364878
Index: patches/patch-CM

converters/k2pdfopt: unbreak/update to 2.55

2024-04-17 Thread Caspar Schutijser

c
>>>   ocrtess.c.o:(ocrtess_from_bmp8) in archive 
>>> willuslib/libwilluslib.a
cc: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.

*** Error 1 in . (/usr/ports/devel/cmake/cmake.port.mk:46 'do-build': @cd 
/usr/ports/pobj/k2pdfopt-2.55/build-aarch64 && exec /usr/bin/env -...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3057 
'/usr/ports/pobj/k2pdfopt-2.55/build-aarch64/.build_done': @cd /usr/ports/co...)
*** Error 2 in /usr/ports/converters/k2pdfopt 
(/usr/ports/infrastructure/mk/bsd.port.mk:2704 'all': @lock=k2pdfopt-2.55;  
export _LOCKS_HELD...)

---


Index: Makefile
===
RCS file: /cvs/ports/converters/k2pdfopt/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile13 Nov 2023 09:40:49 -  1.12
+++ Makefile17 Apr 2024 20:53:08 -
@@ -1,74 +1,36 @@
-BROKEN =   k2pdfopt uses modified builds of MuPDF, Leptonica, Tesseract; 
at least some of these have been updated causing mods to fail
-
-BROKEN +=  also depends on graphics/opejpeg which no longer exists
-
-# Notes on updating:
-# - go to https://www.willus.com/k2pdfopt/k2pdfopt_version.txt;
-#   some of the dependencies need modifying by replacing source
-#   files with files from XXX_mod in k2pdfopt source; using the
-#   above file you can figure out which version of those libs
-#   is needed
-# - modify the port to:
-#   1. fetch those files
-#   2. move the files from XXX_mod/somefile to replace the relevant
-#  file in the library (you'll also need to figure out where in
-#  the library source that file is; they are dumped into the
-#  one XXX_mod dir per library)
-#   3. replicate the library build process (make them static)
-#   4. build k2pdfopt, pointed at the newly built libraries
-#
-# Alternatively you may get away with removing use of mupdf (there's
-# some fallback to ghostscript) and patching use of the libraries;
-# debian packaging takes this approach. It's still very fragile though.
-
 COMMENT =  optimizes PDF/DJVU files for mobile e-readers
 
-V =2.42
+V =2.55
 DISTNAME = k2pdfopt_v${V}_src
 PKGNAME =  k2pdfopt-${V}
-SITES =http://willus.com/k2pdfopt/src/
+SITES =https://willus.com/k2pdfopt/src/
 EXTRACT_SUFX = .zip
-REVISION = 3
 
 CATEGORIES =   converters
 
-HOMEPAGE = http://willus.com/k2pdfopt/
-MAINTAINER =   Paul Irofti 
+HOMEPAGE = https://willus.com/k2pdfopt/
+MAINTAINER =   Caspar Schutijser 
 
 # GPLv3
 PERMIT_PACKAGE =   Yes
 
 MODULES =  devel/cmake
 
-WANTLIB += ${COMPILER_LIBCXX} c freetype jbig2dec jpeg m png z \
-   djvulibre jasper lept mupdf openjpeg tesseract
+WANTLIB += c djvulibre gsl gslcblas jasper jpeg leptonica m png
+WANTLIB += pthread z
 
 COMPILER = base-clang ports-gcc base-gcc
 
-BUILD_DEPENDS +=   textproc/mupdf:patch \
-   graphics/leptonica:configure \
-   graphics/tesseract/tesseract:patch
-
-LIB_DEPENDS += graphics/png \
+LIB_DEPENDS += devel/gsl \
+   graphics/png \
+   graphics/jasper \
graphics/jpeg \
-   graphics/jbig2dec \
-   textproc/mupdf \
graphics/djvulibre \
graphics/leptonica \
-   graphics/tesseract/tesseract
-
-# XXX we no longer have this port
-# LIB_DEPENDS +=   graphics/openjpeg
 
 RUN_DEPENDS += print/ghostscript/gnu
 
 WRKDIST =  ${WRKDIR}/k2pdfopt_v${V}
-
-post-extract:
-   ln -s ${WRKDIR}/graphics/leptonica/leptonica-* ${WRKSRC}/leptonica
-   ln -s ${WRKDIR}/graphics/tesseract/tesseract/tesseract-* \
-   ${WRKSRC}/tesseract
-   ln -s ${WRKDIR}/textproc/mupdf/mupdf-* ${WRKSRC}/mupdf
 
 pre-patch:
@cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f`
Index: distinfo
===
RCS file: /cvs/ports/converters/k2pdfopt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo18 Aug 2017 12:07:51 -  1.1.1.1
+++ distinfo17 Apr 2024 20:53:08 -
@@ -1,2 +1,2 @@
-SHA256 (k2pdfopt_v2.42_src.zip) = mqvWsZzhFbl/wM0xlclaMPO60FBl2LtHkfVynU2gOuk=
-SIZE (k2pdfopt_v2.42_src.zip) = 2829697
+SHA256 (k2pdfopt_v2.55_src.zip) = Pni0x91iJ/3hITj9JGjdE8DEW1JRWSpPCqxn/ROauVM=
+SIZE (k2pdfopt_v2.55_src.zip) = 1364878
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/converters/k2pdfopt/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Mar 2022 18:27:03 -  1.3
+++ patches/patch-CMakeLists_txt17 Apr 2024 20:53:08 -
@@ -1,3 +1,14 @@
+Fix compilation with Jasper

CVS: cvs.openbsd.org: ports

2024-04-16 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/16 11:21:44

Modified files:
meta/tor-browser: Tag: OPENBSD_7_5 Makefile 
www/tor-browser: Tag: OPENBSD_7_5 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_5 Makefile distinfo 
www/tor-browser/browser/pkg: Tag: OPENBSD_7_5 PLIST 
Removed files:
www/tor-browser/browser/patches: Tag: OPENBSD_7_5 
 
patch-tor-browser-linux64_Browser_fontconfig_fonts_conf 

Log message:
Tor Browser: update to 13.0.14

And MFC commit so that we don't have to patch fonts.conf anymore.

CVS: cvs.openbsd.org: ports

2024-04-16 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/16 11:19:45

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 
Removed files:
www/tor-browser/browser/patches: 
 
patch-tor-browser-linux64_Browser_fontconfig_fonts_conf 

Log message:
Tor Browser: update to 13.0.14

CVS: cvs.openbsd.org: ports

2024-04-16 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/16 05:26:53

Modified files:
productivity/zim: Makefile distinfo 
productivity/zim/patches: patch-setup_py 
productivity/zim/pkg: PLIST 

Log message:
productivity/zim: update to 0.75.2

OK benno@ sthen@

CVS: cvs.openbsd.org: ports

2024-04-16 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/16 05:07:49

Modified files:
sysutils/terragrunt: Makefile 

Log message:
sysutils/terragrunt: remove BROKEN-armv7 marker as well

Suggested by sthen@, since armv7 failed for the same reason
as aarch64

CVS: cvs.openbsd.org: ports

2024-04-16 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/16 05:07:16

Modified files:
sysutils/nomad : Makefile 

Log message:
sysutils/nomad: remove BROKEN-armv7 marker as well

Suggested by sthen@, since armv7 failed for the same reason
as aarch64

Re: sysutils/nomad: remove BROKEN-aarch64 marker

2024-04-16 Thread Caspar Schutijser

On Tue, Apr 16, 2024 at 11:15:18AM +0100, Stuart Henderson wrote:
> On 2024/04/12 17:57, Caspar Schutijser wrote:
> > Hi,
> > 
> > This port builds successfully on arm64. I did not test this
> > at runtime. It's possible it builds on armv7 too these days
> > since the BROKEN message is the same but I can't test it on
> > armv7.
> 
> I suggest removing BROKEN-armv7 as well, the root cause was the same so
> if it still fails it should now be for a different reason.

Okay, I'll do that in a bit. I'll do the same for
sysutils/terragrunt since the same applies there.

Caspar

CVS: cvs.openbsd.org: ports

2024-04-14 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/14 04:50:55

Modified files:
www/tor-browser/browser: Makefile 
www/tor-browser/browser/patches: 
 
patch-tor-browser-linux64_Browser_fontconfig_fonts_conf 
www/tor-browser/browser/pkg: PLIST 

Log message:
Tor Browser: install bundled fonts in dir that Tor Browser expects

So that we don't have to patch fonts.conf anymore.

Re: sysutils/gitlab-runner: update BROKEN-aarch64 marker?

2024-04-13 Thread Caspar Schutijser

On Sat, Apr 13, 2024 at 01:31:01PM +0100, Stuart Henderson wrote:
> On 2024/04/13 11:45, Caspar Schutijser wrote:
> > Hi,
> > 
> > Not sure if this is considered useful but this port is broken
> > on aarch64 with a different message than what's currently in
> > the BROKEN-aarch64 marker so I propose to update it.
> 
> That BROKEN line doesn't show the error message, it's an explanation
> of what the problem is, with details of the fork of kr/pty which adds
> support. I think it's more useful to keep as-is.

Right, now that you mention it it makes a lot of sense. I reverted it.

I looked into updating the port as well but that does not look
straightforward for the reason you mentioned in the other email.

Caspar

> 
> The current version upstream in
> https://gitlab.com/gitlab-org/gitlab-runner/-/blob/main/go.mod?ref_type=heads
> changed to creack/pty so maybe updating will fix things.

> 
> > The build fails at follows:
> > # gitlab.com/gitlab-org/gitlab-runner/vendor/github.com/kr/pty
> > 
> > /usr/ports/pobj/gitlab-runner-14.2.0/go/src/gitlab.com/gitlab-org/gitlab-runner/vendor/github.com/kr/pty/pty_openbsd.go:24:10:
> >  undefined: ptmget
> > 
> > /usr/ports/pobj/gitlab-runner-14.2.0/go/src/gitlab.com/gitlab-org/gitlab-runner/vendor/github.com/kr/pty/pty_openbsd.go:25:34:
> >  undefined: ioctl_PTMGET
> > 
> > I decided to only mention the first one in the updated marker.
> > 
> > BROKEN-arm has the same message; it's possible it's now broken in the
> > "updated" way but I can't test that.
> > 
> > Comments or OKs?
> > 
> > Caspar
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/gitlab-runner/Makefile,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 Makefile
> > --- Makefile27 Sep 2023 17:16:26 -  1.6
> > +++ Makefile12 Apr 2024 16:20:03 -
> > @@ -1,4 +1,4 @@
> > -BROKEN-aarch64 =   old kr/pty doesn't support OpenBSD arm arches; needs 
> > creack/pty@v1.1.11
> > +BROKEN-aarch64 =   
> > gitlab.com/gitlab-org/gitlab-runner/vendor/github.com/kr/pty/pty_openbsd.go:24:10:
> >  undefined: ptmget
> >  BROKEN-arm =   old kr/pty doesn't support OpenBSD arm arches; 
> > needs creack/pty@v1.1.11
> >  
> >  COMMENT =  CI/CD job runner for GitLab
> >

CVS: cvs.openbsd.org: ports

2024-04-13 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/13 09:01:32

Modified files:
sysutils/gitlab-runner: Makefile 

Log message:
sysutils/gitlab-runner: revert back to previous BROKEN-aarch64 marker

sthen@ thinks the previous message is more useful; I agree now too

CVS: cvs.openbsd.org: ports

2024-04-13 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/13 03:49:18

Modified files:
sysutils/gitlab-runner: Makefile 

Log message:
sysutils/gitlab-runner: update BROKEN-aarch64 marker

Agreement from tb@

Re: [update] devel/{intellij,pycharm} to 2024.1

2024-04-13 Thread Caspar Schutijser

On Sat, Apr 13, 2024 at 02:33:26AM +, Lucas Raab wrote:
> Hello,
> 
> Here's the inagural release of intellij and pycharm for 2024. No issues with 
> light
> testing on amd64. Other tests?

I also did some light testing, seems to work.

OK caspar@

> 
> Thanks,
> Lucas

> diff refs/heads/master refs/heads/intellij-2024
> commit - 07977f822f24e717b270f1c37acc2005d0e230da
> commit + ac9e997e259c12cbfa84badadf7aec109537e9b5
> blob - ee25ef33c8b1576d77879afaad64798730c0e4c8
> blob + 0e020cc5aaae89d2e02e59ab51ecb8fdc75de60f
> --- devel/intellij/Makefile
> +++ devel/intellij/Makefile
> @@ -1,6 +1,6 @@
>  COMMENT= IntelliJ IDEA Java IDE
>  
> -V=   2023.3.2
> +V=   2024.1
>  DISTNAME=ideaIC-${V}
>  PKGNAME= intellij-${V}
>  CATEGORIES=  devel
> @@ -23,7 +23,7 @@ RUN_DEPENDS=devel/desktop-file-utils \
>  
>  NO_TEST= Yes
>  
> -WRKDIST= ${WRKDIR}/idea-IC-233.13135.103
> +WRKDIST= ${WRKDIR}/idea-IC-241.14494.240
>  IJ=  ${PREFIX}/intellij
>  
>  # If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
> blob - e2dc5f7c63f4e4f9dc704616c527f11f599b7879
> blob + 41edd24ac19928059564e5e670358948249e1cf7
> --- devel/intellij/distinfo
> +++ devel/intellij/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (ideaIC-2023.3.2.tar.gz) = 
> 0lIRAUEEY4jnKFMsXnoxKm1A1rddq7ST6IwOK4qRRXQ=
> -SIZE (ideaIC-2023.3.2.tar.gz) = 804698472
> +SHA256 (ideaIC-2024.1.tar.gz) = AdGyJMXohZL5VLF3lqdvqDkc3K/vJyZOcDx//ke7QGU=
> +SIZE (ideaIC-2024.1.tar.gz) = 817447015
> blob - be4facc83a6cad232679e3370199362d08eca3e5
> blob + 8dc3b6d1a3acae042e6f7048c3b906b08259d69b
> --- devel/intellij/pkg/PLIST
> +++ devel/intellij/pkg/PLIST
> @@ -28,62 +28,19 @@ intellij/bin/restarter
>  intellij/build.txt
>  intellij/lib/
>  intellij/lib/annotations.jar
> -intellij/lib/ant/
> -intellij/lib/ant/CONTRIBUTORS
> -intellij/lib/ant/INSTALL
> -intellij/lib/ant/KEYS
> -intellij/lib/ant/LICENSE
> -intellij/lib/ant/NOTICE
> -intellij/lib/ant/README
> -intellij/lib/ant/WHATSNEW
> -intellij/lib/ant/contributors.xml
> -intellij/lib/ant/lib/
> -intellij/lib/ant/lib/README
> -intellij/lib/ant/lib/ant-antlr.pom
> -intellij/lib/ant/lib/ant-apache-bcel.pom
> -intellij/lib/ant/lib/ant-apache-bsf.pom
> -intellij/lib/ant/lib/ant-apache-log4j.pom
> -intellij/lib/ant/lib/ant-apache-oro.pom
> -intellij/lib/ant/lib/ant-apache-regexp.pom
> -intellij/lib/ant/lib/ant-apache-resolver.pom
> -intellij/lib/ant/lib/ant-apache-xalan2.pom
> -intellij/lib/ant/lib/ant-commons-logging.pom
> -intellij/lib/ant/lib/ant-commons-net.pom
> -intellij/lib/ant/lib/ant-imageio.pom
> -intellij/lib/ant/lib/ant-jai.pom
> -intellij/lib/ant/lib/ant-javamail.pom
> -intellij/lib/ant/lib/ant-jdepend.pom
> -intellij/lib/ant/lib/ant-jmf.pom
> -intellij/lib/ant/lib/ant-jsch.pom
> -intellij/lib/ant/lib/ant-junit.pom
> -intellij/lib/ant/lib/ant-junit4.pom
> -intellij/lib/ant/lib/ant-junitlauncher.pom
> -intellij/lib/ant/lib/ant-launcher.pom
> -intellij/lib/ant/lib/ant-netrexx.pom
> -intellij/lib/ant/lib/ant-parent.pom
> -intellij/lib/ant/lib/ant-swing.pom
> -intellij/lib/ant/lib/ant-testutil.pom
> -intellij/lib/ant/lib/ant-xz.pom
> -intellij/lib/ant/lib/ant.jar
> -intellij/lib/ant/lib/ant.pom
> -intellij/lib/ant/lib/classpath.index
> -intellij/lib/ant/lib/libraries.properties
> -intellij/lib/ant/src.zip
>  intellij/lib/app-client.jar
>  intellij/lib/app.jar
>  intellij/lib/bouncy-castle.jar
> -intellij/lib/build-marker-IC-233.13135.103
> -intellij/lib/byte-buddy-agent.jar
> +intellij/lib/build-marker-IC-241.14494.240
>  intellij/lib/cds/
>  intellij/lib/cds/classesLogAgent.jar
> -intellij/lib/error-prone-annotations.jar
>  intellij/lib/external-system-rt.jar
>  intellij/lib/externalProcess-rt.jar
>  intellij/lib/forms_rt.jar
>  intellij/lib/groovy.jar
>  intellij/lib/grpc.jar
>  intellij/lib/idea_rt.jar
> -intellij/lib/intellij-coverage-agent-1.0.738.jar
> +intellij/lib/intellij-coverage-agent-1.0.744.jar
>  intellij/lib/intellij-test-discovery.jar
>  intellij/lib/jps-model.jar
>  intellij/lib/jsch-agent.jar
> @@ -92,12 +49,14 @@ intellij/lib/junit4.jar
>  intellij/lib/lib-client.jar
>  intellij/lib/lib.jar
>  intellij/lib/modules.jar
> +intellij/lib/opentelemetry.jar
>  intellij/lib/platform-loader.jar
>  intellij/lib/product-client.jar
>  intellij/lib/protobuf.jar
>  intellij/lib/rd.jar
>  intellij/lib/stats.jar
>  intellij/lib/testFramework.jar
> +intellij/lib/trove.jar
>  intellij/lib/util-8.jar
>  intellij/lib/util.jar
>  intellij/lib/util_rt.jar
> @@ -155,6 +114,7 @@ intellij/plugins/Kotlin/kotlinc/lib/assignment-compile
>  intellij/plugins/Kotlin/kotlinc/lib/js.engines.jar
>  intellij/plugins/Kotlin/kotlinc/lib/jvm-abi-gen.jar
>  intellij/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing-cli.jar
> +intellij/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing-compiler.jar
>  intellij/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing-runtime.jar
>

sysutils/gitlab-runner: update BROKEN-aarch64 marker?

2024-04-13 Thread Caspar Schutijser

Hi,

Not sure if this is considered useful but this port is broken
on aarch64 with a different message than what's currently in
the BROKEN-aarch64 marker so I propose to update it.

The build fails at follows:
# gitlab.com/gitlab-org/gitlab-runner/vendor/github.com/kr/pty

/usr/ports/pobj/gitlab-runner-14.2.0/go/src/gitlab.com/gitlab-org/gitlab-runner/vendor/github.com/kr/pty/pty_openbsd.go:24:10:
 undefined: ptmget

/usr/ports/pobj/gitlab-runner-14.2.0/go/src/gitlab.com/gitlab-org/gitlab-runner/vendor/github.com/kr/pty/pty_openbsd.go:25:34:
 undefined: ioctl_PTMGET

I decided to only mention the first one in the updated marker.

BROKEN-arm has the same message; it's possible it's now broken in the
"updated" way but I can't test that.

Comments or OKs?

Caspar


Index: Makefile
===
RCS file: /cvs/ports/sysutils/gitlab-runner/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile27 Sep 2023 17:16:26 -  1.6
+++ Makefile12 Apr 2024 16:20:03 -
@@ -1,4 +1,4 @@
-BROKEN-aarch64 =   old kr/pty doesn't support OpenBSD arm arches; needs 
creack/pty@v1.1.11
+BROKEN-aarch64 =   
gitlab.com/gitlab-org/gitlab-runner/vendor/github.com/kr/pty/pty_openbsd.go:24:10:
 undefined: ptmget
 BROKEN-arm =   old kr/pty doesn't support OpenBSD arm arches; needs 
creack/pty@v1.1.11
 
 COMMENT =  CI/CD job runner for GitLab

UPDATE: productivity/zim 0.75.2

2024-04-13 Thread Caspar Schutijser

Hi,

Below is a diff that updates Zim to 0.75.2. Tested on arm64,
works fine here.

Comments or OKs?

Caspar


Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile27 Sep 2023 15:04:14 -  1.35
+++ Makefile13 Apr 2024 09:35:24 -
@@ -1,8 +1,7 @@
 COMMENT =  desktop wiki
 
-MODPY_EGG_VERSION =0.75.1
+MODPY_EGG_VERSION =0.75.2
 DISTNAME = zim-${MODPY_EGG_VERSION}
-REVISION = 0
 
 CATEGORIES =   productivity
 
Index: distinfo
===
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo14 Nov 2022 17:59:32 -  1.15
+++ distinfo13 Apr 2024 09:35:24 -
@@ -1,2 +1,2 @@
-SHA256 (zim-0.75.1.tar.gz) = iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U=
-SIZE (zim-0.75.1.tar.gz) = 2510821
+SHA256 (zim-0.75.2.tar.gz) = QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI=
+SIZE (zim-0.75.2.tar.gz) = 3211464
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/productivity/zim/patches/patch-setup_py,v
retrieving revision 1.8
diff -u -p -r1.8 patch-setup_py
--- patches/patch-setup_py  11 Mar 2022 19:51:49 -  1.8
+++ patches/patch-setup_py  13 Apr 2024 09:35:24 -
@@ -1,7 +1,7 @@
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -72,7 +72,7 @@ def include_file(file):
+@@ -77,7 +77,7 @@ def include_file(file):
  def collect_data_files():
# Search for data files to be installed in share/
data_files = [
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST   14 Nov 2022 17:59:32 -  1.19
+++ pkg/PLIST   13 Apr 2024 09:35:24 -
@@ -338,11 +338,15 @@ share/locale/da/LC_MESSAGES/zim.mo
 share/locale/de/LC_MESSAGES/zim.mo
 share/locale/el/LC_MESSAGES/zim.mo
 share/locale/en_GB/LC_MESSAGES/zim.mo
+share/locale/eo/LC_MESSAGES/zim.mo
 share/locale/es/LC_MESSAGES/zim.mo
 share/locale/et/LC_MESSAGES/zim.mo
 share/locale/eu/LC_MESSAGES/zim.mo
 share/locale/fi/LC_MESSAGES/zim.mo
 share/locale/fr/LC_MESSAGES/zim.mo
+share/locale/fy/
+share/locale/fy/LC_MESSAGES/
+share/locale/fy/LC_MESSAGES/zim.mo
 share/locale/gl/LC_MESSAGES/zim.mo
 share/locale/he/LC_MESSAGES/zim.mo
 share/locale/hr/LC_MESSAGES/zim.mo

CVS: cvs.openbsd.org: ports

2024-04-12 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/12 11:18:35

Modified files:
sysutils/terragrunt: Makefile 

Log message:
sysutils/terragrunt: remove BROKEN-aarch64 marker

OK ajacoutot@

BROKEN-armv7 has the same message so it may build now too, but
I don't have the hardware to verify that. Can someone try?

CVS: cvs.openbsd.org: ports

2024-04-12 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/12 11:17:46

Modified files:
sysutils/nomad : Makefile 

Log message:
sysutils/nomad: remove BROKEN-aarch64 marker

OK ajacoutot@

BROKEN-armv7 has the same message so it may build now too, but
I don't have the hardware to verify that. Can someone try?

sysutils/terragrunt: remove BROKEN-aarch64 marker

2024-04-12 Thread Caspar Schutijser

Hi,

Same story as for sysutils/nomad:
This port builds successfully on arm64. I did not test this
at runtime. It's possible it builds on armv7 too these days
since the BROKEN message is the same but I can't test it on
armv7.

Comments or OKs?

Caspar


Index: Makefile
===
RCS file: /cvs/ports/sysutils/terragrunt/Makefile,v
retrieving revision 1.221
diff -u -p -r1.221 Makefile
--- Makefile5 Apr 2024 06:59:14 -   1.221
+++ Makefile12 Apr 2024 15:58:13 -
@@ -1,4 +1,3 @@
-BROKEN-aarch64=old kr/pty doesn't support OpenBSD arm arches; needs 
creack/pty@v1.1.11
 BROKEN-armv7=  old kr/pty doesn't support OpenBSD arm arches; needs 
creack/pty@v1.1.11
 
 COMMENT=   thin wrapper for Terraform that provides extra tools

sysutils/nomad: remove BROKEN-aarch64 marker

2024-04-12 Thread Caspar Schutijser

Hi,

This port builds successfully on arm64. I did not test this
at runtime. It's possible it builds on armv7 too these days
since the BROKEN message is the same but I can't test it on
armv7.

Comments or OKs?

Caspar


Index: Makefile
===
RCS file: /cvs/ports/sysutils/nomad/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile23 Mar 2024 13:27:36 -  1.81
+++ Makefile12 Apr 2024 15:54:59 -
@@ -1,4 +1,3 @@
-BROKEN-aarch64=old kr/pty doesn't support OpenBSD arm arches; needs 
creack/pty@v1.1.11
 BROKEN-armv7=  old kr/pty doesn't support OpenBSD arm arches; needs 
creack/pty@v1.1.11
 
 # bunch of undefined things in crypto/blake2b, shirou/gopsutil/disk, 
shirou/gopsutil/mem

CVS: cvs.openbsd.org: ports

2024-04-06 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/04/06 00:19:12

Modified files:
meta/tor-browser: Tag: OPENBSD_7_5 Makefile 
www/tor-browser: Tag: OPENBSD_7_5 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_5 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.13

CVS: cvs.openbsd.org: ports

2024-03-23 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/03/23 08:24:08

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.13

CVS: cvs.openbsd.org: ports

2024-03-23 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/03/23 08:23:27

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.13

CVS: cvs.openbsd.org: ports

2024-03-21 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/03/21 14:39:21

Modified files:
net/snowflake_proxy: Makefile distinfo modules.inc 

Log message:
net/snowflake_proxy: update to 2.9.2

CVS: cvs.openbsd.org: ports

2024-03-21 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/03/21 14:35:55

Modified files:
devel/shellcheck: Makefile distinfo 
devel/shellcheck/files: shellcheck.1 

Log message:
devel/shellcheck: update to 0.10.0

OK gnezdo@

UPDATE: devel/shellcheck 0.10.0

2024-03-21 Thread Caspar Schutijser

Hi,

Below is a diff that updates devel/shellcheck to 0.10.0. Now that we
can use a release again instead of a untagged version from their git
repository, we can revert the manual stuff at the beginning of the
Makefile that overrides cabal.port.mk.

Tested on amd64.

Comments or OKs?

Caspar


Index: Makefile
===
RCS file: /cvs/ports/devel/shellcheck/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile12 Nov 2023 15:38:05 -  1.17
+++ Makefile21 Mar 2024 19:39:04 -
@@ -1,19 +1,7 @@
 COMMENT =  shell script analysis tool
 
-# https://github.com/koalaman/shellcheck/issues/2860
-V =0.9.0pl20231108
-GH_ACCOUNT =   koalaman
-GH_COMMIT =a71a13c2fca05b822cb16840792dc013ca76493f
-GH_PROJECT =   shellcheck
-
-# Overrides cabal.port.mk which would otherwise preempt bsd.port.mk
-DISTNAME = ${GH_PROJECT}-${V}
-DISTFILES =${GH_DISTFILE}
-PKGNAME =  ${MODCABAL_EXECUTABLES}-${V}
-SITES =${SITES_GITHUB}
-
 MODCABAL_STEM =ShellCheck
-MODCABAL_VERSION = ${V}
+MODCABAL_VERSION = 0.10.0
 MODCABAL_EXECUTABLES = shellcheck
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   devel
@@ -26,25 +14,23 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB =  c ffi gmp iconv m pthread util
 
-# cabal-bundler --openbsd ShellCheck-0.9.0 --executable shellcheck
+# cabal-bundler --openbsd ShellCheck-0.10.0 --executable shellcheck
 MODULES =  devel/cabal
 MODCABAL_MANIFEST  = \
-   Diff0.4.1   0   \
+   Diff0.5 1   \
OneTuple0.4.1.1 1   \
QuickCheck  2.14.3  0   \
StateVar1.2.2   0   \
aeson   2.2.1.0 1   \
assoc   1.1 1   \
base-orphans0.9.1   0   \
-   bifunctors  5.6.1   2   \
+   bifunctors  5.6.2   0   \
comonad 5.0.8   2   \
contravariant   1.5.5   0   \
-   data-array-byte 0.1.0.1 2   \
data-fix0.3.2   5   \
distributive0.6.2.1 1   \
dlist   1.0 1   \
fgl 5.8.2.0 0   \
-   foldable1-classes-compat0.1 4   \
generically 0.1.1   2   \
hashable1.4.3.0 1   \
indexed-traversable 0.1.3   0   \
@@ -52,8 +38,8 @@ MODCABAL_MANIFEST = \
integer-conversion  0.1.0.1 1   \
integer-logarithms  1.0.3.1 5   \
network-uri 2.6.4.2 1   \
-   primitive   0.9.0.0 0   \
-   random  1.2.1.1 1   \
+   primitive   0.9.0.0 1   \
+   random  1.2.1.2 0   \
regex-base  0.94.0.24   \
regex-tdfa  1.3.2.2 2   \
scientific  0.3.7.0 7   \
@@ -61,18 +47,18 @@ MODCABAL_MANIFEST   = \
semigroupoids   6.0.0.1 1   \
splitmix0.1.0.5 0   \
strict  0.5 1   \
-   tagged  0.8.8   0   \
+   tagged  0.8.8   1   \
text-iso86010.1 1   \
text-short  0.1.5   3   \
-   th-abstraction  0.6.0.0 1   \
-   th-compat   0.1.4   3   \
+   th-abstraction  0.6.0.0 2   \
+   th-compat   0.1.5   0   \
these   1.2 1   \
time-compat 1.9.6.1 6   \
transformers-compat 0.7.2   0   \
-   unordered-containers0.2.19.13   \
+   unordered-containers0.2.20  1   \
uuid-types  1.0.5.1 0   \
-   vector  0.13.1.00   \
-   vector-stream   0.1.0.0 3   \
+   vector  0.13.1.01   \
+   vector-stream   0.1.0.1 1   \
witherable  0.4.2   4   \
 
 LIB_DEPENDS =  converters/libiconv \
@@ -85,7 +71,7 @@ NO_TEST = Yes
 # pkg_add pandoc; cd ${WRKSRC}; ./manpage; cp shellcheck.1 ${FILESDIR}/
 # (and update md5)
 post-patch:
-   @[ `md5 < ${WRKSRC}/shellcheck.1.md` == 
f06c4a4f31f71dee0aa6b1890e469d5d ] || \
+   @[ `md5 < ${WRKSRC}/shellcheck.1.md` == 
b28cc3fbcd8c4978a8f0253955252fa5 ] || \
(echo "*** manpage changed; regenerate ${FILESDIR}/shellcheck.1"; 
sleep 3)
 
 post-install:
Index: distinfo
===
RCS file: /cvs/ports/devel/shellcheck/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo12 Nov 2023 15:38:05 -  1.8
+++ distinfo21 Mar 2024 19:39:04 -
@@ -1,20 +1,19 @@
-SHA256 (hackage/Diff-0.4.1.tar.gz) = 
/V5Kqschm8uxSDT7hYDr4KrpBZWNCtdPUzjqKQs3JnA=
+SHA256 (hackage/Diff-0.5.tar.gz) = A8yE3t+xj6aT8LC3BU1l6Sw4jQZXz0WtXp++P+i1RVE=
+SHA256 (hackage/Diff-0.5_1.cabal) = 
nIqXLurZ4Hm5DGWB+o71dVZiwQ3QdZUbMrgBFFcEr7s=
 SHA256 (hackage/OneTuple-0.4.1.1.tar.gz) = 
yedk1O4eV8rYNBvV0N4zujpStnk/wTCWefK/YMAwuys=
 SHA256

CVS: cvs.openbsd.org: ports

2024-03-21 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/03/21 01:18:59

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.12

CVS: cvs.openbsd.org: ports

2024-03-21 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/03/21 01:18:26

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.12

CVS: cvs.openbsd.org: ports

2024-03-07 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/03/07 12:56:40

Modified files:
net/snowflake_proxy: Makefile distinfo modules.inc 

Log message:
net/snowflake_proxy: update to 2.9.1

CVS: cvs.openbsd.org: ports

2024-03-07 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/03/07 12:44:48

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.11

CVS: cvs.openbsd.org: ports

2024-03-07 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/03/07 12:43:58

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.11

CVS: cvs.openbsd.org: ports

2024-02-22 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/02/22 02:51:45

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.10

CVS: cvs.openbsd.org: ports

2024-02-22 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/02/22 02:50:07

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.10

CVS: cvs.openbsd.org: ports

2024-02-12 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/02/12 08:51:26

Modified files:
devel/sccache  : Makefile crates.inc distinfo 

Log message:
devel/sccache: update to 0.7.7

Re: Remove: mail/trojita

2024-02-03 Thread Caspar Schutijser

Hi,

On Fri, Feb 02, 2024 at 10:55:37PM +0100, Rafael Sadowski wrote:
> Hi Caspar, Hi ports@,
> 
> I'm trying to remove x11/qt5/qtwebkit. It's an very outdated and
> unsecure web engine. Which is also dead upstream. Other distributors
> have already got rid of it. Let's go the way too!
> 
> First trojita, it looks dead upstream and no one has it in their package
> catalog anymore. I hope that people will not use it to read their e-mail.
> 
> Anyway, Caspar, ports@, are we ready to get rid of it?

A bit sad but it makes sense indeed. OK caspar@

Caspar

> 
> Rafael
>

CVS: cvs.openbsd.org: ports

2024-02-01 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/02/01 13:03:32

Modified files:
devel/sccache  : Makefile crates.inc distinfo 

Log message:
devel/sccache: update to 0.7.6

CVS: cvs.openbsd.org: ports

2024-01-24 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/01/24 23:42:50

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.9

CVS: cvs.openbsd.org: ports

2024-01-24 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/01/24 09:48:29

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 
www/tor-browser/browser/pkg: PLIST 

Log message:
Tor Browser: update to 13.0.9

Re: sccache lifetime & ports infrastructure ?

2024-01-21 Thread Caspar Schutijser

On Tue, Dec 26, 2023 at 08:15:55AM +0100, Landry Breuil wrote:
> Le Sat, Dec 23, 2023 at 04:09:19PM +0100, Caspar Schutijser a écrit :
> > On Sat, Dec 23, 2023 at 09:07:24AM +0100, Landry Breuil wrote:
> > > hi,
> > > 
> > > sending to ports@ for more ideas, devel/sccache works pretty great here,
> > > but for now its client/server model has some issues. from my
> > > understanding, a server is spawned at the first invocation of sccache,
> > > and it runs forever
> > 
> > The running forever should only happen if SCCACHE_IDLE_TIMEOUT is
> > set to 0, as far as I understand. Source:
> > https://github.com/mozilla/sccache/blob/main/docs/Configuration.md
> > 
> > > , or until it had nothing to do and
> > > SCCACHE_IDLE_TIMEOUT expired.
> > > 
> > > i've seen at occasion the make process 'waiting' at the end of the
> > > build, from my understanding because sccache was used and thus a server
> > > was spawned, and the server was still running.  manually killing the
> > > server process allows make build to finish and proceed with make fake.
> > 
> > Does make wait indefinitely or does it succesfully finish after some
> > time?
> 
> i think it finishes, but after the timeout. if a rust file was built
> recently, you end up waiting for nothing..
> 
> > And when you see this problematic behavior, did you set a custom value
> > for SCCACHE_IDLE_TIMEOUT? Did you use any other SCCACHE-related
> > environment variables? I can't remember seeing this behavior myself
> > and I haven't changed SCCACHE_IDLE_TIMEOUT. So I wonder what the
> > relevant difference is between our setups.
> 
> i have SCCACHE_ENV=SCCACHE_CACHE_SIZE="25G" SCCACHE_IDLE_TIMEOUT=1200
> , i'll remove the last one, but im pretty sure if you build a single
> rust port you might see sccache hanging around at the end, waiting for
> the timeout.. which would make sense after all. i dont understand why
> the make process waits for it since its not a child of make anymore.

Apologies for the late answer.

I've tried it a couple of times but I can't reproduce it here...
Really strange. To be clear: I *do* see one sccache process (the
server) still running when a Rust port is done compiling, but
"make package" completes normally without waiting for that process to
exit. I've tried it with the benchmarks/hyperbench and x11/xcolor ports.
Can you try with those ports as well to see if you see the behavior
there? I can try it with a Mozilla too but then I need to write a little
script so that I can verify that the process indeed prevents it from
continuing, while not having to sit behind my screen all the time to
wait for it to happen.

Caspar

CVS: cvs.openbsd.org: ports

2024-01-21 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/01/21 08:06:12

Modified files:
devel/sccache  : Makefile crates.inc distinfo 

Log message:
devel/sccache: update to 0.7.5

CVS: cvs.openbsd.org: ports

2024-01-11 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2024/01/11 11:35:51

Modified files:
net/snowflake_proxy: Makefile distinfo modules.inc 

Log message:
net/snowflake_proxy: update to 2.8.1

And fix the sed invocation in the post-extract target (upstream moved
the relevant code to a different file some time ago).

Re: sccache lifetime & ports infrastructure ?

2023-12-23 Thread Caspar Schutijser

On Sat, Dec 23, 2023 at 09:07:24AM +0100, Landry Breuil wrote:
> hi,
> 
> sending to ports@ for more ideas, devel/sccache works pretty great here,
> but for now its client/server model has some issues. from my
> understanding, a server is spawned at the first invocation of sccache,
> and it runs forever

The running forever should only happen if SCCACHE_IDLE_TIMEOUT is
set to 0, as far as I understand. Source:
https://github.com/mozilla/sccache/blob/main/docs/Configuration.md

> , or until it had nothing to do and
> SCCACHE_IDLE_TIMEOUT expired.
> 
> i've seen at occasion the make process 'waiting' at the end of the
> build, from my understanding because sccache was used and thus a server
> was spawned, and the server was still running.  manually killing the
> server process allows make build to finish and proceed with make fake.

Does make wait indefinitely or does it succesfully finish after some
time?

And when you see this problematic behavior, did you set a custom value
for SCCACHE_IDLE_TIMEOUT? Did you use any other SCCACHE-related
environment variables? I can't remember seeing this behavior myself
and I haven't changed SCCACHE_IDLE_TIMEOUT. So I wonder what the
relevant difference is between our setups.

Caspar

> not a big deal when you do something else, but annoying when you need a
> package *now* :)
> 
> looking at the processes, the sccache process is reparented to init...
> so why is make waiting at the end ?
> 
> root 1  0.0  0.0952   480 ??  I  Thu08AM0:00.02 /sbin/init
> landry   15309  6.3  0.1 133596 39540 ??  S   8:59AM0:17.13 
> -/usr/local/bin/sccache
> 
> some ideas:
> - call sccache --stop-server at the end of make build ?
> - have some magic during the invocation so the make process doesnt wait for 
> it ?
> - have sccache run as an rc.d daemon so that make doesnt need to start one ?
> 
> Landry

CVS: cvs.openbsd.org: ports

2023-12-20 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/12/20 01:08:58

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 
www/tor-browser/noscript: Tag: OPENBSD_7_4 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.7

CVS: cvs.openbsd.org: ports

2023-12-20 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/12/20 01:08:10

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 
www/tor-browser/noscript: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.7

CVS: cvs.openbsd.org: ports

2023-12-06 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/12/06 14:06:45

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.6

CVS: cvs.openbsd.org: ports

2023-12-06 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/12/06 12:44:18

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.6

CVS: cvs.openbsd.org: ports

2023-11-26 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/11/26 14:07:11

Modified files:
net/snowflake_proxy: Makefile distinfo modules.inc 

Log message:
net/snowflake_proxy: update to 2.8.0

CVS: cvs.openbsd.org: ports

2023-11-25 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/11/25 03:24:56

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.5

CVS: cvs.openbsd.org: ports

2023-11-23 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/11/23 09:18:42

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.4

CVS: cvs.openbsd.org: ports

2023-11-22 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/11/22 06:34:09

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.4

Re: Update shelcheck to a ghc-9.6 compatible version from git

2023-11-12 Thread Caspar Schutijser

On Sun, Nov 12, 2023 at 02:13:17PM +0100, Sebastien Marie wrote:
> Caspar Schutijser  writes:
> 
> > Hey,
> >
> > I'm doing a build right now to check the diff. But wouldn't it be
> > better to name it 0.9.0.20231108 instead of 0.9.1.20231108? Because
> > if they release 0.9.1, we'd need EPOCH to make that work, right?
> >
> 
> Please note that packages-spec(7) permits several extra suffix to avoid
> clashes with upstream versioning:
> 
> - patchlevel: 0.9.0pl20231108 (< 0.9.1)
> - pre: 0.9.1pre20231108 (< 0.9.1)
> 
> The full list in order is: rcN, alphaN, betaN, preN, [normal version], plN
> 
> And the full doc is in packages-spec(7) man page as usual.

Something like that would be even better, indeed. Thanks.

Greg: the build succeeded so OK caspar@, provided that you change the
version number as proposed by semarie@. 

Caspar

> -- 
> Sebastien Marie

CVS: cvs.openbsd.org: ports

2023-11-12 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/11/12 05:38:46

Modified files:
devel/sccache  : Makefile 

Log message:
devel/sccache: add NOT_FOR_ARCHS because of rust-ring

Pointed out by and OK tb@

Re: Update shelcheck to a ghc-9.6 compatible version from git

2023-11-12 Thread Caspar Schutijser

Hey,

I'm doing a build right now to check the diff. But wouldn't it be
better to name it 0.9.0.20231108 instead of 0.9.1.20231108? Because
if they release 0.9.1, we'd need EPOCH to make that work, right?

Caspar

On Sun, Nov 12, 2023 at 11:55:55AM +, Greg Steuck wrote:
> OK?
> 
> From 1cf532b4908dc47c03d0cef218821b8339f98571 Mon Sep 17 00:00:00 2001
> From: Greg Steuck 
> Date: Sun, 12 Nov 2023 03:17:05 -0800
> Subject: [PATCH] Update shelcheck to a ghc-9.6 compatible version from git
> 
> I asked for a formal release, but it would be good to be ready
> should we choose to move with 9.6 sooner.
> ---
>  devel/shellcheck/Makefile |  92 +---
>  devel/shellcheck/distinfo | 214 +-
>  2 files changed, 173 insertions(+), 133 deletions(-)
> 
> diff --git a/devel/shellcheck/Makefile b/devel/shellcheck/Makefile
> index f97d3cc5431..5e98a8466da 100644
> --- a/devel/shellcheck/Makefile
> +++ b/devel/shellcheck/Makefile
> @@ -1,12 +1,23 @@
>  COMMENT =shell script analysis tool
>  
> +# https://github.com/koalaman/shellcheck/issues/2860
> +V =  0.9.1.20231108
> +GH_ACCOUNT = koalaman
> +GH_COMMIT =  a71a13c2fca05b822cb16840792dc013ca76493f
> +GH_PROJECT = shellcheck
> +
> +# Overrides cabal.port.mk which would otherwise preempt bsd.port.mk
> +DISTNAME =   ${GH_PROJECT}-${V}
> +DISTFILES =  ${GH_DISTFILE}
> +PKGNAME =${MODCABAL_EXECUTABLES}-${V}
> +SITES =  ${SITES_GITHUB}
> +
>  MODCABAL_STEM =  ShellCheck
> -MODCABAL_VERSION =   0.9.0
> +MODCABAL_VERSION =   ${V}
>  MODCABAL_EXECUTABLES =   shellcheck
>  PKGNAME =${DISTNAME:L}
>  CATEGORIES = devel
>  HOMEPAGE =   https://www.shellcheck.net/
> -REVISION =   0
>  
>  MAINTAINER = Caspar Schutijser 
>  
> @@ -19,47 +30,50 @@ WANTLIB = c ffi gmp iconv m pthread util
>  MODULES =devel/cabal
>  MODCABAL_MANIFEST= \
>   Diff0.4.1   0   \
> - OneTuple0.3.1   3   \
> - QuickCheck  2.14.2  0   \
> + OneTuple0.4.1.1 1   \
> + QuickCheck  2.14.3  0   \
>   StateVar1.2.2   0   \
> - aeson   2.1.1.0 0   \
> - assoc   1.0.2   3   \
> - attoparsec  0.14.4  2   \
> - base-compat 0.12.2  0   \
> - base-compat-batteries   0.12.2  0   \
> - base-orphans0.8.7   0   \
> - bifunctors  5.5.14  0   \
> - comonad 5.0.8   1   \
> + aeson   2.2.1.0 1   \
> + assoc   1.1 1   \
> + base-orphans0.9.1   0   \
> + bifunctors  5.6.1   2   \
> + comonad 5.0.8   2   \
>   contravariant   1.5.5   0   \
> - data-fix0.3.2   3   \
> + data-array-byte 0.1.0.1 2   \
> + data-fix0.3.2   5   \
>   distributive0.6.2.1 1   \
> - dlist   1.0 0   \
> - fgl 5.8.0.0 0   \
> - generically 0.1 0   \
> - hashable1.4.1.0 0   \
> - indexed-traversable 0.1.2   2   \
> - indexed-traversable-instances   0.1.1.1 0   \
> - integer-logarithms  1.0.3.1 3   \
> - primitive   0.7.4.0 0   \
> - random  1.2.1.1 0   \
> - regex-base  0.94.0.21   \
> - regex-tdfa  1.3.2   0   \
> - scientific  0.3.7.0 3   \
> - semialign   1.2.0.1 3   \
> - semigroupoids   5.3.7   0   \
> - splitmix0.1.0.4 1   \
> - strict  0.4.0.1 4   \
> - tagged  0.8.6.1 3   \
> - text-short  0.1.5   1   \
> - th-abstraction  0.4.5.0 0   \
> - these   1.1.1.1 6   \
> - time-compat 1.9.6.1 4   \
> + dlist   1.0 1   \
> + fgl 5.8.2.0 0   \
> + foldable1-classes-compat0.1 4   \
> + generically 0.1.1   2   \
> + hashable1.4.3.0 1   \
> + indexed-traversable 0.1.3   0   \
> + indexed-traversable-instances   0.1.1.2 2   \
> + integer-conversion  0.1.0.1 1   \
> + integer-logarithms  1.0.3.1 5   \
> + network-uri 2.6.4.2 1   \
> + primitive   0.9.0.0 0   \
> + random  1.2.1.1 1   \
> + regex-base  0.94.0.24   \
> + regex-tdfa  1.3.2.2 2   \
> + scientific  0.3.7.0 7   \
> + semialign   1.3 1   \
> + semigroupoids   6.0.0.1 1   \
> + splitmix0.1.0.5 0   \
> + strict  0.5 1   \
> + tagged  0.8.8   0

Firefox shmget pledge violation on arm64 MacBook

2023-11-11 Thread Caspar Schutijser

Hi,

Firefox on my arm64 M1 MacBook (dmesg below) crashes with a
pledge violation when I visit a certain website (no interaction needed,
just wait a couple of seconds for the page to load). On
my amd64 laptops, there is no such issue.

$ firefox https://mijn.ing.nl/
Exiting due to channel error.
Exiting due to channel error.
Exiting due to channel error.
Exiting due to channel error.
Exiting due to channel error.
Abort trap (core dumped)
$ dmesg | tail -1
firefox[91333]: pledge "", syscall 289
$ grep 289 /usr/include/sys/syscall.h 
#define SYS_shmget  289

With some printf() debugging, I found out that the shmget() call
responsible for the pledge violation is in the alloc_shm() function
in xenocara/lib/mesa/src/gallium/winsys/sw/dri/dri_sw_winsys.c.
There's also a backtrace below but there's no debug symbols some part
of it.

So apparently a code path involving shmget() is used on my M1, but
not on my amd64 machines. I don't know enough about the graphics stuff
to know whether the call to shmget() should be expected on the M1.
Does anyone have an idea how to proceed?

Caspar


=== BACKTRACE ===

(gdb) bt
#0  shmget () at /tmp/-:4
#1  0x000a63f42b98 in ?? () from /usr/X11R6/lib/modules/dri/swrast_dri.so
#2  0x000a642a00b0 [PAC] in ?? () from 
/usr/X11R6/lib/modules/dri/swrast_dri.so
#3  0x000a637b748c [PAC] in ?? () from 
/usr/X11R6/lib/modules/dri/swrast_dri.so
#4  0x000a637bd38c [PAC] in ?? () from 
/usr/X11R6/lib/modules/dri/swrast_dri.so
#5  0x000a638d4510 [PAC] in ?? () from 
/usr/X11R6/lib/modules/dri/swrast_dri.so
#6  0x000a638d3f18 [PAC] in ?? () from 
/usr/X11R6/lib/modules/dri/swrast_dri.so
#7  0x000a637b8178 [PAC] in ?? () from 
/usr/X11R6/lib/modules/dri/swrast_dri.so
#8  0x000a637bc708 [PAC] in ?? () from 
/usr/X11R6/lib/modules/dri/swrast_dri.so
#9  0x0009fcd61f78 [PAC] in drisw_bind_context (context=0xa3d948300, 
draw=, read=)
at 
/home/caspar/src/openbsd-xenocara-git/lib/mesa/mk/libGL/../../src/glx/drisw_glx.c:446
#10 0x0009fcd6a868 [PAC] in MakeContextCurrent (dpy=0xa04519000, 
draw=18874452, read=18874452, gc_user=0xa3d948300, opcode=5)
at 
/home/caspar/src/openbsd-xenocara-git/lib/mesa/mk/libGL/../../src/glx/glxcurrent.c:203
#11 0x000ae4d11448 [PAC] in mozilla::gl::GLXLibrary::fMakeCurrent 
(this=0x121, drawable=16384, context=0x380, display=)
at /home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLXLibrary.h:68
#12 mozilla::gl::GLContextGLX::MakeCurrentImpl (this=0xa68a96550) at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLContextProviderGLX.cpp:473
#13 0x000ae61bbd04 [PAC] in mozilla::gl::GLContext::MakeCurrent 
(this=0xa68a96550, aForce=)
at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLContext.cpp:2443
#14 0x000ae5d71048 [PAC] in mozilla::gl::GLContext::InitImpl 
(this=0xa68a96550)
at /home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLContext.cpp:374
#15 0x000ae5b51d9c [PAC] in mozilla::gl::GLContext::Init (this=0xa68a96550) 
at /home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLContext.cpp:326
#16 0x000ae61b9034 [PAC] in mozilla::gl::GLContextGLX::Init 
(this=0xa68a96550)
at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLContextProviderGLX.cpp:453
#17 0x000ae4d11398 [PAC] in 
mozilla::gl::GLContextGLX::CreateGLContext(mozilla::gl::GLContextDesc const&, 
std::__1::shared_ptr, unsigned long, 
__GLXFBConfigRec*, unsigned long)::$_1::operator()(std::__1::vector > const&) const (this=, 
attribs=...) at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLContextProviderGLX.cpp:351
#18 0x000ae61ba090 [PAC] in mozilla::gl::GLContextGLX::CreateGLContext 
(desc=..., display=..., drawable=, cfg=, 
ownedPixmap=) at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLContextProviderGLX.cpp:417
#19 0x000ae61ba650 [PAC] in mozilla::gl::CreateOffscreenPixmapContext 
(desc=..., size=..., out_failureId=)
at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLContextProviderGLX.cpp:884
#20 mozilla::gl::GLContextProviderGLX::CreateHeadless (desc=..., 
out_failureId=)
at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/gfx/gl/GLContextProviderGLX.cpp:892
#21 0x000ae67bb864 [PAC] in mozilla::WebGLContext::CreateAndInitGL(bool, 
std::__1::vector 
>*)::$_32::operator()(already_AddRefed 
(*)(mozilla::gl::GLContextCreateDesc const&, nsTSubstring*), char const*) 
const (this=, pfnCreate=, info=)
at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/dom/canvas/WebGLContext.cpp:380
#22 mozilla::WebGLContext::CreateAndInitGL(bool, 
std::__1::vector 
>*)::$_6::operator()() const (this=) at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/dom/canvas/WebGLContext.cpp:393
#23 mozilla::WebGLContext::CreateAndInitGL (this=0xa28657610, 
out_failReasons=0xa2bca2ae8, forceEnabled=)
at 
/home/ports/pobj/firefox-119.0.1/firefox-119.0.1/dom/canvas/WebGLContext.cpp:387
#24

CVS: cvs.openbsd.org: ports

2023-11-10 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/11/10 05:34:50

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
bsd.port.mk: add infrastructure for using sccache in Rust port builds

Suggestion to add whitespace around CCACHE and SCCACHE blocks from kn@
OK landry@ kn@

Re: bsd.port.mk bits for sccache

2023-11-10 Thread Caspar Schutijser

On Fri, Nov 10, 2023 at 12:09:27PM +, Klemens Nanni wrote:
> On Fri, Nov 10, 2023 at 12:58:14PM +0100, Caspar Schutijser wrote:
> > Alright, thanks. Diff for that below (should be obvious). I also tweaked
> > the manual page a little bit; at the bottom of the diff, I mention that
> > USE_SCCACHE=Yes sets it up specifically for Rust (otherwise, people
> > may expect it to cache results for C and C++ too, which is not true).
> 
> Thanks, forgot about the manual.
> OK kn, suggestion inline.
> 
> > Index: bsd.port.mk.5
> > ===
> > RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> > retrieving revision 1.638
> > diff -u -p -r1.638 bsd.port.mk.5
> > --- bsd.port.mk.5   2 Nov 2023 16:14:46 -   1.638
> > +++ bsd.port.mk.5   10 Nov 2023 11:55:20 -
> > @@ -2523,6 +2523,13 @@ See also
> >  .Ev IGNORE
> >  and
> >  .Ev TRY_BROKEN .
> > +.It Ev NO_SCCACHE
> > +Set to
> > +.Sq Yes
> > +to prevent sccache from being used when building a certain port,
> > +even when
> > +.Ev USE_SCCACHE
> > +is set.
> >  .It Ev NO_TEST
> >  Port does not have any regression tests.
> >  Only set to
> > @@ -3171,6 +3178,15 @@ The corresponding packages will be built
> >  stage, and
> >  .Xr pkg_add 1
> >  will take care of installing them.
> > +.It Ev SCCACHE_DIR
> > +Sets the cache directory used when
> > +.Ev USE_SCCACHE
> > +is set to yes.
> > +Defaults to ${WRKOBJDIR}/.sccache.
> > +.It Ev SCCACHE_ENV
> > +Sets additional environment variables when
> > +.Ev USE_SCCACHE
> > +is set to yes.
> >  .It Ev SEPARATE_BUILD
> >  Many GNU configure ports can be built in a directory distinct from the
> >  place they were unpacked.
> > @@ -3656,6 +3672,12 @@ adding
> >  .Fl -no-execute-only .
> >  Use when a port does not work with execute-only (unreadable) code sections
> >  which are used by default by the linker on some architectures.
> > +.It Ev USE_SCCACHE
> > +User settings.
> > +Set to
> > +.Sq Yes
> > +to use sccache when building ports.
> > +Sets up the build environment so that it is used for Rust code.
> 
> This save a sentence and better distinguishes from the ccache wording:
> +to usse sccache when buildding Rust ports.

Thanks, I've updated that in my tree.

Caspar

Re: bsd.port.mk bits for sccache

2023-11-10 Thread Caspar Schutijser

On Thu, Nov 09, 2023 at 06:37:49PM +, Klemens Nanni wrote:
> On Thu, Nov 09, 2023 at 07:26:41PM +0100, Caspar Schutijser wrote:
> > On Thu, Nov 09, 2023 at 05:54:33PM +0100, Caspar Schutijser wrote:
> > > Hi all,
> > > 
> > > Below is a diff for bsd.port.mk that allows us to set USE_SCCACHE=Yes
> > > in /etc/mk.conf to use sccache. Manual page updates are included,
> > > which I copied and adapted from the ccache bits.
> > > 
> > > Note that with the diff below, sccache is only used for Rust code,
> > > not for C/C++ (which sccache also supports). So at least at this
> > > moment, USE_CCACHE=Yes and USE_SCCACHE=Yes don't bite each other
> > > (ccache will cache C/C++ compilation results, sccache will cache
> > > Rust compilation results). This may change later if we want to use
> > > sccache for C/C++ too, which at the moment does not work yet.
> > > 
> > > Another thing to note is that sccache uses a client-server model;
> > > quote from the README:
> > > 
> > > > sccache works using a client-server model, where the server runs
> > > > locally on the same machine as the client. The client-server model
> > > > allows the server to be more efficient by keeping some state in
> > > > memory. The sccache command will spawn a server process if one is
> > > > not already running, or you can run sccache --start-server to start
> > > > the background server process without performing any compilation.
> > > > 
> > > > You can run sccache --stop-server to terminate the server. It will
> > > > also terminate after (by default) 10 minutes of inactivity.
> > > 
> > > So don't be surprised if a sccache process is still running when
> > > you hit ^C on the compilation process.
> > > 
> > > I have used this now for quite some time and I didn't find any
> > > problems so far. Comments or OKs?
> > > 
> > > First follows the diff for bsd.port.mk, and after that the diff for
> > > its manual page.
> > 
> > Here is an updated diff. kn@ made good point: a "normal" user may
> > use sccache too, but then that user would end up using _pbuild's
> > instance of sccache because sccache communicates over TCP and by
> > default uses port 4226 (or the other way around, whichever starts the
> > sccache server first). I picked 44226 as the port number that we'll
> > use for bsd.port.mk. I don't think we need to document this.
> > Unfortunately there's no way to communicate over a socket, which
> > I would have preferred over using TCP for this.
> 
> That makes sense, thanks.
> 
> > 
> > Comments or OKs on this version?
> 
> OK kn, but I'd also add blank lines around the ccache and sccache blocks.

Alright, thanks. Diff for that below (should be obvious). I also tweaked
the manual page a little bit; at the bottom of the diff, I mention that
USE_SCCACHE=Yes sets it up specifically for Rust (otherwise, people
may expect it to cache results for C and C++ too, which is not true).

Comments or OKs?

Caspar


Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1630
diff -u -p -r1.1630 bsd.port.mk
--- bsd.port.mk 26 Oct 2023 19:26:56 -  1.1630
+++ bsd.port.mk 10 Nov 2023 11:52:50 -
@@ -228,6 +228,7 @@ PARALLEL_MAKE_FLAGS ?= -j${MAKE_JOBS}
 TRY_BROKEN ?= No
 
 USE_CCACHE ?= No
+USE_SCCACHE ?= No
 
 WARNINGS ?= no
 
@@ -436,6 +437,7 @@ MAKE_FLAGS += LIBTOOL="${_LIBTOOL}" ${_l
 .endif
 # log for the SHARED_LIBS override
 MAKE_FLAGS += SHARED_LIBS_LOG=${WRKBUILD}/shared_libs.log
+
 NO_CCACHE ?= No
 CCACHE_ENV ?=
 .if ${USE_CCACHE:L} == "yes" && ${NO_CCACHE:L} == "no" && ${NO_BUILD:L} == "no"
@@ -446,6 +448,18 @@ CONFIGURE_ENV += CCACHE_DIR=${CCACHE_DIR
 COMPILER_WRAPPER += env CCACHE_DIR=${CCACHE_DIR} ${CCACHE_ENV} ccache
 .  if !exists(${LOCALBASE}/bin/ccache)
 ERRORS += "Fatal: USE_CCACHE is set, but ccache is not installed."
+.  endif
+.endif
+
+NO_SCCACHE ?= No
+SCCACHE_ENV ?=
+.if ${USE_SCCACHE:L} == "yes" && ${NO_SCCACHE:L} == "no" && ${NO_BUILD:L} == 
"no"
+SCCACHE_DIR ?= ${WRKOBJDIR_${PKGPATH}}/.sccache
+MAKE_ENV += SCCACHE_SERVER_PORT=44226 SCCACHE_DIR=${SCCACHE_DIR} ${SCCACHE_ENV}
+MAKE_ENV += RUSTC_WRAPPER=${LOCALBASE}/bin/sccache
+CONFIGURE_ENV += SCCACHE_SERVER_PORT=44226 SCCACHE_DIR=${SCCACHE_DIR}
+.  if !exists(${LOCALBASE}/bin/sccache)
+ERRORS += "Fatal: USE_SCCACHE is set, but sccache is not installed."
 .  endif
 .endif
 

Index: bsd.port.mk.5

Re: bsd.port.mk bits for sccache

2023-11-09 Thread Caspar Schutijser

On Thu, Nov 09, 2023 at 05:54:33PM +0100, Caspar Schutijser wrote:
> Hi all,
> 
> Below is a diff for bsd.port.mk that allows us to set USE_SCCACHE=Yes
> in /etc/mk.conf to use sccache. Manual page updates are included,
> which I copied and adapted from the ccache bits.
> 
> Note that with the diff below, sccache is only used for Rust code,
> not for C/C++ (which sccache also supports). So at least at this
> moment, USE_CCACHE=Yes and USE_SCCACHE=Yes don't bite each other
> (ccache will cache C/C++ compilation results, sccache will cache
> Rust compilation results). This may change later if we want to use
> sccache for C/C++ too, which at the moment does not work yet.
> 
> Another thing to note is that sccache uses a client-server model;
> quote from the README:
> 
> > sccache works using a client-server model, where the server runs
> > locally on the same machine as the client. The client-server model
> > allows the server to be more efficient by keeping some state in
> > memory. The sccache command will spawn a server process if one is
> > not already running, or you can run sccache --start-server to start
> > the background server process without performing any compilation.
> > 
> > You can run sccache --stop-server to terminate the server. It will
> > also terminate after (by default) 10 minutes of inactivity.
> 
> So don't be surprised if a sccache process is still running when
> you hit ^C on the compilation process.
> 
> I have used this now for quite some time and I didn't find any
> problems so far. Comments or OKs?
> 
> First follows the diff for bsd.port.mk, and after that the diff for
> its manual page.

Here is an updated diff. kn@ made good point: a "normal" user may
use sccache too, but then that user would end up using _pbuild's
instance of sccache because sccache communicates over TCP and by
default uses port 4226 (or the other way around, whichever starts the
sccache server first). I picked 44226 as the port number that we'll
use for bsd.port.mk. I don't think we need to document this.
Unfortunately there's no way to communicate over a socket, which
I would have preferred over using TCP for this.

Comments or OKs on this version?

Caspar


Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1630
diff -u -p -r1.1630 bsd.port.mk
--- bsd.port.mk 26 Oct 2023 19:26:56 -  1.1630
+++ bsd.port.mk 9 Nov 2023 18:25:52 -
@@ -228,6 +228,7 @@ PARALLEL_MAKE_FLAGS ?= -j${MAKE_JOBS}
 TRY_BROKEN ?= No
 
 USE_CCACHE ?= No
+USE_SCCACHE ?= No
 
 WARNINGS ?= no
 
@@ -446,6 +447,17 @@ CONFIGURE_ENV += CCACHE_DIR=${CCACHE_DIR
 COMPILER_WRAPPER += env CCACHE_DIR=${CCACHE_DIR} ${CCACHE_ENV} ccache
 .  if !exists(${LOCALBASE}/bin/ccache)
 ERRORS += "Fatal: USE_CCACHE is set, but ccache is not installed."
+.  endif
+.endif
+NO_SCCACHE ?= No
+SCCACHE_ENV ?=
+.if ${USE_SCCACHE:L} == "yes" && ${NO_SCCACHE:L} == "no" && ${NO_BUILD:L} == 
"no"
+SCCACHE_DIR ?= ${WRKOBJDIR_${PKGPATH}}/.sccache
+MAKE_ENV += SCCACHE_SERVER_PORT=44226 SCCACHE_DIR=${SCCACHE_DIR} ${SCCACHE_ENV}
+MAKE_ENV += RUSTC_WRAPPER=${LOCALBASE}/bin/sccache
+CONFIGURE_ENV += SCCACHE_SERVER_PORT=44226 SCCACHE_DIR=${SCCACHE_DIR}
+.  if !exists(${LOCALBASE}/bin/sccache)
+ERRORS += "Fatal: USE_SCCACHE is set, but sccache is not installed."
 .  endif
 .endif

bsd.port.mk bits for sccache

2023-11-09 Thread Caspar Schutijser

Hi all,

Below is a diff for bsd.port.mk that allows us to set USE_SCCACHE=Yes
in /etc/mk.conf to use sccache. Manual page updates are included,
which I copied and adapted from the ccache bits.

Note that with the diff below, sccache is only used for Rust code,
not for C/C++ (which sccache also supports). So at least at this
moment, USE_CCACHE=Yes and USE_SCCACHE=Yes don't bite each other
(ccache will cache C/C++ compilation results, sccache will cache
Rust compilation results). This may change later if we want to use
sccache for C/C++ too, which at the moment does not work yet.

Another thing to note is that sccache uses a client-server model;
quote from the README:

> sccache works using a client-server model, where the server runs
> locally on the same machine as the client. The client-server model
> allows the server to be more efficient by keeping some state in
> memory. The sccache command will spawn a server process if one is
> not already running, or you can run sccache --start-server to start
> the background server process without performing any compilation.
> 
> You can run sccache --stop-server to terminate the server. It will
> also terminate after (by default) 10 minutes of inactivity.

So don't be surprised if a sccache process is still running when
you hit ^C on the compilation process.

I have used this now for quite some time and I didn't find any
problems so far. Comments or OKs?

First follows the diff for bsd.port.mk, and after that the diff for
its manual page.

Caspar


Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1630
diff -u -p -r1.1630 bsd.port.mk
--- bsd.port.mk 26 Oct 2023 19:26:56 -  1.1630
+++ bsd.port.mk 9 Nov 2023 16:18:45 -
@@ -228,6 +228,7 @@ PARALLEL_MAKE_FLAGS ?= -j${MAKE_JOBS}
 TRY_BROKEN ?= No
 
 USE_CCACHE ?= No
+USE_SCCACHE ?= No
 
 WARNINGS ?= no
 
@@ -446,6 +447,17 @@ CONFIGURE_ENV += CCACHE_DIR=${CCACHE_DIR
 COMPILER_WRAPPER += env CCACHE_DIR=${CCACHE_DIR} ${CCACHE_ENV} ccache
 .  if !exists(${LOCALBASE}/bin/ccache)
 ERRORS += "Fatal: USE_CCACHE is set, but ccache is not installed."
+.  endif
+.endif
+NO_SCCACHE ?= No
+SCCACHE_ENV ?=
+.if ${USE_SCCACHE:L} == "yes" && ${NO_SCCACHE:L} == "no" && ${NO_BUILD:L} == 
"no"
+SCCACHE_DIR ?= ${WRKOBJDIR_${PKGPATH}}/.sccache
+MAKE_ENV += SCCACHE_DIR=${SCCACHE_DIR} ${SCCACHE_ENV}
+MAKE_ENV += RUSTC_WRAPPER=${LOCALBASE}/bin/sccache
+CONFIGURE_ENV += SCCACHE_DIR=${SCCACHE_DIR}
+.  if !exists(${LOCALBASE}/bin/sccache)
+ERRORS += "Fatal: USE_SCCACHE is set, but sccache is not installed."
 .  endif
 .endif
 


Index: bsd.port.mk.5
===
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.638
diff -u -p -r1.638 bsd.port.mk.5
--- bsd.port.mk.5   2 Nov 2023 16:14:46 -   1.638
+++ bsd.port.mk.5   9 Nov 2023 16:19:23 -
@@ -2523,6 +2523,13 @@ See also
 .Ev IGNORE
 and
 .Ev TRY_BROKEN .
+.It Ev NO_SCCACHE
+Set to
+.Sq Yes
+to prevent sccache from being used when building a certain port,
+even when
+.Ev USE_SCCACHE
+is set.
 .It Ev NO_TEST
 Port does not have any regression tests.
 Only set to
@@ -3171,6 +3178,15 @@ The corresponding packages will be built
 stage, and
 .Xr pkg_add 1
 will take care of installing them.
+.It Ev SCCACHE_DIR
+Sets the cache directory used when
+.Ev USE_SCCACHE
+is set to yes.
+Defaults to ${WRKOBJDIR}/.sccache.
+.It Ev SCCACHE_ENV
+Sets additional environment variables when
+.Ev USE_SCCACHE
+is set to yes.
 .It Ev SEPARATE_BUILD
 Many GNU configure ports can be built in a directory distinct from the
 place they were unpacked.
@@ -3656,6 +3672,12 @@ adding
 .Fl -no-execute-only .
 Use when a port does not work with execute-only (unreadable) code sections
 which are used by default by the linker on some architectures.
+.It Ev USE_SCCACHE
+User settings.
+Set to
+.Sq Yes
+to use sccache when building ports.
+Sets up the build environment so that it is used.
 .It Ev USE_WXNEEDED
 If set to
 .Sq Yes ,

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/11/08 11:24:23

Modified files:
devel  : Makefile 

Log message:
+sccache

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/11/08 11:20:53

Log message:
Import devel/sccache

sccache is a ccache-like compiler caching tool. It is used as a compiler
wrapper and avoids compilation when possible, storing cached results
either on local disk or in one of several cloud storage backends.

sccache includes support for caching the compilation of C/C++ code & Rust.

With help from tb@, semarie@ and landry@
OK kn@ landry@

Status:

Vendor Tag: caspar
Release Tags:   caspar_20231108

N ports/devel/sccache/Makefile
N ports/devel/sccache/crates.inc
N ports/devel/sccache/distinfo
N ports/devel/sccache/pkg/DESCR
N ports/devel/sccache/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/11/08 08:31:02

Modified files:
net/snowflake_proxy: Makefile distinfo modules.inc 

Log message:
net/snowflake_proxy: update to 2.7.0

NEW: devel/sccache

2023-11-08 Thread Caspar Schutijser

On Mon, Nov 06, 2023 at 07:45:06AM +, Klemens Nanni wrote:
> On Tue, Sep 05, 2023 at 12:11:56PM +0200, Caspar Schutijser wrote:
> > On Tue, Sep 05, 2023 at 08:42:34AM +0200, Landry Breuil wrote:
> > > Le Mon, Sep 04, 2023 at 05:13:19PM +0200, Landry Breuil a écrit :
> > > > Le Mon, Sep 04, 2023 at 04:58:49PM +0200, Caspar Schutijser a écrit :
> > > > > Hi,
> > > > > 
> > > > > I started porting sccache <https://github.com/mozilla/sccache/>,
> > > > > a ccache-like tool that a.o. supports many storage backends but
> > > > > also (more importantly) caching Rust compilation objects. I hope that
> > > > > eventually we can use something like USE_SCCACHE for Rust projects
> > > > > (WIP, untested diff for bsd.port.mk below).
> > > > > 
> > > > > The attached port does not build yet and I can't immediately find
> > > > > out how to fix it (trace of build failure below). I'm sending it
> > > > > to the list just in case someone else is interested.
> > > > 
> > > > it fails because it looks for -lzstd but nothing tells it where to find
> > > > it (eg missing -L/usr/local/lib somewhere id say)
> > > 
> > > fixed version with WANTLIB/LDEP/DESCR, with the help of tb and semarie
> > > on icb.
> > 
> > Thanks! That looks much better. With this new version and the
> > bsd.port.mk diff that I sent earlier, I was able to use USE_SCCACHE=Yes
> > and see the second compilation of the benchmarks/hyperfine port
> > (a Rust port) being much faster. So it seems like it actually works.
> > Later I'll test it with a more complicated port, like one of the
> > Mozillas.
> > 
> > Now we "just" need updates to bsd.port.mk.5 and then I think it would
> > be close to committable shape. I may have a look at that today if time
> > permits.
> > 
> > Caspar
> > 
> 
> Did this go anywhere?
> devel/sccache could be imported independently of bsd.port.mk bits, no?
> The last tarball looks fine to me, I was just trying to use this for
> local development.

The version landry@ sent indeed looked pretty good. In the attached
tarball, there's the following changes: I took MAINTAINER, I updated
sccache to version 0.7.1 and I used the modcargo-gen-crates-licenses
make target to generate crates.inc.

OK to import, or comments?

Caspar



sccache-0.7.1.tgz
Description: application/tar-gz

Re: WIP: devel/sccache

2023-11-06 Thread Caspar Schutijser

Hi,

On Mon, Nov 06, 2023 at 07:45:06AM +, Klemens Nanni wrote:
> On Tue, Sep 05, 2023 at 12:11:56PM +0200, Caspar Schutijser wrote:
> > On Tue, Sep 05, 2023 at 08:42:34AM +0200, Landry Breuil wrote:
> > > Le Mon, Sep 04, 2023 at 05:13:19PM +0200, Landry Breuil a ?crit :
> > > > Le Mon, Sep 04, 2023 at 04:58:49PM +0200, Caspar Schutijser a ?crit :
> > > > > Hi,
> > > > > 
> > > > > I started porting sccache <https://github.com/mozilla/sccache/>,
> > > > > a ccache-like tool that a.o. supports many storage backends but
> > > > > also (more importantly) caching Rust compilation objects. I hope that
> > > > > eventually we can use something like USE_SCCACHE for Rust projects
> > > > > (WIP, untested diff for bsd.port.mk below).
> > > > > 
> > > > > The attached port does not build yet and I can't immediately find
> > > > > out how to fix it (trace of build failure below). I'm sending it
> > > > > to the list just in case someone else is interested.
> > > > 
> > > > it fails because it looks for -lzstd but nothing tells it where to find
> > > > it (eg missing -L/usr/local/lib somewhere id say)
> > > 
> > > fixed version with WANTLIB/LDEP/DESCR, with the help of tb and semarie
> > > on icb.
> > 
> > Thanks! That looks much better. With this new version and the
> > bsd.port.mk diff that I sent earlier, I was able to use USE_SCCACHE=Yes
> > and see the second compilation of the benchmarks/hyperfine port
> > (a Rust port) being much faster. So it seems like it actually works.
> > Later I'll test it with a more complicated port, like one of the
> > Mozillas.
> > 
> > Now we "just" need updates to bsd.port.mk.5 and then I think it would
> > be close to committable shape. I may have a look at that today if time
> > permits.
> > 
> > Caspar
> > 
> 
> Did this go anywhere?
> devel/sccache could be imported independently of bsd.port.mk bits, no?

You are right about that. I'll send a cleaned-up version to ports@
in a few days so that it indeed can be imported.

Caspar

> The last tarball looks fine to me, I was just trying to use this for
> local development.

CVS: cvs.openbsd.org: ports

2023-10-27 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/10/27 09:57:53

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 

Log message:
Tor Browser: update to 13.0.1

And backport commit to -current:
"Tor Browser: install Tor Browser icons instead of Firefox'"

CVS: cvs.openbsd.org: ports

2023-10-27 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/10/27 09:56:48

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 13.0.1

CVS: cvs.openbsd.org: ports

2023-10-21 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/10/21 07:53:59

Modified files:
audio/audacity : Makefile 
Added files:
audio/audacity/patches: 

patch-libraries_lib-ffmpeg-support_FFmpegFunctions_cpp 

Log message:
audio/audacity: fix loading of ffmpeg library

OK sthen@

audio/audacity: fix loading of ffmpeg libraries

2023-10-21 Thread Caspar Schutijser

Hi all,

Here is a diff for a patch that got lost with an earlier
update, similar to what espie@ fixed a couple of days ago for
libmp3lame. As an example, with this, I can open a MKV file again
successfully.

Comments or OKs?

Caspar


Index: Makefile
===
RCS file: /cvs/ports/audio/audacity/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile18 Oct 2023 15:51:05 -  1.93
+++ Makefile21 Oct 2023 12:22:53 -
@@ -6,7 +6,7 @@ GH_ACCOUNT= audacity
 GH_PROJECT=audacity
 GH_TAGNAME=Audacity-3.3.3
 DISTNAME=  ${GH_TAGNAME:L}
-REVISION=  1
+REVISION=  2
 
 CATEGORIES=audio
 
Index: patches/patch-libraries_lib-ffmpeg-support_FFmpegFunctions_cpp
===
RCS file: patches/patch-libraries_lib-ffmpeg-support_FFmpegFunctions_cpp
diff -N patches/patch-libraries_lib-ffmpeg-support_FFmpegFunctions_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libraries_lib-ffmpeg-support_FFmpegFunctions_cpp  21 Oct 
2023 12:22:53 -
@@ -0,0 +1,12 @@
+Index: libraries/lib-ffmpeg-support/FFmpegFunctions.cpp
+--- libraries/lib-ffmpeg-support/FFmpegFunctions.cpp.orig
 libraries/lib-ffmpeg-support/FFmpegFunctions.cpp
+@@ -132,7 +132,7 @@ std::vector BuildAVFormatPaths(int version)
+   wxString::Format("libavformat.%d.dylib", version),
+   wxString::Format("ffmpeg.%d.64bit.dylib", version),
+ #else
+-  wxString::Format("libavformat.so.%d", version)
++  wxString::Format("libavformat.so"),
+ #endif
+ };
+ }

CVS: cvs.openbsd.org: ports

2023-10-21 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/10/21 06:02:11

Modified files:
www/tor-browser/browser: Makefile 

Log message:
Tor Browser: install Tor Browser icons instead of Firefox'

and maybe fixes other branding issues too. Reported by george@.

CVS: cvs.openbsd.org: ports

2023-10-21 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/10/21 05:55:51

Modified files:
meta/tor-browser: Tag: OPENBSD_7_4 Makefile 
www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo 
www/tor-browser/browser/files: Tag: OPENBSD_7_4 pledge.utility 
   pledge.utility-audioDecoder 
   unveil.utility 
   unveil.utility-audioDecoder 
www/tor-browser/browser/patches: Tag: OPENBSD_7_4 
 
patch-browser_app_profile_000-tor-browser_js 
 
patch-browser_config_mozconfigs_base-browser 
 
patch-browser_config_mozconfigs_tor-browser 
 patch-config_makefiles_rust_mk 
 
patch-media_ffvpx_libavcodec_x86_fft_asm 
 patch-toolkit_moz_configure 
 patch-toolkit_xre_nsXREDirProvider_cpp 
 
patch-xpcom_io_nsAppFileLocationProvider_cpp 
www/tor-browser/browser/pkg: Tag: OPENBSD_7_4 PLIST 
Added files:
www/tor-browser/browser/patches: Tag: OPENBSD_7_4 
 
patch-js_src_ctypes_libffi_src_dlmalloc_c 
 
patch-toolkit_components_downloads_DownloadIntegration_sys_mjs 
 
patch-toolkit_components_tor-launcher_TorProcess_sys_mjs 
 patch-toolkit_xre_glxtest_glxtest_cpp 
Removed files:
www/tor-browser/browser/patches: Tag: OPENBSD_7_4 
 
patch-js_src_jit_ProcessExecutableMemory_h 
 
patch-toolkit_components_downloads_DownloadIntegration_jsm 
 
patch-toolkit_components_downloads_DownloadUIHelper_jsm 
 
patch-toolkit_components_processtools_ProcInfo_linux_cpp 
 
patch-toolkit_components_tor-launcher_TorProcess_jsm 
 
patch-toolkit_system_gnome_nsGIOService_cpp 
 patch-toolkit_xre_glxtest_cpp 
 patch-xpcom_build_BinaryPath_h 

Log message:
Tor Browser: update to 13.0

CVS: cvs.openbsd.org: ports

2023-10-19 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/10/19 09:54:24

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 
www/tor-browser/browser/files: pledge.utility unveil.utility 
www/tor-browser/browser/patches: 
 
patch-browser_app_profile_000-tor-browser_js 
 
patch-browser_config_mozconfigs_base-browser 
 
patch-browser_config_mozconfigs_tor-browser 
 patch-config_makefiles_rust_mk 
 
patch-media_ffvpx_libavcodec_x86_fft_asm 
 patch-toolkit_moz_configure 
 patch-toolkit_xre_nsXREDirProvider_cpp 
 
patch-xpcom_io_nsAppFileLocationProvider_cpp 
www/tor-browser/browser/pkg: PLIST 
Added files:
www/tor-browser/browser/patches: 
 
patch-js_src_ctypes_libffi_src_dlmalloc_c 
 
patch-toolkit_components_downloads_DownloadIntegration_sys_mjs 
 
patch-toolkit_components_tor-launcher_TorProcess_sys_mjs 
 patch-toolkit_xre_glxtest_glxtest_cpp 
Removed files:
www/tor-browser/browser/files: pledge.utility-audioDecoder 
   unveil.utility-audioDecoder 
www/tor-browser/browser/patches: 
 
patch-js_src_jit_ProcessExecutableMemory_h 
 
patch-toolkit_components_downloads_DownloadIntegration_jsm 
 
patch-toolkit_components_downloads_DownloadUIHelper_jsm 
 
patch-toolkit_components_processtools_ProcInfo_linux_cpp 
 
patch-toolkit_components_tor-launcher_TorProcess_jsm 
 
patch-toolkit_system_gnome_nsGIOService_cpp 
 patch-toolkit_xre_glxtest_cpp 
 patch-xpcom_build_BinaryPath_h 

Log message:
Tor Browser: update to 13.0

UPDATE: Tor Browser 13.0

2023-10-17 Thread Caspar Schutijser

Hi,

Below is a diff that updates Tor Browser to 13.0. The 13.0 series is
based on the new Firefox ESR (version 115).

Release notes:
https://blog.torproject.org/new-release-tor-browser-130/

Test reports or feedback is welcome!

Comments or OKs? Diff for -stable is almost identical (except for the
BUILD_DEPENDS commit to -current a couple of days ago) so I won't send
a separate diff for that.

Right now a build is still running with the
--with-branding=browser/branding/tb-release flag added to
CONFIGURE_ARGS to hopefully fix the branding of the UI (and possibly
also of the icons that are installed, as reported by george@) but that's
a minor change and I wanted to send this out already.

Caspar 


Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.77
diff -u -p -r1.77 Makefile
--- meta/tor-browser/Makefile   29 Sep 2023 18:01:17 -  1.77
+++ meta/tor-browser/Makefile   17 Oct 2023 16:15:45 -
@@ -2,11 +2,11 @@ COMMENT=  Tor Browser meta package
 
 MAINTAINER=Caspar Schutijser 
 
-PKGNAME=   tor-browser-12.5.6
+PKGNAME=   tor-browser-13.0
 ONLY_FOR_ARCHS =   aarch64 amd64
 
-RUN_DEPENDS=   www/tor-browser/browser>=12.5.6 \
+RUN_DEPENDS=   www/tor-browser/browser>=13.0 \
www/tor-browser/noscript>=11.4.27 \
-   net/tor>=0.4.7.13
+   net/tor>=0.4.8.7
 
 .include 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile.inc
--- www/tor-browser/Makefile.inc29 Sep 2023 18:01:18 -  1.74
+++ www/tor-browser/Makefile.inc17 Oct 2023 16:15:45 -
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
 PERMIT_PACKAGE ?=  Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   12.5.6
+TB_VERSION =   13.0
 TB_PREFIX =tb
 
 # keep meta/tor-browser in sync
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.123
diff -u -p -r1.123 Makefile
--- www/tor-browser/browser/Makefile16 Oct 2023 14:07:51 -  1.123
+++ www/tor-browser/browser/Makefile17 Oct 2023 16:15:45 -
@@ -11,14 +11,14 @@ MOZILLA_CODENAME =  browser
 EXTRACT_SUFX = .tar.xz
 
 PKGNAME =  ${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/}
-DISTNAME = src-firefox-tor-browser-102.15.1esr-12.5-1-build3
+DISTNAME = src-firefox-tor-browser-115.3.1esr-13.0-1-build2
 
 FIX_EXTRACT_PERMISSIONS= Yes
 DISTFILES +=   ${DISTNAME}.tar.xz \
-   tor-browser-linux64-${TB_VERSION}_ALL.tar.xz \
-   tor-expert-bundle-${TB_VERSION}-linux-x86_64.tar.gz
+   tor-browser-linux-x86_64-${TB_VERSION}.tar.xz \
+   tor-expert-bundle-linux-x86_64-${TB_VERSION}.tar.gz
 
-SO_VERSION =   8.0
+SO_VERSION =   9.0
 MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
 MOZILLA_LIBS +=freebl3 nss3 nssckbi
 MOZILLA_LIBS +=nssutil3 smime3 softokn3 ssl3
@@ -49,6 +49,7 @@ BUILD_DEPENDS +=  lang/wasi-sdk/compiler-
lang/wasi-libc
 # mach uses pkg_resources
 BUILD_DEPENDS +=   devel/py-setuptools${MODPY_FLAVOR}
+BUILD_DEPENDS +=   textproc/jq
 
 # uses pledge()
 # Extra:  Xcomposite.4 Xcursor.5 Xdamage.4 Xfixes.6 Xi.12 Xrender.6
@@ -67,7 +68,8 @@ CONFIGURE_ENV +=  LDFLAGS=-Wl,--threads=$
 
 # app-name etc. for tor-browser
 CONFIGURE_ARGS +=  --with-app-name=${BROWSER_NAME} \
-   --with-base-browser-version=${TB_VERSION}
+   --with-base-browser-version=${TB_VERSION}   \
+   --enable-update-channel=release
 
 # for nss build system
 MAKE_ENV +=BUILD_OPT=1 \
@@ -77,7 +79,7 @@ MAKE_ENV +=   BUILD_OPT=1 \
 
 RUN_DEPENDS += net/obfs4proxy>=0.0.14 \
net/snowflake_proxy>=2.4.1 \
-   net/tor>=0.4.7.13
+   net/tor>=0.4.8.7
 
 CONFIGURE_ARGS +=  --enable-release #1386371
 CONFIGURE_ARGS +=  --enable-sandbox
@@ -111,16 +113,12 @@ post-patch:
# add default bridges for Pluggable Transports that we support
 .for pt in meek-azure obfs4 snowflake
I=1; \
-   cat ${WRKDIR}/tor/pluggable_transports/bridges_list.${pt}.txt | while 
read -r line ; do \
-   echo "pref(\"extensions.torlauncher.default_bridge.${pt}.$$I\", 
\"$$line\");" >>${WRKSRC}/browser/app/profile/000-tor-browser.js; \
+   jq ".[\"bridges\"][\"$

CVS: cvs.openbsd.org: ports

2023-10-16 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/10/16 08:07:51

Modified files:
www/tor-browser/browser: Makefile 

Log message:
Tor Browser: add missing BDEP on py3-setuptools

Reported by naddy@, fix from landry@ (already in www/mozilla-firefox
since Dec 2022)

CVS: cvs.openbsd.org: ports

2023-09-29 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/29 12:01:18

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 12.5.6

CVS: cvs.openbsd.org: ports

2023-09-29 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/29 12:00:17

Modified files:
meta/tor-browser: Tag: OPENBSD_7_3 Makefile 
www/tor-browser: Tag: OPENBSD_7_3 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_3 Makefile distinfo 

Log message:
Tor Browser: update to 12.5.6

CVS: cvs.openbsd.org: ports

2023-09-28 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/28 09:52:01

Modified files:
meta/tor-browser: Tag: OPENBSD_7_3 Makefile 
www/tor-browser: Tag: OPENBSD_7_3 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_3 Makefile distinfo 
www/tor-browser/noscript: Tag: OPENBSD_7_3 Makefile distinfo 

Log message:
Tor Browser: update to 12.5.5

CVS: cvs.openbsd.org: ports

2023-09-28 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/28 09:51:04

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 
www/tor-browser/noscript: Makefile distinfo 

Log message:
Tor Browser: update to 12.5.5

CVS: cvs.openbsd.org: ports

2023-09-15 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/15 01:34:32

Modified files:
meta/tor-browser: Tag: OPENBSD_7_3 Makefile 
www/tor-browser: Tag: OPENBSD_7_3 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_3 Makefile distinfo 

Log message:
Tor Browser: update to 12.5.4

CVS: cvs.openbsd.org: ports

2023-09-14 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/14 10:02:03

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 

Log message:
Tor Browser: update to 12.5.4

CVS: cvs.openbsd.org: ports

2023-09-14 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/14 00:03:49

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile 
www/tor-browser/browser/pkg: PLIST 

Log message:
Tor Browser: build it on aarch64

Details: https://marc.info/?l=openbsd-ports=169407928213188=2

OK phessler@

Re: Tor Browser for aarch64

2023-09-13 Thread Caspar Schutijser

On Thu, Sep 07, 2023 at 11:35:12AM +0200, Caspar Schutijser wrote:
> Hi ports@,
> 
> Below is a diff that makes Tor Browser work on aarch64. Tested on
> aarch64 and amd64.
> 
> Comments or OKs?

Ping. New diff (rebased on recent changes by landry@) below.

> If you're interested in the details you can read on; otherwise, just
> skip the part below and go right to the diff.
> 
> A user previously proposed this already, but I assumed that
> Tor Browser was carrying some local patches for NSPR and thus we needed
> the version of NSPR bundled with Tor Browser. However, that turns out
> not to be the case:
> 
> $ git clone https://gitlab.torproject.org/tpo/applications/tor-browser.git
> $ cd tor-browser
> $ git diff FIREFOX_102_15_0esr_BUILD1..tor-browser-102.15.0esr-12.5-1-build2 
> nsprpub/
> 
> I checked for a few older releases as well, and I didn't see any patches
> there either. So we don't need the bundled NSPR there. Which is great
> because the bundled NSPR does not compile on aarch64, even with the
> patches from devel/nspr integrated.
> 
> Note that we can't do the same for e.g. NSS, because if you run this
> you'll see that Tor Browser does indeed have some patches for NSS:
> $ git diff FIREFOX_102_15_0esr_BUILD1..tor-browser-102.15.0esr-12.5-1-build2 
> security/nss
> 
> Caspar

Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- meta/tor-browser/Makefile   6 Sep 2023 09:42:28 -   1.73
+++ meta/tor-browser/Makefile   13 Sep 2023 15:58:15 -
@@ -3,7 +3,7 @@ COMMENT=Tor Browser meta package
 MAINTAINER=Caspar Schutijser 
 
 PKGNAME=   tor-browser-12.5.3
-ONLY_FOR_ARCHS =   amd64
+ONLY_FOR_ARCHS =   aarch64 amd64
 
 RUN_DEPENDS=   www/tor-browser/browser>=12.5.3 \
www/tor-browser/noscript>=11.4.26 \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile.inc
--- www/tor-browser/Makefile.inc6 Sep 2023 09:42:28 -   1.70
+++ www/tor-browser/Makefile.inc13 Sep 2023 15:58:15 -
@@ -7,7 +7,7 @@ TB_VERSION =12.5.3
 TB_PREFIX =tb
 
 # keep meta/tor-browser in sync
-ONLY_FOR_ARCHS ?=  amd64
+ONLY_FOR_ARCHS ?=  aarch64 amd64
 
 SUBST_VARS +=  BROWSER_NAME TB_VERSION
 
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.117
diff -u -p -r1.117 Makefile
--- www/tor-browser/browser/Makefile13 Sep 2023 06:15:48 -  1.117
+++ www/tor-browser/browser/Makefile13 Sep 2023 15:58:15 -
@@ -7,7 +7,7 @@ COMMENT =   modified version of Firefox E
 MOZILLA_VERSION =  ${TB_VERSION}
 MOZILLA_PROJECT =  ${BROWSER_NAME}
 MOZILLA_CODENAME = browser
-REVISION = 0
+REVISION = 1
 
 EXTRACT_SUFX = .tar.xz
 
@@ -23,7 +23,7 @@ SO_VERSION =  8.0
 MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
 MOZILLA_LIBS +=freebl3 nss3 nssckbi
 MOZILLA_LIBS +=nssutil3 smime3 softokn3 ssl3
-MOZILLA_LIBS +=nspr4 mozsqlite3 plc4 plds4 ipcclientcerts
+MOZILLA_LIBS +=mozsqlite3 ipcclientcerts
 
 # mozilla public license for the browser
 PERMIT_PACKAGE=Yes
@@ -37,8 +37,7 @@ MODPY_RUNDEP =No
 
 COMPILER = ports-clang
 
-# tor-browser needs built-in nss, sqlite
-MOZILLA_USE_BUNDLED_NSPR = Yes
+# tor-browser needs built-in nss
 MOZILLA_USE_BUNDLED_NSS =  Yes
 # 63 requires node because why not #1483595
 BUILD_DEPENDS +=   lang/node
Index: www/tor-browser/browser/pkg/PLIST
===
RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- www/tor-browser/browser/pkg/PLIST   6 Sep 2023 09:42:29 -   1.18
+++ www/tor-browser/browser/pkg/PLIST   13 Sep 2023 15:58:15 -
@@ -203,12 +203,9 @@ lib/${BROWSER_NAME}/fonts/TwemojiMozilla
 @lib lib/${BROWSER_NAME}/libmozavutil.so.${LIBmozavutil_VERSION}
 @lib lib/${BROWSER_NAME}/libmozgtk.so.${LIBmozgtk_VERSION}
 @lib lib/${BROWSER_NAME}/libmozsqlite3.so.${LIBmozsqlite3_VERSION}
-@lib lib/${BROWSER_NAME}/libnspr4.so.${LIBnspr4_VERSION}
 @lib lib/${BROWSER_NAME}/libnss3.so.${LIBnss3_VERSION}
 @lib lib/${BROWSER_NAME}/libnssckbi.so.${LIBnssckbi_VERSION}
 @lib lib/${BROWSER_NAME}/libnssutil3.so.${LIBnssutil3_VERSION}
-@lib lib/${BROWSER_NAME}/libplc4.so.${LIBplc4_VERSION}
-@lib lib/${BROWSER_NAME}/libplds4.so.${LIBplds4_VERSION}
 @li

Tor Browser for aarch64

2023-09-07 Thread Caspar Schutijser

Hi ports@,

Below is a diff that makes Tor Browser work on aarch64. Tested on
aarch64 and amd64.

Comments or OKs?

If you're interested in the details you can read on; otherwise, just
skip the part below and go right to the diff.

A user previously proposed this already, but I assumed that
Tor Browser was carrying some local patches for NSPR and thus we needed
the version of NSPR bundled with Tor Browser. However, that turns out
not to be the case:

$ git clone https://gitlab.torproject.org/tpo/applications/tor-browser.git
$ cd tor-browser
$ git diff FIREFOX_102_15_0esr_BUILD1..tor-browser-102.15.0esr-12.5-1-build2 
nsprpub/

I checked for a few older releases as well, and I didn't see any patches
there either. So we don't need the bundled NSPR there. Which is great
because the bundled NSPR does not compile on aarch64, even with the
patches from devel/nspr integrated.

Note that we can't do the same for e.g. NSS, because if you run this
you'll see that Tor Browser does indeed have some patches for NSS:
$ git diff FIREFOX_102_15_0esr_BUILD1..tor-browser-102.15.0esr-12.5-1-build2 
security/nss

Caspar


Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- meta/tor-browser/Makefile   6 Sep 2023 09:42:28 -   1.73
+++ meta/tor-browser/Makefile   7 Sep 2023 09:33:46 -
@@ -3,7 +3,7 @@ COMMENT=Tor Browser meta package
 MAINTAINER=Caspar Schutijser 
 
 PKGNAME=   tor-browser-12.5.3
-ONLY_FOR_ARCHS =   amd64
+ONLY_FOR_ARCHS =   aarch64 amd64
 
 RUN_DEPENDS=   www/tor-browser/browser>=12.5.3 \
www/tor-browser/noscript>=11.4.26 \
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile.inc
--- www/tor-browser/Makefile.inc6 Sep 2023 09:42:28 -   1.70
+++ www/tor-browser/Makefile.inc7 Sep 2023 09:33:46 -
@@ -7,7 +7,7 @@ TB_VERSION =12.5.3
 TB_PREFIX =tb
 
 # keep meta/tor-browser in sync
-ONLY_FOR_ARCHS ?=  amd64
+ONLY_FOR_ARCHS ?=  aarch64 amd64
 
 SUBST_VARS +=  BROWSER_NAME TB_VERSION
 
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.116
diff -u -p -r1.116 Makefile
--- www/tor-browser/browser/Makefile6 Sep 2023 09:42:28 -   1.116
+++ www/tor-browser/browser/Makefile7 Sep 2023 09:33:46 -
@@ -12,6 +12,7 @@ EXTRACT_SUFX =.tar.xz
 
 PKGNAME =  ${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/}
 DISTNAME = src-firefox-tor-browser-102.15.0esr-12.5-1-build2
+REVISION = 0
 
 FIX_EXTRACT_PERMISSIONS= Yes
 DISTFILES +=   ${DISTNAME}.tar.xz \
@@ -22,7 +23,7 @@ SO_VERSION =  8.0
 MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
 MOZILLA_LIBS +=freebl3 nss3 nssckbi
 MOZILLA_LIBS +=nssutil3 smime3 softokn3 ssl3
-MOZILLA_LIBS +=nspr4 mozsqlite3 plc4 plds4 ipcclientcerts
+MOZILLA_LIBS +=mozsqlite3 ipcclientcerts
 
 # mozilla public license for the browser
 PERMIT_PACKAGE=Yes
@@ -36,8 +37,7 @@ MODPY_RUNDEP =No
 
 COMPILER = ports-clang
 
-# tor-browser needs built-in nss, sqlite
-MOZILLA_USE_BUNDLED_NSPR = Yes
+# tor-browser needs built-in nss
 MOZILLA_USE_BUNDLED_NSS =  Yes
 # 63 requires node because why not #1483595
 BUILD_DEPENDS +=   lang/node
Index: www/tor-browser/browser/pkg/PLIST
===
RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- www/tor-browser/browser/pkg/PLIST   6 Sep 2023 09:42:29 -   1.18
+++ www/tor-browser/browser/pkg/PLIST   7 Sep 2023 09:33:46 -
@@ -203,12 +203,9 @@ lib/${BROWSER_NAME}/fonts/TwemojiMozilla
 @lib lib/${BROWSER_NAME}/libmozavutil.so.${LIBmozavutil_VERSION}
 @lib lib/${BROWSER_NAME}/libmozgtk.so.${LIBmozgtk_VERSION}
 @lib lib/${BROWSER_NAME}/libmozsqlite3.so.${LIBmozsqlite3_VERSION}
-@lib lib/${BROWSER_NAME}/libnspr4.so.${LIBnspr4_VERSION}
 @lib lib/${BROWSER_NAME}/libnss3.so.${LIBnss3_VERSION}
 @lib lib/${BROWSER_NAME}/libnssckbi.so.${LIBnssckbi_VERSION}
 @lib lib/${BROWSER_NAME}/libnssutil3.so.${LIBnssutil3_VERSION}
-@lib lib/${BROWSER_NAME}/libplc4.so.${LIBplc4_VERSION}
-@lib lib/${BROWSER_NAME}/libplds4.so.${LIBplds4_VERSION}
 @lib lib/${BROWSER_NAME}/libsmime3.so.${LIBsmime3_VERSION}
 @lib lib/${BROWSER_NAME}/libsoftokn3.so.${LIBsoftokn3_VERSION}
 @lib lib/${BROWSER_NAME}/libssl3.so.${LIBssl3_VERSION}

CVS: cvs.openbsd.org: ports

2023-09-07 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/07 03:15:27

Modified files:
meta/tor-browser: Tag: OPENBSD_7_3 Makefile 
meta/tor-browser/pkg: Tag: OPENBSD_7_3 README 
www/tor-browser: Tag: OPENBSD_7_3 Makefile.inc 
www/tor-browser/browser: Tag: OPENBSD_7_3 Makefile distinfo 
www/tor-browser/browser/files: Tag: OPENBSD_7_3 tor-browser.cfg 
www/tor-browser/browser/patches: Tag: OPENBSD_7_3 
 
patch-browser_app_profile_000-tor-browser_js 
 
patch-browser_config_mozconfigs_base-browser 
 
patch-browser_config_mozconfigs_tor-browser 
 
patch-toolkit_components_tor-launcher_TorProcess_jsm 
www/tor-browser/browser/pkg: Tag: OPENBSD_7_3 PLIST 
www/tor-browser/noscript: Tag: OPENBSD_7_3 Makefile distinfo 
Added files:
www/tor-browser/browser/patches: Tag: OPENBSD_7_3 
 patch-toolkit_xre_nsXREDirProvider_cpp 
 
patch-tor-browser-linux64_Browser_fontconfig_fonts_conf 
 
patch-xpcom_io_nsAppFileLocationProvider_cpp 
www/tor-browser/browser/pkg: Tag: OPENBSD_7_3 MESSAGE 
Removed files:
www/tor-browser/browser/patches: Tag: OPENBSD_7_3 
 
patch-toolkit_components_tor-launcher_TorLauncherUtil_jsm 
 
patch-tor-browser-linux64_Browser_TorBrowser_Data_fontconfig_fonts_conf 
 patch-xpcom_io_TorFileUtils_cpp 

Log message:
Tor Browser: update to 12.5.3

Update to a new major version since the 12.0 branch does not
receive updates anymore.

As of the 12.5 release, torrc has been moved from
~/TorBrowser-Data/torrc to ~/TorBrowser-Data/Tor/torrc.
If you wish to preserve your tor configuration (e.g., bridges),
please do the following BEFORE starting tor-browser after you upgrade:

$ mv ~/TorBrowser-Data/torrc ~/TorBrowser-Data/Tor

OK landry@

Re: [update] graphics/krita-gmic-plugin 3.1.6.1 to 3.2.4.1

2023-09-06 Thread Caspar Schutijser

Hi,

On Sun, Sep 03, 2023 at 01:40:25PM +0100, Stefan Hagen wrote:
> *ping*
> 
> It seems to be hard to get OKs for this update. Is anyone using this?
> 
> Test instructions:
> 
> * open an image in krita
> * click in Filter -> Start G'MIC-QT in the menu
> * play around with filters
> * click ok to bring the changes back to krita

I built and tested it and it works fine here. Thanks!

OK caspar@

> 
> Diff added again for convenience below.
> 
> Best Regards,
> Stefan
> 
> 
> Stefan Hagen wrote (2023-08-28 20:22 IST):
> > Stefan Hagen wrote (2023-07-05 08:27 CEST):
> > > *ping*
> > > 
> > > Stefan Hagen wrote (2023-05-07 16:42 CEST):
> > > > Hi,
> > > > 
> > > > this is an update to the krita gmic plugin for the gmic version
> > > > 3.2.1.
> > > > 
> > > > There's no changelog for the plugin itself. But this repo is used 
> > > > to develop the plugin:
> > > > https://github.com/amyspark/gmic/compare/v3.1.6.1...v3.2.1.1
> > > > 
> > > > I added post-configure bits to build the translation files.
> > > > Otherwise the build fails.
> > > > 
> > > > Comments / OKs?
> > 
> > Here is the next update. Now to version 3.2.4.1.
> > 
> > Changes:
> > https://github.com/amyspark/gmic/compare/v3.1.6.1...v3.2.4.1
> > 
> > OK?
> > 
> > - Stefan
> 
> Index: graphics/krita-gmic-plugin/Makefile
> ===
> RCS file: /cvs/ports/graphics/krita-gmic-plugin/Makefile,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 Makefile
> --- graphics/krita-gmic-plugin/Makefile   26 Sep 2022 11:03:06 -  
> 1.7
> +++ graphics/krita-gmic-plugin/Makefile   3 Sep 2023 12:37:03 -
> @@ -1,12 +1,18 @@
>  COMMENT =krita gmic plugin
>  
> -V =  3.1.6.1
> +V =  3.2.4.1
>  DISTNAME =   krita-gmic-plugin-${V}
>  
>  CATEGORIES = graphics
>  
>  HOMEPAGE =   https://krita.org
>  
> +# Info about this plugin:
> +# https://invent.kde.org/graphics/krita/-/blob/master/README.packagers.md
> +
> +# Actually developed here:
> +# https://github.com/amyspark/gmic
> +
>  MAINTAINER = Stefan Hagen 
>  
>  # CeCILL, GPLv3
> @@ -27,10 +33,17 @@ LIB_DEPENDS = graphics/krita \
>  
>  WRKSRC = ${WRKDIST}/gmic-qt
>  
> -CONFIGURE_ARGS +=-DENABLE_SYSTEM_GMIC=false \
> +CONFIGURE_ARGS +=-DCMAKE_PREFIX_PATH=${LOCALBASE}/lib/qt5/cmake \
> + -DENABLE_SYSTEM_GMIC=false \
>   -DGMIC_QT_HOST=krita-plugin
>  
> +USE_GMAKE =  Yes
> +
>  post-extract:
>   mv ${WRKDIR}/gmic-${V}-patched ${WRKDIST}
> +
> +post-configure:
> + chmod +x ${WRKSRC}/translations/lrelease.sh
> + cd ${WRKSRC}/translations/filters && gmake
>  
>  .include 
> Index: graphics/krita-gmic-plugin/distinfo
> ===
> RCS file: /cvs/ports/graphics/krita-gmic-plugin/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 distinfo
> --- graphics/krita-gmic-plugin/distinfo   26 Sep 2022 11:03:06 -  
> 1.7
> +++ graphics/krita-gmic-plugin/distinfo   3 Sep 2023 12:37:03 -
> @@ -1,2 +1,2 @@
> -SHA256 (gmic-3.1.6.1-patched.tar.gz) = 
> FeGVqnKKXYjTERoZnscwadBJGATdSa+0m+7D6F6T2ZQ=
> -SIZE (gmic-3.1.6.1-patched.tar.gz) = 12025532
> +SHA256 (gmic-3.2.4.1-patched.tar.gz) = 
> 5e+B3tTeLX0uF6YPkOgEbivAa8eiQ5qzoBI2EdIQ7tg=
> +SIZE (gmic-3.2.4.1-patched.tar.gz) = 11803760
> Index: graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp
> ===
> RCS file: /cvs/ports/graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-src_gmic_cpp
> --- graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp 29 May 2022 
> 07:41:37 -  1.2
> +++ graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp 3 Sep 2023 
> 12:37:03 -
> @@ -1,21 +1,12 @@
>  Index: src/gmic.cpp
>  --- src/gmic.cpp.orig
>  +++ src/gmic.cpp
> -@@ -2518,6 +2518,8 @@ CImgList gmic::list_p_is_abort = CImgList - bool *gmic::abort_ptr(bool *const p_is_abort) {
> +@@ -2204,6 +2204,8 @@ inline CImgList& gmic_runs() {
> + inline void* get_tid() {
>   #if defined(__MACOSX__) || defined(__APPLE__)
> void* tid = (void*)(cimg_ulong)getpid();
>  +#elif defined(__OpenBSD__)
>  +  void* tid = (void*)pthread_self();
>   #elif cimg_OS==1
> -   void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
> - #elif cimg_OS==2
> -@@ -2860,6 +2862,8 @@ gmic::~gmic() {
> -   cimg::mutex(21);
> - #if defined(__MACOSX__) || defined(__APPLE__)
> -   void* tid = (void*)(cimg_ulong)getpid();
> -+#elif defined(__OpenBSD__)
> -+  void* tid = (void*)pthread_self();
> - #elif cimg_OS==1
> -   void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
> - #elif cimg_OS==2
> + #if defined(__NetBSD__) || defined(cimg_use_pthread) || cimg_display==1
> +   void* tid = (void*)(cimg_ulong)pthread_self();
>

UPDATE: Tor Browser 12.5.3 for 7.3-stable

2023-09-06 Thread Caspar Schutijser



On Tue, Sep 05, 2023 at 11:57:04AM +0200, Caspar Schutijser wrote:
> Hi,
> 
> Below is a diff that updates Tor Browser to 12.5.3. I finally fixed
> all problems related to upstream's changes involving the configuration
> directory.
> 
> Change of note (quoting from the updated pkg-readme):
> > As of the 12.5 release, torrc has been moved from
> > ~/TorBrowser-Data/torrc to ~/TorBrowser-Data/Tor/torrc.
> > If you wish to preserve your tor configuration (e.g., bridges),
> > please do the following BEFORE starting tor-browser after you upgrade:
> > 
> >   $ mv ~/TorBrowser-Data/torrc ~/TorBrowser-Data/Tor
> 
> Feedback and test reports are welcome.
> 
> Release announcement of the 12.5 series can be found here:
> https://blog.torproject.org/new-release-tor-browser-125/
> 
> Comments or OKs? Diff for -stable to follow later.

And here is the diff for 7.3-stable. 

Comments or OKs?

Caspar


Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.68.2.4
diff -u -p -r1.68.2.4 Makefile
--- meta/tor-browser/Makefile   9 Jun 2023 08:57:55 -   1.68.2.4
+++ meta/tor-browser/Makefile   6 Sep 2023 10:06:17 -0000
@@ -2,11 +2,11 @@ COMMENT=  Tor Browser meta package
 
 MAINTAINER=Caspar Schutijser 
 
-PKGNAME=   tor-browser-12.0.7
+PKGNAME=   tor-browser-12.5.3
 ONLY_FOR_ARCHS =   amd64
 
-RUN_DEPENDS=   www/tor-browser/browser>=12.0.7 \
-   www/tor-browser/noscript>=11.4.22 \
+RUN_DEPENDS=   www/tor-browser/browser>=12.5.3 \
+   www/tor-browser/noscript>=11.4.26 \
net/tor>=0.4.7.13
 
 .include 
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.10
diff -u -p -r1.10 README
--- meta/tor-browser/pkg/README 16 Jan 2023 18:19:19 -  1.10
+++ meta/tor-browser/pkg/README 6 Sep 2023 10:06:17 -
@@ -9,14 +9,6 @@ To start Tor Browser:
 This will create a ~/TorBrowser-Data directory tree if it does not
 exist.
 
-As of the 7.0.2 release Tor Browser keeps its data in
-~/TorBrowser-Data/Data.  In 6.5.2 it was ~/TorBrowser-Data/Browser.
-If you wish to preserve either your tor configuration (bridges, etc)
-or your browser profile and are updating from a version before 7.0.2
-please do the following BEFORE starting tor-browser after you upgrade:
-
-  $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
-
 Tor Browser uses its own instance of the tor server running on a
 different port than the net/tor port is configured to use by default.
 It starts and stops this tor daemon using the integrated tor-launcher.
@@ -24,8 +16,15 @@ It should not interfere with any tor dae
 standard mechanism (e.g. rcctl start tor).
 
 The tor instance used by Tor Browser stores its configuration in
-~/TorBrowser-Data/Data/torrc; the tor daemon state lives in
-~/TorBrowser-Data/Data/tor_data.
+~/TorBrowser-Data/Tor/torrc; the tor daemon stores state files in
+~/TorBrowser-Data/Tor.
+
+As of the 12.5 release, torrc has been moved from
+~/TorBrowser-Data/torrc to ~/TorBrowser-Data/Tor/torrc.
+If you wish to preserve your tor configuration (e.g., bridges),
+please do the following BEFORE starting tor-browser after you upgrade:
+
+  $ mv ~/TorBrowser-Data/torrc ~/TorBrowser-Data/Tor
 
 When you use Tor Browser to change your configuration (e.g. add
 bridges) the above torrc is updated.  You can also add bridges by
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.65.2.4
diff -u -p -r1.65.2.4 Makefile.inc
--- www/tor-browser/Makefile.inc9 Jun 2023 08:57:55 -   1.65.2.4
+++ www/tor-browser/Makefile.inc6 Sep 2023 10:06:17 -
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
 PERMIT_PACKAGE ?=  Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   12.0.7
+TB_VERSION =   12.5.3
 TB_PREFIX =tb
 
 # keep meta/tor-browser in sync
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.104.2.4
diff -u -p -r1.104.2.4 Makefile
--- www/tor-browser/browser/Makefile9 Jun 2023 08:57:55 -   
1.104.2.4
+++ www/tor-browser/browser/Makefile6 Sep 2023 10:06:17 -
@@ -12,7 +12,7 @@ EXTRACT_SUFX =.tar.xz
 PATCHORIG =.pat.orig
 
 PKGNAME =  ${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/}
-DISTNAME = src-firefox-tor-browser-102.12.0esr-12.0-1-build2
+DISTNAME = src-firefox-tor-browser-102.15.0esr-12.5-1-build2
 
 FIX_EXTRACT_PER

CVS: cvs.openbsd.org: ports

2023-09-06 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/06 03:42:29

Modified files:
meta/tor-browser: Makefile 
meta/tor-browser/pkg: README 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 
www/tor-browser/browser/files: tor-browser.cfg 
www/tor-browser/browser/patches: 
 
patch-browser_app_profile_000-tor-browser_js 
 
patch-browser_config_mozconfigs_base-browser 
 
patch-browser_config_mozconfigs_tor-browser 
 
patch-toolkit_components_tor-launcher_TorProcess_jsm 
www/tor-browser/browser/pkg: PLIST 
www/tor-browser/noscript: Makefile distinfo 
Added files:
www/tor-browser/browser/patches: 
 patch-toolkit_xre_nsXREDirProvider_cpp 
 
patch-tor-browser-linux64_Browser_fontconfig_fonts_conf 
 
patch-xpcom_io_nsAppFileLocationProvider_cpp 
www/tor-browser/browser/pkg: MESSAGE 
Removed files:
www/tor-browser/browser/patches: 
 
patch-third_party_rust_mp4parse_src_lib_rs 
 
patch-toolkit_components_tor-launcher_TorLauncherUtil_jsm 
 
patch-tor-browser-linux64_Browser_TorBrowser_Data_fontconfig_fonts_conf 
 patch-xpcom_io_TorFileUtils_cpp 

Log message:
Tor Browser: update to 12.5.3

As of the 12.5 release, torrc has been moved from
~/TorBrowser-Data/torrc to ~/TorBrowser-Data/Tor/torrc.
If you wish to preserve your tor configuration (e.g., bridges),
please do the following BEFORE starting tor-browser after you upgrade:

$ mv ~/TorBrowser-Data/torrc ~/TorBrowser-Data/Tor

OK landry@

Re: UPDATE: Tor Browser 12.5.3

2023-09-05 Thread Caspar Schutijser

Hi,

On Tue, Sep 05, 2023 at 12:15:55PM +0200, Landry Breuil wrote:
> Le Tue, Sep 05, 2023 at 11:57:04AM +0200, Caspar Schutijser a écrit :
> > Hi,
> > 
> > Below is a diff that updates Tor Browser to 12.5.3. I finally fixed
> > all problems related to upstream's changes involving the configuration
> > directory.
> 
> reads good to me, you might also want to add something to current.html
> for users to move their directory, this way it'll end up in the 7.4
> upgrade guide.

Good idea. After some discussion we also came up with the idea to add
a pkg/MESSAGE (this also with the backport to -stable in mind). The
pkg/MESSAGE can be removed after the 7.4 release, when everyone has
upgraded and had the opportunity to see the message.
In that case we could perhaps remove the message about torrc from the
pkg-readme. I'll think about that a little bit more.

Below is a new diff for the port, and I attached a diff for
faq/current.html.

Does anyone have feedback or OKs on this?

Caspar


Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- meta/tor-browser/Makefile   9 Jun 2023 08:57:20 -   1.72
+++ meta/tor-browser/Makefile   5 Sep 2023 10:44:20 -
@@ -2,11 +2,11 @@ COMMENT=  Tor Browser meta package
 
 MAINTAINER=Caspar Schutijser 
 
-PKGNAME=   tor-browser-12.0.7
+PKGNAME=   tor-browser-12.5.3
 ONLY_FOR_ARCHS =   amd64
 
-RUN_DEPENDS=   www/tor-browser/browser>=12.0.7 \
-   www/tor-browser/noscript>=11.4.22 \
+RUN_DEPENDS=   www/tor-browser/browser>=12.5.3 \
+   www/tor-browser/noscript>=11.4.26 \
net/tor>=0.4.7.13
 
 .include 
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.10
diff -u -p -r1.10 README
--- meta/tor-browser/pkg/README 16 Jan 2023 18:19:19 -  1.10
+++ meta/tor-browser/pkg/README 5 Sep 2023 10:44:20 -
@@ -9,14 +9,6 @@ To start Tor Browser:
 This will create a ~/TorBrowser-Data directory tree if it does not
 exist.
 
-As of the 7.0.2 release Tor Browser keeps its data in
-~/TorBrowser-Data/Data.  In 6.5.2 it was ~/TorBrowser-Data/Browser.
-If you wish to preserve either your tor configuration (bridges, etc)
-or your browser profile and are updating from a version before 7.0.2
-please do the following BEFORE starting tor-browser after you upgrade:
-
-  $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
-
 Tor Browser uses its own instance of the tor server running on a
 different port than the net/tor port is configured to use by default.
 It starts and stops this tor daemon using the integrated tor-launcher.
@@ -24,8 +16,15 @@ It should not interfere with any tor dae
 standard mechanism (e.g. rcctl start tor).
 
 The tor instance used by Tor Browser stores its configuration in
-~/TorBrowser-Data/Data/torrc; the tor daemon state lives in
-~/TorBrowser-Data/Data/tor_data.
+~/TorBrowser-Data/Tor/torrc; the tor daemon stores state files in
+~/TorBrowser-Data/Tor.
+
+As of the 12.5 release, torrc has been moved from
+~/TorBrowser-Data/torrc to ~/TorBrowser-Data/Tor/torrc.
+If you wish to preserve your tor configuration (e.g., bridges),
+please do the following BEFORE starting tor-browser after you upgrade:
+
+  $ mv ~/TorBrowser-Data/torrc ~/TorBrowser-Data/Tor
 
 When you use Tor Browser to change your configuration (e.g. add
 bridges) the above torrc is updated.  You can also add bridges by
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile.inc
--- www/tor-browser/Makefile.inc9 Jun 2023 08:57:20 -   1.69
+++ www/tor-browser/Makefile.inc5 Sep 2023 10:44:20 -
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
 PERMIT_PACKAGE ?=  Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   12.0.7
+TB_VERSION =   12.5.3
 TB_PREFIX =tb
 
 # keep meta/tor-browser in sync
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile
--- www/tor-browser/browser/Makefile4 Sep 2023 12:23:25 -   1.115
+++ www/tor-browser/browser/Makefile5 Sep 2023 10:44:20 -
@@ -5,14 +5,13 @@
 COMMENT =  modified version of Firefox ESR for browsing over Tor
 
 MOZILLA_VERSION =  ${TB_VERSION}
-REVISION = 1
 MOZILLA_PROJECT =  ${BROWSER_NAME}
 MOZILLA_CODENAME = browser
 
 EXTRACT_SUFX = .tar.xz
 
 PKGNAME =  ${TB_PREFIX}-browser-

Re: WIP: devel/sccache

2023-09-05 Thread Caspar Schutijser

On Tue, Sep 05, 2023 at 08:42:34AM +0200, Landry Breuil wrote:
> Le Mon, Sep 04, 2023 at 05:13:19PM +0200, Landry Breuil a écrit :
> > Le Mon, Sep 04, 2023 at 04:58:49PM +0200, Caspar Schutijser a écrit :
> > > Hi,
> > > 
> > > I started porting sccache <https://github.com/mozilla/sccache/>,
> > > a ccache-like tool that a.o. supports many storage backends but
> > > also (more importantly) caching Rust compilation objects. I hope that
> > > eventually we can use something like USE_SCCACHE for Rust projects
> > > (WIP, untested diff for bsd.port.mk below).
> > > 
> > > The attached port does not build yet and I can't immediately find
> > > out how to fix it (trace of build failure below). I'm sending it
> > > to the list just in case someone else is interested.
> > 
> > it fails because it looks for -lzstd but nothing tells it where to find
> > it (eg missing -L/usr/local/lib somewhere id say)
> 
> fixed version with WANTLIB/LDEP/DESCR, with the help of tb and semarie
> on icb.

Thanks! That looks much better. With this new version and the
bsd.port.mk diff that I sent earlier, I was able to use USE_SCCACHE=Yes
and see the second compilation of the benchmarks/hyperfine port
(a Rust port) being much faster. So it seems like it actually works.
Later I'll test it with a more complicated port, like one of the
Mozillas.

Now we "just" need updates to bsd.port.mk.5 and then I think it would
be close to committable shape. I may have a look at that today if time
permits.

Caspar

UPDATE: Tor Browser 12.5.3

2023-09-05 Thread Caspar Schutijser

Hi,

Below is a diff that updates Tor Browser to 12.5.3. I finally fixed
all problems related to upstream's changes involving the configuration
directory.

Change of note (quoting from the updated pkg-readme):
> As of the 12.5 release, torrc has been moved from
> ~/TorBrowser-Data/torrc to ~/TorBrowser-Data/Tor/torrc.
> If you wish to preserve your tor configuration (e.g., bridges),
> please do the following BEFORE starting tor-browser after you upgrade:
> 
>   $ mv ~/TorBrowser-Data/torrc ~/TorBrowser-Data/Tor

Feedback and test reports are welcome.

Release announcement of the 12.5 series can be found here:
https://blog.torproject.org/new-release-tor-browser-125/

Comments or OKs? Diff for -stable to follow later.

Caspar 


Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- meta/tor-browser/Makefile   9 Jun 2023 08:57:20 -   1.72
+++ meta/tor-browser/Makefile   5 Sep 2023 09:54:45 -
@@ -2,11 +2,11 @@ COMMENT=  Tor Browser meta package
 
 MAINTAINER=    Caspar Schutijser 
 
-PKGNAME=   tor-browser-12.0.7
+PKGNAME=   tor-browser-12.5.3
 ONLY_FOR_ARCHS =   amd64
 
-RUN_DEPENDS=   www/tor-browser/browser>=12.0.7 \
-   www/tor-browser/noscript>=11.4.22 \
+RUN_DEPENDS=   www/tor-browser/browser>=12.5.3 \
+   www/tor-browser/noscript>=11.4.26 \
net/tor>=0.4.7.13
 
 .include 
Index: meta/tor-browser/pkg/README
===
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.10
diff -u -p -r1.10 README
--- meta/tor-browser/pkg/README 16 Jan 2023 18:19:19 -  1.10
+++ meta/tor-browser/pkg/README 5 Sep 2023 09:54:45 -
@@ -9,14 +9,6 @@ To start Tor Browser:
 This will create a ~/TorBrowser-Data directory tree if it does not
 exist.
 
-As of the 7.0.2 release Tor Browser keeps its data in
-~/TorBrowser-Data/Data.  In 6.5.2 it was ~/TorBrowser-Data/Browser.
-If you wish to preserve either your tor configuration (bridges, etc)
-or your browser profile and are updating from a version before 7.0.2
-please do the following BEFORE starting tor-browser after you upgrade:
-
-  $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
-
 Tor Browser uses its own instance of the tor server running on a
 different port than the net/tor port is configured to use by default.
 It starts and stops this tor daemon using the integrated tor-launcher.
@@ -24,8 +16,15 @@ It should not interfere with any tor dae
 standard mechanism (e.g. rcctl start tor).
 
 The tor instance used by Tor Browser stores its configuration in
-~/TorBrowser-Data/Data/torrc; the tor daemon state lives in
-~/TorBrowser-Data/Data/tor_data.
+~/TorBrowser-Data/Tor/torrc; the tor daemon stores state files in
+~/TorBrowser-Data/Tor.
+
+As of the 12.5 release, torrc has been moved from
+~/TorBrowser-Data/torrc to ~/TorBrowser-Data/Tor/torrc.
+If you wish to preserve your tor configuration (e.g., bridges),
+please do the following BEFORE starting tor-browser after you upgrade:
+
+  $ mv ~/TorBrowser-Data/torrc ~/TorBrowser-Data/Tor
 
 When you use Tor Browser to change your configuration (e.g. add
 bridges) the above torrc is updated.  You can also add bridges by
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile.inc
--- www/tor-browser/Makefile.inc9 Jun 2023 08:57:20 -   1.69
+++ www/tor-browser/Makefile.inc5 Sep 2023 09:54:45 -
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
 PERMIT_PACKAGE ?=  Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   12.0.7
+TB_VERSION =   12.5.3
 TB_PREFIX =tb
 
 # keep meta/tor-browser in sync
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile
--- www/tor-browser/browser/Makefile4 Sep 2023 12:23:25 -   1.115
+++ www/tor-browser/browser/Makefile5 Sep 2023 09:54:45 -
@@ -5,14 +5,13 @@
 COMMENT =  modified version of Firefox ESR for browsing over Tor
 
 MOZILLA_VERSION =  ${TB_VERSION}
-REVISION = 1
 MOZILLA_PROJECT =  ${BROWSER_NAME}
 MOZILLA_CODENAME = browser
 
 EXTRACT_SUFX = .tar.xz
 
 PKGNAME =  ${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/}
-DISTNAME = src-firefox-tor-browser-102.12.0esr-12.0-1-build2
+DISTNAME = src-firefox-tor-browser-102.15.0esr-12.5-1-build2
 
 FIX_EXTRACT_PERMISSIONS= Yes
 DISTFILES +=   ${DISTNAME}.tar.xz \
@@ -67,8 +66,7 @@ CONFIGURE_

WIP: devel/sccache

2023-09-04 Thread Caspar Schutijser

Hi,

I started porting sccache ,
a ccache-like tool that a.o. supports many storage backends but
also (more importantly) caching Rust compilation objects. I hope that
eventually we can use something like USE_SCCACHE for Rust projects
(WIP, untested diff for bsd.port.mk below).

The attached port does not build yet and I can't immediately find
out how to fix it (trace of build failure below). I'm sending it
to the list just in case someone else is interested.

Caspar


== Trace of build failure ==
   Compiling sccache v0.5.4 (/usr/ports/pobj/sccache-0.5.4/sccache-0.5.4)
 Running `/usr/local/bin/rustc --crate-name sccache --edition=2021 
src/main.rs --error-format=json 
--json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin 
--emit=dep-info,link -C opt-level=2 -C embed-bitcode=no -C codegen-units=4 
--cfg 'feature="all"' --cfg 'feature="azure"' --cfg 'feature="default"' --cfg 
'feature="dist-client"' --cfg 'feature="flate2"' --cfg 'feature="gcs"' --cfg 
'feature="gha"' --cfg 'feature="hyper"' --cfg 'feature="memcached"' --cfg 
'feature="opendal"' --cfg 'feature="redis"' --cfg 'feature="reqsign"' --cfg 
'feature="reqwest"' --cfg 'feature="s3"' --cfg 'feature="sha2"' --cfg 
'feature="url"' --cfg 'feature="webdav"' -C metadata=96867825dd36cc65 -C 
extra-filename=-96867825dd36cc65 --out-dir 
/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps -C strip=symbols 
-L dependency=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps 
--extern 
anyhow=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libanyhow-0b6ed85c8dfe0ad1.rlib
 --extern 
ar=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libar-27658776c7e7656a.rlib
 --extern 
async_trait=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libasync_trait-35efcf2f20e38643.so
 --extern 
base64=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libbase64-5f727f41a4e95d5f.rlib
 --extern 
bincode=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libbincode-0505c6ae03659f40.rlib
 --extern 
blake3=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libblake3-24a48a49cb6aef94.rlib
 --extern 
byteorder=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libbyteorder-8cac0b1f7925de86.rlib
 --extern 
bytes=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libbytes-e4d5a6297db0bde6.rlib
 --extern 
clap=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libclap-bab9f08a0d38eae1.rlib
 --extern 
daemonize=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libdaemonize-6d55ded0bb25bb5c.rlib
 --extern 
directories=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libdirectories-40c454d5cf492dc2.rlib
 --extern 
encoding=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libencoding-8aba9d897a2b8180.rlib
 --extern 
env_logger=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libenv_logger-356371ba748dc3e7.rlib
 --extern 
filetime=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libfiletime-531bb65347c7b849.rlib
 --extern 
flate2=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libflate2-a4d93234f5e93bcc.rlib
 --extern 
fs_err=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libfs_err-4c78cc53d6c3adfc.rlib
 --extern 
futures=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libfutures-5340b8196db545aa.rlib
 --extern 
gzp=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libgzp-ef0432742e085b66.rlib
 --extern 
http=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libhttp-ba02b145dec3735e.rlib
 --extern 
hyper=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libhyper-737394931b35fc90.rlib
 --extern 
is_terminal=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libis_terminal-a42df8142baa4ac6.rlib
 --extern 
jobserver=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libjobserver-d66834daf368eefb.rlib
 --extern 
libc=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/liblibc-5835f4ab8077cbdf.rlib
 --extern 
linked_hash_map=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/liblinked_hash_map-0290a92bf2d6ecf1.rlib
 --extern 
log=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/liblog-a58ec72c5e576122.rlib
 --extern 
memmap2=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libmemmap2-0cc093c1cad68d49.rlib
 --extern 
mime=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libmime-512e1c56b55e35eb.rlib
 --extern 
num_cpus=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libnum_cpus-b39a8032b058533b.rlib
 --extern 
number_prefix=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libnumber_prefix-b6170ebf029f2c0f.rlib
 --extern 
object=/usr/ports/pobj/sccache-0.5.4/build-amd64/target/release/deps/libobject-e89b0454eea4da83.rlib
 --extern

CVS: cvs.openbsd.org: ports

2023-09-02 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/02 04:37:34

Modified files:
net/snowflake_proxy: Makefile distinfo modules.inc 

Log message:
net/snowflake_proxy: update to 2.6.0

OK landry@

Re: UPDATE: net/snowflake_proxy 2.6.0

2023-09-01 Thread Caspar Schutijser

On Sat, Jul 29, 2023 at 01:01:26PM +0200, Caspar Schutijser wrote:
> Hi,
> 
> Below is a diff that updates net/snowflake_proxy to 2.6.0. Tested for
> a while on amd64, seems to work fine.
> 
> If you're wondering about the part in post-install and why I
> did not swap IN and OUT: the first part already denoted
> the inbound traffic, as shown here:
> https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/commit/5cc849e186a7b5f5cac238e3497a64bd46ac0a29
> 
> Comments or OKs?

Ping

> 
> Caspar
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/snowflake_proxy/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- Makefile  11 Feb 2023 08:08:34 -  1.11
> +++ Makefile  29 Jul 2023 10:59:10 -
> @@ -1,7 +1,7 @@
>  COMMENT= anti-censorship proxy and pluggable transports for Tor
>  
> -MODGO_MODNAME=   git.torproject.org/pluggable-transports/snowflake.git/v2
> -V=   2.5.1
> +MODGO_MODNAME=   
> gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2
> +V=   2.6.0
>  MODGO_VERSION=   v$V
>  
>  DISTNAME=snowflake.git-${MODGO_VERSION}
> @@ -23,7 +23,7 @@ ALL_TARGET= ./proxy/ ./client/ ./server/
>  
>  # done as a sed instead of patch because the path includes the version number
>  post-extract:
> - sed -i 's/Relayed ↑ %v %v, ↓ %v %v/Relayed IN %v %v, OUT %v %v/' \
> + sed -i 's/Relayed ↓ %v %v, ↑ %v %v/Relayed IN %v %v, OUT %v %v/' \
>   ${WRKSRC}/proxy/lib/pt_event_logger.go
>  
>  post-install:
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/snowflake_proxy/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  11 Feb 2023 08:08:35 -  1.5
> +++ distinfo  29 Jul 2023 10:59:11 -
> @@ -1,8 +1,6 @@
>  SHA256 (go_modules/cloud.google.com/go/@v/v0.26.0.mod) = 
> IhijTyC5cbwZUhbUGV9XUgoqy9hd5/wxrPxEAmZwTBE=
>  SHA256 (go_modules/cloud.google.com/go/@v/v0.34.0.mod) = 
> IhijTyC5cbwZUhbUGV9XUgoqy9hd5/wxrPxEAmZwTBE=
>  SHA256 (go_modules/cloud.google.com/go/@v/v0.34.0.zip) = 
> J8EZDc0zxZSDhIdUTYw9F99PeRb7VC9cLJynKe8dn+Y=
> -SHA256 
> (go_modules/git.torproject.org/pluggable-transports/goptlib.git/@v/v1.3.0.mod)
>  = ldAfvsNdJVtvVDwDK+AWLGoBmdxcOEXIROfztA59/pE=
> -SHA256 
> (go_modules/git.torproject.org/pluggable-transports/goptlib.git/@v/v1.3.0.zip)
>  = G8A4NF+gES+P+5gHN+3mlGahtGWgPvkvoMaKah90i54=
>  SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.mod) = 
> KAIbQYClnDmTYHqVsY4jDdC8a+pSQv/o6ou/tPT3tNc=
>  SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v0.3.1.zip) = 
> gVxuWUdF8tiEL/mksFacZpXmzf1eB+Wz2Y0GtyykHjw=
>  SHA256 
> (go_modules/github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod)
>  = iZ9Gh/XMeTQrdQbU+06iWJTONJiyQ1J7EA97rB4Gl00=
> @@ -360,44 +358,44 @@ SHA256 (go_modules/github.com/performanc
>  SHA256 
> (go_modules/github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod)
>  = OeY6ahiEY68QgrBpDKqzRwKomgR+usAmePZSO32yvVU=
>  SHA256 (go_modules/github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod) = 
> KlDPGZMwgkRBQ3I0nlAHcN3gZx7iWRWc8wX0sfhOuuk=
>  SHA256 (go_modules/github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip) = 
> +UENwWs19pbm0hIl/Ya59gCE7eh/sA9ff/IIwuFOkXc=
> -SHA256 (go_modules/github.com/pion/datachannel/@v/v1.5.2.mod) = 
> ZZvqovxbWVE8V0muRH43cdXHkq31YqBKkJEx31QgAqA=
> -SHA256 (go_modules/github.com/pion/datachannel/@v/v1.5.2.zip) = 
> VsO0YGXC3e7eZdnjVB4X9exyYGmg4IOTuApm+f4zlUs=
> -SHA256 (go_modules/github.com/pion/dtls/v2/@v/v2.1.3.mod) = 
> gcmyqQpkLSQuW/KfxgmSTIJuRawgU0ZPzT7FceEZVkU=
> -SHA256 (go_modules/github.com/pion/dtls/v2/@v/v2.1.5.mod) = 
> ue0+tc6KllzKLCxVMadtF6gUHPtYvIYVxoH/3KQ/Xyo=
> -SHA256 (go_modules/github.com/pion/dtls/v2/@v/v2.1.5.zip) = 
> Xx9qmQoXVIZkR/9HqV+PFwG+BGMdW+uanYaKrWyzDaY=
> -SHA256 (go_modules/github.com/pion/ice/v2/@v/v2.2.6.mod) = 
> 8m8nd1O4HMdu0z0Ean4egnf/E0IivnUWppSf81ZHfHg=
> -SHA256 (go_modules/github.com/pion/ice/v2/@v/v2.2.6.zip) = 
> HLQ79W/hu6kWP56BLPQeOS4BuKspyxVtej6K4Xx0w3Q=
> -SHA256 (go_modules/github.com/pion/interceptor/@v/v0.1.11.mod) = 
> 8GZridoNVMWCefowr+I/sgTu+waU4hcr6e4T5d7nlH0=
> -SHA256 (go_modules/github.com/pion/interceptor/@v/v0.1.11.zip) = 
> LpU/Tn69lu+Z+ksPiTp/7JqlSjOqGM9XaRyfe47bJaw=
> +SHA256 (go_modules/github.com/pion/datachannel/@v/v1.5.5.mod) = 
> U361zVnsnqlfjSQVHVQCEtaLxPdN5BUA2J8O1Pk61KI=
> +SHA256 (go_modules/github.com/pion/datachannel/@v/v1.5.5.zip) = 
> vQwnTNd2/6WgJ40D1R6BB1o7epUT3jWs16rEA8ltm14=
> +SHA256 (go_modules/github.com/pion/dtls/v2/@v/v2.2.6.mod) = 
> lro7zpoQ2N1f/

CVS: cvs.openbsd.org: ports

2023-09-01 Thread Caspar Schutijser

CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2023/09/01 09:03:28

Modified files:
net/unison : Makefile 

Log message:
net/unison: remove BROKEN-aarch64 marker

OK tb@

net/unison: remove BROKEN-aarch64 marker?

2023-09-01 Thread Caspar Schutijser

Hi,

net/unison has the following BROKEN-aarch64 marker:
> BROKEN-aarch64=segfaults during build with llvm13; needs USE_NOEXECONLY with 
> llvm15

I removed the BROKEN-aarch64 marker on my M1 and I built it there
successfully in a loop over 40 times. I don't know why it works now
whereas it didn't before but the build is not broken on my end. Am I
missing something or can the marker indeed be removed?

Comments or OKs?

Caspar


Index: Makefile
===
RCS file: /cvs/ports/net/unison/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile24 Jul 2023 12:12:56 -  1.25
+++ Makefile1 Sep 2023 14:19:13 -
@@ -1,4 +1,3 @@
-BROKEN-aarch64=segfaults during build with llvm13; needs USE_NOEXECONLY with 
llvm15
 .if ${MACHINE_ARCH} == aarch64
 USE_NOEXECONLY = yes
 .endif

1 2 3 4 5 >

1 - 100 of 462 matches

Mail list logo