date:20231108

Re: add commented out wayland related ports to their categories makefiles

2023-11-08 Thread Marc Espie

If it takes a lot of time before they get linked, I would prefer
everything to be linked in somehow, so that at least sqlports gets
the information, and they don't get passed up in sweeps to change
basic ports elements.

We just need to have them IGNOREd by bulk so they don't get built
by default.  I was thinking of explicit IGNORE lines, but it's
probably better to have a variable that says "these are not yet to
be built in bulks", with a keyword or something, so that they can
be easily included without having to do lots of churn.

I'll give you a bsd.port.mk proposition this week-end.

Re: x11/qt5: KDE Qt5 Patch Collection

2023-11-08 Thread Rafael Sadowski

On Tue Nov 07, 2023 at 08:13:06AM +0100, Rafael Sadowski wrote:
> qtbase-5.15.11pl138. I still have to test an pkg_add -u update with it
> but it should actually work.

env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u -D unsigned
qtbase-5.15.11p0->5.15.11pl138

> 
> What has changed in the port?
> 
> - Upstream Qt project ships which a "includes" directory in the tarball.
>   Qt*/KDE repository does not contain the include directory.
>   We have to run syncqt.pl so I added QT5_GEN_INCLUDES.
> - Looks like mapbox-gl-native is an Qt upstream tarball thing. It's not
>   present in the source code. A lot has changed here. But only on the
>   plugin side.
> - I went through all shared libs and adjusted them.
> - Some cosmetic corrections.
> 
> What do you think? I would like to play it safe with a bulk build.
> 

Another small fix (s/MODQT5_SYNCQT_BIN/QT5_SYNCQT_BIN leftover form a
previous version)

diff --git a/x11/qt5/Makefile.inc b/x11/qt5/Makefile.inc
index b2a1323284b..1e9fcf76e87 100644
--- a/x11/qt5/Makefile.inc
+++ b/x11/qt5/Makefile.inc
@@ -10,11 +10,19 @@ FIX_EXTRACT_PERMISSIONS =   Yes
 VERSION ?= ${QT5_VERSION}
 DIST_VERSION ?=${QT5_DIST_VERSION}
 NEXT_VERSION ?=${QT5_NEXT_VERSION}
+
+.if defined(KDE_VERSION)
+QT5_KDE_VERSION =  ${QT5_VERSION}pl${KDE_VERSION}
+PKGNAME ?= ${QT5NAME:L}-${QT5_KDE_VERSION}
+.else
+DISTNAME ?=${QT5NAME:L}-everywhere-opensource-src-${DIST_VERSION}
+PKGNAME ?= 
${DISTNAME:C/-everywhere-opensource-src//:C/-${DIST_VERSION}/-${VERSION}/}
+.endif
+
 DISTNAME ?=${QT5NAME:L}-everywhere-opensource-src-${DIST_VERSION}
 
 MAINTAINER ?=  Rafael Sadowski 
 
-PKGNAME ?= 
${DISTNAME:C/-everywhere-opensource-src//:C/-${DIST_VERSION}/-${VERSION}/}
 PKGNAME-main ?=${PKGNAME}
 PKGNAME-examples ?=${PKGNAME:C/(-[0-9])/-examples\1/}
 
@@ -40,8 +48,13 @@ RUN_DEPENDS-examples +=  
${BUILD_PKGPATH},-main>=${VERSION:R},<${NEXT_VERSION}
 # A few components, including QtWebEngine, are LGPLv3 only, no LGPLv2.1.
 PERMIT_PACKAGE ?=  Yes
 
+.if defined(KDE_VERSION) && defined(KDE_COMMIT)
+DIST_TUPLE =   kde qt qt/${QT5NAME:L} ${KDE_COMMIT} .
+.else
 SITES ?=   
https://download.qt.io/official_releases/qt/${QT5_DIST_VERSION:R}/${QT5_DIST_VERSION}/submodules/
 \

https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT5_DIST_VERSION:R}/${QT5_DIST_VERSION}/submodules/
+.endif
+
 DIST_SUBDIR ?= qt
 EXTRACT_SUFX ?=.tar.xz
 
@@ -64,7 +77,11 @@ MAKE_FLAGS = -B -j ${MAKE_JOBS} \
   MAKE_FLAGS +=LIB${_l}_VERSION=${_v}
 .endfor
 
+.if defined(KDE_COMMIT)
+WRKDIST =  ${WRKDIR}/${QT5NAME:L}-${KDE_COMMIT}
+.else
 WRKDIST ?= ${WRKDIR}/${DISTNAME:S/opensource-//}
+.endif
 
 # qmake supports so-called "shadow" builds: it's like normal
 # out-of-source build but build directory is required to be located
@@ -96,6 +113,10 @@ ALL_TARGET ?=   first
 FAKE_TARGET ?= install
 TEST_TARGET ?= check
 
+QT5_SYNCQT_BIN ?=  ${LOCALBASE}/lib/qt5/bin/syncqt.pl
+QT5_GEN_INCLUDES = cd ${WRKDIST} && \
+   ${SETENV} ${QT5_SYNCQT_BIN} -version ${MODQT5_VERSION} -quiet ${WRKDIST}
+
 .include 
 
 FLAVOR ?=
diff --git a/x11/qt5/Makefile.version b/x11/qt5/Makefile.version
index 364e4985643..cfe9c189b0c 100644
--- a/x11/qt5/Makefile.version
+++ b/x11/qt5/Makefile.version
@@ -2,7 +2,7 @@
 
 QT5_VERSION =  5.15.11
 QT5_WEBENGINE_VERSION =5.15.10
-QT5_DIST_VERSION = 5.15.11
+QT5_DIST_VERSION ?=5.15.11
 
 # This one is used for building dependencies for examples and documentation,
 # which obviously should be in sync with core packages.
diff --git a/x11/qt5/qtbase/Makefile b/x11/qt5/qtbase/Makefile
index c7d38713f75..fe16229375c 100644
--- a/x11/qt5/qtbase/Makefile
+++ b/x11/qt5/qtbase/Makefile
@@ -1,5 +1,7 @@
-DISTNAME = qtbase-everywhere-opensource-src-${DIST_VERSION}
-QT5NAME =  Qt5 core
+QT5NAME =  QtBase
+
+KDE_COMMIT =   ea7a183732c17005f08ca14fd70cdd305c90396d
+KDE_VERSION =  138
 
 COMMENT-main = C++ general-purpose toolkit
 COMMENT-global =   global Qt5 documentation internals
@@ -7,28 +9,26 @@ COMMENT-mysql =   MySQL plugin for Qt5
 COMMENT-psql = PostgresSQL plugin for Qt5
 COMMENT-tds =  TDS plugin for Qt5
 
-PKGNAME-mysql =qt5-mysql-${VERSION}
-PKGNAME-global =   qt5-global-${VERSION}
-PKGNAME-psql = qt5-postgresql-${VERSION}
-PKGNAME-tds =  qt5-tds-${VERSION}
+PKGNAME-mysql =qt5-mysql-${QT5_KDE_VERSION}
+PKGNAME-global =   qt5-global-${QT5_KDE_VERSION}
+PKGNAME-psql = qt5-postgresql-${QT5_KDE_VERSION}
+PKGNAME-tds =  qt5-tds-${QT5_KDE_VERSION}
 
 PKG_ARCH-global =  *
 PKG_ARCH-examples =*

x11/qt5: KDE Qt5 Patch Collection

2023-11-08 Thread Rafael Sadowski

Hi ports@,

KDE provides security fixes, crash fixes, and other functional defects
atop the Qt5 code-base, in particular Qt 5.15 LTS. Read [1] and [2] for
more information.

With the introduction of DIST_TUPLE, we are now in a position to use
them. Please find a diff below that combine the old with the new world.

If KDE_* is defined we handle the package by DIST_TUPLE otherwise
everything as usual.

For example:
KDE_COMMIT =ea7a183732c17005f08ca14fd70cdd305c90396d
KDE_VERSION =   138

KDE_COMMIT is the invent.kde.org and KDE_VERSION is the number of
patches committed from KDE. This versions pattern uses FreeBSD and
ArchLinux [3] and probably more. I set KDE_VERSION as pl, for example:
qtbase-5.15.11pl138. I still have to test an pkg_add -u update with it
but it should actually work.

What has changed in the port?

- Upstream Qt project ships which a "includes" directory in the tarball.
  Qt*/KDE repository does not contain the include directory.
  We have to run syncqt.pl so I added QT5_GEN_INCLUDES.
- Looks like mapbox-gl-native is an Qt upstream tarball thing. It's not
  present in the source code. A lot has changed here. But only on the
  plugin side.
- I went through all shared libs and adjusted them.
- Some cosmetic corrections.

What do you think? I would like to play it safe with a bulk build.

Rafael

[1]: https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection
[2]: https://community.kde.org/Qt5PatchCollection
[3]: 
https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-tools/-/blob/main/PKGBUILD?ref_type=heads

diff --git a/x11/qt5/Makefile.inc b/x11/qt5/Makefile.inc
index b2a1323284b..484298e239b 100644
--- a/x11/qt5/Makefile.inc
+++ b/x11/qt5/Makefile.inc
@@ -10,11 +10,19 @@ FIX_EXTRACT_PERMISSIONS =   Yes
 VERSION ?= ${QT5_VERSION}
 DIST_VERSION ?=${QT5_DIST_VERSION}
 NEXT_VERSION ?=${QT5_NEXT_VERSION}
+
+.if defined(KDE_VERSION)
+QT5_KDE_VERSION =  ${QT5_VERSION}pl${KDE_VERSION}
+PKGNAME ?= ${QT5NAME:L}-${QT5_KDE_VERSION}
+.else
+DISTNAME ?=${QT5NAME:L}-everywhere-opensource-src-${DIST_VERSION}
+PKGNAME ?= 
${DISTNAME:C/-everywhere-opensource-src//:C/-${DIST_VERSION}/-${VERSION}/}
+.endif
+
 DISTNAME ?=${QT5NAME:L}-everywhere-opensource-src-${DIST_VERSION}
 
 MAINTAINER ?=  Rafael Sadowski 
 
-PKGNAME ?= 
${DISTNAME:C/-everywhere-opensource-src//:C/-${DIST_VERSION}/-${VERSION}/}
 PKGNAME-main ?=${PKGNAME}
 PKGNAME-examples ?=${PKGNAME:C/(-[0-9])/-examples\1/}
 
@@ -40,8 +48,13 @@ RUN_DEPENDS-examples +=  
${BUILD_PKGPATH},-main>=${VERSION:R},<${NEXT_VERSION}
 # A few components, including QtWebEngine, are LGPLv3 only, no LGPLv2.1.
 PERMIT_PACKAGE ?=  Yes
 
+.if defined(KDE_VERSION) && defined(KDE_COMMIT)
+DIST_TUPLE =   kde qt qt/${QT5NAME:L} ${KDE_COMMIT} .
+.else
 SITES ?=   
https://download.qt.io/official_releases/qt/${QT5_DIST_VERSION:R}/${QT5_DIST_VERSION}/submodules/
 \

https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT5_DIST_VERSION:R}/${QT5_DIST_VERSION}/submodules/
+.endif
+
 DIST_SUBDIR ?= qt
 EXTRACT_SUFX ?=.tar.xz
 
@@ -64,7 +77,11 @@ MAKE_FLAGS = -B -j ${MAKE_JOBS} \
   MAKE_FLAGS +=LIB${_l}_VERSION=${_v}
 .endfor
 
+.if defined(KDE_COMMIT)
+WRKDIST =  ${WRKDIR}/${QT5NAME:L}-${KDE_COMMIT}
+.else
 WRKDIST ?= ${WRKDIR}/${DISTNAME:S/opensource-//}
+.endif
 
 # qmake supports so-called "shadow" builds: it's like normal
 # out-of-source build but build directory is required to be located
@@ -96,6 +113,10 @@ ALL_TARGET ?=   first
 FAKE_TARGET ?= install
 TEST_TARGET ?= check
 
+QT5_SYNCQT_BIN ?=  ${LOCALBASE}/lib/qt5/bin/syncqt.pl
+QT5_GEN_INCLUDES = cd ${WRKDIST} && \
+   ${SETENV} ${MODQT5_SYNCQT_BIN} -version ${MODQT5_VERSION} -quiet 
${WRKDIST}
+
 .include 
 
 FLAVOR ?=
diff --git a/x11/qt5/Makefile.version b/x11/qt5/Makefile.version
index 364e4985643..cfe9c189b0c 100644
--- a/x11/qt5/Makefile.version
+++ b/x11/qt5/Makefile.version
@@ -2,7 +2,7 @@
 
 QT5_VERSION =  5.15.11
 QT5_WEBENGINE_VERSION =5.15.10
-QT5_DIST_VERSION = 5.15.11
+QT5_DIST_VERSION ?=5.15.11
 
 # This one is used for building dependencies for examples and documentation,
 # which obviously should be in sync with core packages.
diff --git a/x11/qt5/qtbase/Makefile b/x11/qt5/qtbase/Makefile
index c7d38713f75..fe16229375c 100644
--- a/x11/qt5/qtbase/Makefile
+++ b/x11/qt5/qtbase/Makefile
@@ -1,5 +1,7 @@
-DISTNAME = qtbase-everywhere-opensource-src-${DIST_VERSION}
-QT5NAME =  Qt5 core
+QT5NAME =  QtBase
+
+KDE_COMMIT =   ea7a183732c17005f08ca14fd70cdd305c90396d
+KDE_VERSION =  138
 
 COMMENT-main = C++ general-purpose toolkit
 COMMENT-global =   global Qt5

CVS: cvs.openbsd.org: ports

2023-11-08 Thread James Turner

CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2023/11/08 19:39:44

Modified files:
devel/fossil   : Makefile distinfo 
devel/fossil/patches: patch-auto_def 

Log message:
Update fossil to 2.23.

Release notes: https://fossil-scm.org/home/doc/trunk/www/changes.wiki#v2_23

Re: [update] cad/prusaslicer 2.6.1

2023-11-08 Thread Stuart Henderson

On 2023/10/29 15:23, Renato Aguiar wrote:
> 
> Here is a diff updating cad/prusaslicer to 2.6.1. It depends on updated
> math/cgal and the new port graphics/nanosvg:

Broken on i386 (and maybe other 32-bit?). Log attached.


prusaslicer.log.gz
Description: application/gunzip

Re: py3-black fails with no module named typing_extensions on snapshot 2023-11-07T11:37:49Z

2023-11-08 Thread Daniel Dickman




On Wed, 8 Nov 2023, Mikolaj Kucharski wrote:

> Hi.
> 
> I've noticed it today. Sorry for the lack of a diff :/
> 
> $ black foo.py
> Traceback (most recent call last):
>   File "/usr/local/bin/black", line 5, in 
> from black import patched_main
>   File "/usr/local/lib/python3.10/site-packages/black/__init__.py", line
> 37, in 
> from black.cache import Cache
>   File "/usr/local/lib/python3.10/site-packages/black/cache.py", line
> 19, in 
> from typing_extensions import Self
> ModuleNotFoundError: No module named 'typing_extensions'
> 
> # pkg_info -qI py3-black
> py3-black-23.9.1
> 

I committed a fix, thanks for reporting it.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Daniel Dickman

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2023/11/08 16:27:22

Modified files:
textproc/py-black: Makefile 

Log message:
add missing RDEPs on typing_extensions and packaging

The former reported by Mikolaj Kucharski

Re: [Update] games/stone-soup to 0.30.1

2023-11-08 Thread Stefan S Moran

.desktop file was missing entries

Index: Makefile
===
RCS file: /cvs/ports/games/stone-soup/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile26 Sep 2023 09:41:41 -  1.46
+++ Makefile8 Nov 2023 22:50:19 -
@@ -2,11 +2,10 @@ BROKEN-hppa = ICE on dgn-shoals.cc:638
 
 COMMENT =  dungeon crawl stone soup
 
-VERSION =  0.27.1
+VERSION =  0.30.1
 
 DISTNAME=  stone_soup-${VERSION}-nodeps
 PKGNAME=   stone-soup-${VERSION}
-REVISION=  1
 
 CATEGORIES =   games
 
@@ -87,7 +86,8 @@ post-install:
${INSTALL_DATA} \
${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \
${PREFIX}/share/pixmaps/stone-soup.png
-   ${INSTALL_DATA} ${WRKDIST}/source/debian/crawl-tiles.desktop \
+   ${INSTALL_DATA} \
+   ${WRKDIST}/source/xdg-data/org.develz.Crawl_tiles.desktop \
${PREFIX}/share/applications
 .endif
 
Index: distinfo
===
RCS file: /cvs/ports/games/stone-soup/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo2 Sep 2021 17:03:29 -   1.8
+++ distinfo8 Nov 2023 22:50:19 -
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.27.1-nodeps.tar.xz) = 
4hcd2xSbSomFBC2nrA7224sZLCNIlnA7rw+pmjP0cFo=
-SIZE (stone_soup-0.27.1-nodeps.tar.xz) = 12418672
+SHA256 (stone_soup-0.30.1-nodeps.tar.xz) = 
kG03bvgAH7+fegUkUDD2T5MAxs44VdL43IHNjUjvCkY=
+SIZE (stone_soup-0.30.1-nodeps.tar.xz) = 18901720
Index: patches/patch-source_Makefile
===
RCS file: /cvs/ports/games/stone-soup/patches/patch-source_Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 patch-source_Makefile
--- patches/patch-source_Makefile   11 Mar 2022 19:04:59 -  1.8
+++ patches/patch-source_Makefile   8 Nov 2023 22:50:19 -
@@ -1,7 +1,7 @@
 Index: source/Makefile
 --- source/Makefile.orig
 +++ source/Makefile
-@@ -260,9 +260,6 @@ ifdef msys
+@@ -262,9 +262,6 @@ ifdef msys
BUILD_LIBPNG = YesPlease
COPY_FONTS = yes
endif
@@ -11,7 +11,7 @@ Index: source/Makefile
  endif
  ifeq ($(uname_S),Darwin)
  ifdef MAC_TARGET
-@@ -371,11 +368,8 @@ endif
+@@ -374,11 +371,8 @@ endif
  #
  ifndef NO_APPLE_PLATFORM
  ifeq ($(uname_S),Darwin)
@@ -23,7 +23,7 @@ Index: source/Makefile
  
  
  ifdef WIN32
-@@ -501,15 +495,7 @@ ifneq ($(GCC_VER),)
+@@ -509,15 +503,7 @@ ifneq ($(GCC_VER),)
  GCC_VER_SUFFIX:=-$(GCC_VER)
  endif
  
@@ -39,12 +39,21 @@ Index: source/Makefile
  
  ifneq ($(FORCE_CC),)
  GCC := $(FORCE_CC)
-@@ -1151,51 +1137,6 @@ ifndef NO_OPTIMIZE
+@@ -1177,62 +1163,13 @@ OBJECTS += $(TILEDEFOBJS)
+ 
+ ifdef TILES_ANY
+ ifndef NO_OPTIMIZE
+-  ifneq (,$(shell which advpng))
+-USE_ADVPNG = y
+-  else
+ ifneq (,$(shell which pngcrush))
+   PNGCRUSH = pngcrush -q -m 113
+   PNGCRUSH_LABEL = PNGCRUSH
  endif
-   endif
+-  endif
  endif
--endif
--
+ endif
+ 
 -ifdef BUILD_PCRE
 -CONTRIBS += pcre
 -CONTRIB_LIBS += $(LIBPCRE)
@@ -88,6 +97,26 @@ Index: source/Makefile
 -ifdef BUILD_SQLITE
 -CONTRIBS += sqlite
 -CONTRIB_LIBS += $(LIBSQLITE)
- endif
- 
+-endif
+-
  EXTRA_OBJECTS += version.o
+ 
+ ifdef CONTRIBS
+@@ -1282,7 +1219,7 @@ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/d
+ SRC_PKG_BASE  := stone_soup
+ SRC_VERSION   := $(shell git describe $(MERGE_BASE) 2>/dev/null || cat 
util/release_ver)
+ MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 
's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
+-RECENT_TAG:= $(shell git describe --abbrev=0 $(MERGE_BASE))
++RECENT_TAG= 0.30.1
+ WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo 
win32)
+ 
+ export SRC_VERSION
+@@ -2090,8 +2027,6 @@ mac-app-console: all
+ #
+ # Building the Android package
+ #
+-
+-NPROC := $(shell nproc)
+ 
+ android-project/app/build.gradle: android-project/app/build.gradle.in
+   sed -e "s/@ANDROID_VERSION@/${ANDROID}/" -e 
"s/@CRAWL_VERSION@/${SRC_VERSION}/" -e "s/@NPROC@/${NPROC}/" 
android-project/app/build.gradle
Index: patches/patch-source_debian_crawl-tiles_desktop
===
RCS file: patches/patch-source_debian_crawl-tiles_desktop
diff -N patches/patch-source_debian_crawl-tiles_desktop
--- patches/patch-source_debian_crawl-tiles_desktop 11 Mar 2022 19:04:59 
-  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
 source/debian/crawl-tiles.desktop.orig Thu Sep 29 01:29:00 2016
-+++ source/debian/crawl-tiles.desktop  Thu Sep 29 01:38:51 2016
-@@ -2,6 +2,6 @@
- Type=Application
- 
- Name=Dungeon Crawl (tiles)
--Exec=/usr/games/crawl-tiles
--Icon=crawl
-+Exec=/usr/local/bin/crawl-ss
-+Icon=stone-soup
- Categories=Game;AdventureGame;
Index: patches/patch-source_rltiles_Makefile

py3-black fails with no module named typing_extensions on snapshot 2023-11-07T11:37:49Z

2023-11-08 Thread Mikolaj Kucharski

Hi.

I've noticed it today. Sorry for the lack of a diff :/

$ black foo.py
Traceback (most recent call last):
  File "/usr/local/bin/black", line 5, in 
from black import patched_main
  File "/usr/local/lib/python3.10/site-packages/black/__init__.py", line
37, in 
from black.cache import Cache
  File "/usr/local/lib/python3.10/site-packages/black/cache.py", line
19, in 
from typing_extensions import Self
ModuleNotFoundError: No module named 'typing_extensions'

# pkg_info -qI py3-black
py3-black-23.9.1

-- 
Regards,
 Mikolaj

[Update] games/stone-soup to 0.30.1

2023-11-08 Thread Stefan S Moran

I'm fairly new to porting, so I'd appreciate pointing at any mistakes,
or some tips if I'm missing something obvious.

need OK

Index: Makefile
===
RCS file: /cvs/ports/games/stone-soup/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile26 Sep 2023 09:41:41 -  1.46
+++ Makefile8 Nov 2023 19:18:22 -
@@ -2,11 +2,10 @@ BROKEN-hppa = ICE on dgn-shoals.cc:638
 
 COMMENT =  dungeon crawl stone soup
 
-VERSION =  0.27.1
+VERSION =  0.30.1
 
 DISTNAME=  stone_soup-${VERSION}-nodeps
 PKGNAME=   stone-soup-${VERSION}
-REVISION=  1
 
 CATEGORIES =   games
 
@@ -87,7 +86,8 @@ post-install:
${INSTALL_DATA} \
${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \
${PREFIX}/share/pixmaps/stone-soup.png
-   ${INSTALL_DATA} ${WRKDIST}/source/debian/crawl-tiles.desktop \
+   ${INSTALL_DATA} \
+   ${WRKDIST}/source/xdg-data/org.develz.Crawl_tiles.desktop \
${PREFIX}/share/applications
 .endif
 
Index: distinfo
===
RCS file: /cvs/ports/games/stone-soup/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo2 Sep 2021 17:03:29 -   1.8
+++ distinfo8 Nov 2023 19:18:22 -
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.27.1-nodeps.tar.xz) = 
4hcd2xSbSomFBC2nrA7224sZLCNIlnA7rw+pmjP0cFo=
-SIZE (stone_soup-0.27.1-nodeps.tar.xz) = 12418672
+SHA256 (stone_soup-0.30.1-nodeps.tar.xz) = 
kG03bvgAH7+fegUkUDD2T5MAxs44VdL43IHNjUjvCkY=
+SIZE (stone_soup-0.30.1-nodeps.tar.xz) = 18901720
Index: patches/patch-source_Makefile
===
RCS file: /cvs/ports/games/stone-soup/patches/patch-source_Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 patch-source_Makefile
--- patches/patch-source_Makefile   11 Mar 2022 19:04:59 -  1.8
+++ patches/patch-source_Makefile   8 Nov 2023 19:18:22 -
@@ -1,7 +1,7 @@
 Index: source/Makefile
 --- source/Makefile.orig
 +++ source/Makefile
-@@ -260,9 +260,6 @@ ifdef msys
+@@ -262,9 +262,6 @@ ifdef msys
BUILD_LIBPNG = YesPlease
COPY_FONTS = yes
endif
@@ -11,7 +11,7 @@ Index: source/Makefile
  endif
  ifeq ($(uname_S),Darwin)
  ifdef MAC_TARGET
-@@ -371,11 +368,8 @@ endif
+@@ -374,11 +371,8 @@ endif
  #
  ifndef NO_APPLE_PLATFORM
  ifeq ($(uname_S),Darwin)
@@ -23,7 +23,7 @@ Index: source/Makefile
  
  
  ifdef WIN32
-@@ -501,15 +495,7 @@ ifneq ($(GCC_VER),)
+@@ -509,15 +503,7 @@ ifneq ($(GCC_VER),)
  GCC_VER_SUFFIX:=-$(GCC_VER)
  endif
  
@@ -39,12 +39,21 @@ Index: source/Makefile
  
  ifneq ($(FORCE_CC),)
  GCC := $(FORCE_CC)
-@@ -1151,51 +1137,6 @@ ifndef NO_OPTIMIZE
+@@ -1177,62 +1163,13 @@ OBJECTS += $(TILEDEFOBJS)
+ 
+ ifdef TILES_ANY
+ ifndef NO_OPTIMIZE
+-  ifneq (,$(shell which advpng))
+-USE_ADVPNG = y
+-  else
+ ifneq (,$(shell which pngcrush))
+   PNGCRUSH = pngcrush -q -m 113
+   PNGCRUSH_LABEL = PNGCRUSH
  endif
-   endif
+-  endif
  endif
--endif
--
+ endif
+ 
 -ifdef BUILD_PCRE
 -CONTRIBS += pcre
 -CONTRIB_LIBS += $(LIBPCRE)
@@ -88,6 +97,26 @@ Index: source/Makefile
 -ifdef BUILD_SQLITE
 -CONTRIBS += sqlite
 -CONTRIB_LIBS += $(LIBSQLITE)
- endif
- 
+-endif
+-
  EXTRA_OBJECTS += version.o
+ 
+ ifdef CONTRIBS
+@@ -1282,7 +1219,7 @@ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/d
+ SRC_PKG_BASE  := stone_soup
+ SRC_VERSION   := $(shell git describe $(MERGE_BASE) 2>/dev/null || cat 
util/release_ver)
+ MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 
's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
+-RECENT_TAG:= $(shell git describe --abbrev=0 $(MERGE_BASE))
++RECENT_TAG= 0.30.1
+ WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo 
win32)
+ 
+ export SRC_VERSION
+@@ -2090,8 +2027,6 @@ mac-app-console: all
+ #
+ # Building the Android package
+ #
+-
+-NPROC := $(shell nproc)
+ 
+ android-project/app/build.gradle: android-project/app/build.gradle.in
+   sed -e "s/@ANDROID_VERSION@/${ANDROID}/" -e 
"s/@CRAWL_VERSION@/${SRC_VERSION}/" -e "s/@NPROC@/${NPROC}/" 
android-project/app/build.gradle
Index: patches/patch-source_debian_crawl-tiles_desktop
===
RCS file: patches/patch-source_debian_crawl-tiles_desktop
diff -N patches/patch-source_debian_crawl-tiles_desktop
--- patches/patch-source_debian_crawl-tiles_desktop 11 Mar 2022 19:04:59 
-  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
 source/debian/crawl-tiles.desktop.orig Thu Sep 29 01:29:00 2016
-+++ source/debian/crawl-tiles.desktop  Thu Sep 29 01:38:51 2016
-@@ -2,6 +2,6 @@
- Type=Application
- 
- Name=Dungeon Crawl (tiles)
--Exec=/usr/games/crawl-tiles
--Icon=crawl
-+Exec=/usr/local/bin/crawl-ss

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 12:15:45

Modified files:
x11/gnome  : Makefile 

Log message:
+tecla

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 12:15:25

Log message:
Import tecla-45.0

Tecla is a keyboard layout viewer.

ok robert@

Status:

Vendor Tag: ajacoutot
Release Tags:   ajacoutot_20231108

N ports/x11/gnome/tecla/Makefile
N ports/x11/gnome/tecla/distinfo
N ports/x11/gnome/tecla/pkg/DESCR
N ports/x11/gnome/tecla/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 11:49:29

Modified files:
x11/gnome/settings-daemon: Makefile distinfo 
x11/gnome/settings-daemon/pkg: PLIST 

Log message:
Update to gnome-settings-daemon-45.0.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 11:49:09

Modified files:
x11/gnome/tour : Makefile distinfo 

Log message:
Update to gnome-tour-45.0.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 11:43:09

Modified files:
devel/pango: Makefile distinfo 

Log message:
Update to pango-1.51.0.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 11:33:10

Modified files:
x11/gnome/weather: Makefile distinfo 
x11/gnome/weather/pkg: PLIST 

Log message:
Update to gnome-weather-45.0.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 11:30:17

Modified files:
x11/gnome/gjs  : Makefile distinfo 
x11/gnome/gjs/patches: patch-meson_build 

Log message:
Update to gjs-1.78.0.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

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

Modified files:
devel  : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
devel/spidermonkey102: Makefile distinfo 
devel/spidermonkey102/patches: patch-config_gcc_hidden_h 
   patch-js_src_Makefile_in 
   patch-js_src_build_moz_build 
   patch-js_src_jit_ExecutableAllocator_h 
   
patch-js_src_jit_ProcessExecutableMemory_h 
   patch-js_src_old-configure_in 
   patch-js_src_wasm_WasmSignalHandlers_cpp 
   patch-modules_fdlibm_src_math_private_h 
   patch-moz_configure 
   patch-third_party_rust_cc_src_lib_rs 
devel/spidermonkey102/pkg: DESCR PLIST 

Log message:
Move from spidermonkey102 to spidermonkey115.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 11:28:30

Log message:
Import spidermonkey115-115.4.0.
(really an update to spidermonkey102 which is going to the attic next).

ok landry@

Status:

Vendor Tag: ajacoutot
Release Tags:   ajacoutot_20231108

N ports/devel/spidermonkey115/Makefile
N ports/devel/spidermonkey115/distinfo
N ports/devel/spidermonkey115/patches/patch-config_gcc_hidden_h
N ports/devel/spidermonkey115/patches/patch-js_src_Makefile_in
N ports/devel/spidermonkey115/patches/patch-js_src_build_moz_build
N ports/devel/spidermonkey115/patches/patch-js_src_jit_ExecutableAllocator_h
N 
ports/devel/spidermonkey115/patches/patch-js_src_jit_ProcessExecutableMemory_h
N ports/devel/spidermonkey115/patches/patch-js_src_old-configure_in
N 
ports/devel/spidermonkey115/patches/patch-modules_fdlibm_src_math_private_h
N ports/devel/spidermonkey115/patches/patch-moz_configure
N ports/devel/spidermonkey115/patches/patch-third_party_rust_cc_src_lib_rs
N 
ports/devel/spidermonkey115/patches/patch-js_src_wasm_WasmSignalHandlers_cpp
N ports/devel/spidermonkey115/pkg/DESCR
N ports/devel/spidermonkey115/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 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

Re: sysutils/openbsdisks2: unveil to prevent execution

2023-11-08 Thread Klemens Nanni

On Wed, Nov 08, 2023 at 06:39:19PM +0100, Landry Breuil wrote:
> out of curiosity, what do you mean by 'works under Xfce' ? afaik,
> nothing calls the org.freedesktop.UDisks2 name in xfce code.. and
> thunar-volman (which isnt ported) requires gudev (not ported either)

Means nothing breaks for me under Xfce where this daemon somehow gets
started.

Re: sysutils/openbsdisks2: unveil to prevent execution

2023-11-08 Thread Landry Breuil

Le Wed, Nov 08, 2023 at 11:04:01AM +, Klemens Nanni a écrit :
> This service seems like a common dependency for desktop environments
> and runs as root speaking D-Bus without any activesecurity mechanisms.
> 
> ioctl(2) for cd(4) and sysctl(2) hw.disknames usage currently prevents
> using pledge(2).
> 
> Use unveil("/", "rwc") for starters to strip x bits as, by design, this
> daemon is not executing anything (it spawns a thread, though).
> 
> Perhaps "c" could be dropped as well, but I haven't looked that far into
> its Qt and D-Bus tentacles to check whether it does indeed never tries
> to create any files.
> 
> This works for me under Xfce.

out of curiosity, what do you mean by 'works under Xfce' ? afaik,
nothing calls the org.freedesktop.UDisks2 name in xfce code.. and
thunar-volman (which isnt ported) requires gudev (not ported either)

Landry

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Matthieu Herrb

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2023/11/08 10:13:10

Modified files:
wayland/libinput-openbsd: Makefile 
Added files:
wayland/libinput-openbsd/patches: patch-src_wscons_c 

Log message:
Fix the mouse button mapping for wsmouse
libinput has the mouse buttons in order: left, right, middle while
wsmouse hase left, middle, right.
ok rsadowski@

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Matthieu Herrb

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2023/11/08 10:11:29

ports/wayland/libinput-openbsd/patches

Update of /cvs/ports/wayland/libinput-openbsd/patches
In directory cvs.openbsd.org:/tmp/cvs-serv69530/patches

Log Message:
Directory /cvs/ports/wayland/libinput-openbsd/patches added to the repository

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Jeremie Courreges-Anglas

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2023/11/08 09:24:48

Modified files:
devel/llvm/16  : Makefile 
devel/llvm/16/patches: patch-lld_ELF_Writer_cpp 

Log message:
lld: keep on ignoring local symbols with empty names

This avoids kernel size growth on riscv64 with lld-16.  Fix courtesy of
kettenis.  Upstream decided to remove this hack because "Correct
assemblers don't create such symbols":
https://reviews.llvm.org/rG4ae1c2c6f1b3a0085a0fb0909005e62da156e051

libinput-openbsd: fix mouse button ordering

2023-11-08 Thread Matthieu Herrb

Hi,

libinput has the mouse buttons in order: left, right, middle. So fix
the mappings. While here replace the comment before that code that
doesn't make sense anymore.

I've done this as a patch but if you prefer to commit it upstreams and
do a new release, it also works for me.

Index: Makefile
===
RCS file: /local/cvs/ports/wayland/libinput-openbsd/Makefile,v
diff -u -p -u -r1.5 Makefile
--- Makefile5 Nov 2023 16:58:38 -   1.5
+++ Makefile8 Nov 2023 16:15:12 -
@@ -18,6 +18,7 @@ GH_PROJECT =  libopeninput
 GH_COMMIT =26b7c6bc8b79f2fbc8c58e01d3432ffd7e346d8d
 
 DISTNAME = libinput-openbsd-1.24.0
+REVISION = 0
 
 SHARED_LIBS =  input   0.0
 
Index: patches/patch-src_wscons_c
===
RCS file: patches/patch-src_wscons_c
diff -N patches/patch-src_wscons_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_wscons_c  8 Nov 2023 16:15:12 -
@@ -0,0 +1,30 @@
+Fix mouse button ordering
+
+Index: src/wscons.c
+--- src/wscons.c.orig
 src/wscons.c
+@@ -103,12 +103,18 @@ wscons_process(struct libinput_device *device, struct 
+ 
+   case WSCONS_EVENT_MOUSE_UP:
+   case WSCONS_EVENT_MOUSE_DOWN:
+-  /*
+-   * Do not return wscons(4) values directly because
+-   * the left button value being 0 it will be
+-   * interpreted as an error.
+-   */
+-  button = wsevent->value + BTN_LEFT;
++  /* button to Linux events */
++  switch (wsevent->value) {
++  case 1:
++  button = BTN_MIDDLE;
++  break;
++  case 2:
++  button = BTN_RIGHT;
++  break;
++  default:
++  button = wsevent->value + BTN_LEFT;
++  break;
++  }
+   if (wsevent->type == WSCONS_EVENT_MOUSE_UP)
+   bstate = LIBINPUT_BUTTON_STATE_RELEASED;
+   else

-- 
Matthieu Herrb

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Robert Nagy

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2023/11/08 09:08:51

Modified files:
www/chromium   : Makefile distinfo 
www/chromium/patches: patch-chrome_browser_about_flags_cc 
  patch-chrome_browser_flag_descriptions_cc 
  patch-chrome_browser_flag_descriptions_h 
  
patch-components_optimization_guide_core_optimization_guide_util_cc 
  patch-media_base_media_switches_cc 
  patch-media_base_media_switches_h 
  
patch-media_gpu_chromeos_video_decoder_pipeline_cc 
  patch-sandbox_policy_features_cc 
Added files:
www/chromium/patches: patch-sandbox_policy_features_h 

Log message:
update to 119.0.6045.123

Re: textproc/xpdf: update to 4.04, move old 3.04 to textproc/xpdf3

2023-11-08 Thread Klemens Nanni

On Thu, Nov 02, 2023 at 02:47:36AM +, Klemens Nanni wrote:
> On Wed, Nov 01, 2023 at 09:39:09PM +0100, Matthias Kilian wrote:
> > Hi,
> > 
> > On Wed, Nov 01, 2023 at 07:32:25AM +, Klemens Nanni wrote:
> > > On Wed, Nov 01, 2023 at 01:33:36AM +0100, Matthias Kilian wrote:
> > > > On Tue, Oct 31, 2023 at 10:42:16AM +, Klemens Nanni wrote:
> > > > > 'UPDATE: xpdf-4.04' from februrary 2023 rsadowski's new 4.x port and 
> > > > > sthen's
> > > > > rename idea: https://marc.info/?l=openbsd-ports=167562578021303=2
> > > > [...]
> > > > > Thoughts?
> > > > 
> > > > May it be worth the pain to re-introduce a subpackage xpdf-utils
> > > > (for pdfdetach and pdftopng)?
> > > 
> > > To be able to install xpdf and poppler-utils at the same time?
> > > Port-wise this shouldn't be difficult, so why not if deemed better.
> > 
> > Or just @comment both binaries (and man pages), and un@comment
> > pdfdetach in poppler-utils PLIST. I guess we can live without
> > something like pdftopng.
> 
> Why drop pdftopng from xpdf, what's the problem?
> poppler does not have it.
> 
> > > But is this directly related to the update and rename?
> > 
> > No, The update and rename is fine for me.
> 
> If at all, it'd be easier to sort this out before, imho.
> 
> > 
> > > Would you do this before update/rename or afterwards, i.e. only to new
> > > xpdf-4.04 and leave xpdf3-3.04 without utilities?
> > 
> > Well, @commment the utilities in both versions of xpdf, un@comment
> > pdfdetach in poppler-utils, then commit all three in a small time
> > window should be ok.
> 
> So you want to move pdfdetach to poppler-utils?
> Can you elaborate why?
> 
> IIUC, diff below is what you want.
> 
> But again, I don't know the difference between the two versions and/or why
> pdfdetach is in xpdf now while pdfattach comes from poppler.

Ping.

Index: textproc/xpdf/Makefile
===
RCS file: /cvs/ports/textproc/xpdf/Makefile,v
diff -u -p -r1.98 Makefile
--- textproc/xpdf/Makefile  22 Oct 2023 15:16:54 -  1.98
+++ textproc/xpdf/Makefile  4 Nov 2023 07:06:38 -
@@ -3,7 +3,7 @@ COMMENT=PDF viewer for X11
 DISTNAME=  xpdf-3.04
 CATEGORIES=textproc x11
 EPOCH= 0
-REVISION=  2
+REVISION=  3
 
 SITES= https://xpdfreader-dl.s3.amazonaws.com/old/
 
@@ -33,7 +33,7 @@ COMPILER =base-clang ports-gcc base-gc
 NO_TEST=   Yes
 
 # others are already in popper-utils
-PROGS= xpdf pdfdetach pdftopng
+PROGS= xpdf pdftopng
 ALL_TARGET=${PROGS}
 
 do-install:
Index: textproc/xpdf/pkg/PLIST
===
RCS file: /cvs/ports/textproc/xpdf/pkg/PLIST,v
diff -u -p -r1.14 PLIST
--- textproc/xpdf/pkg/PLIST 11 Mar 2022 20:03:37 -  1.14
+++ textproc/xpdf/pkg/PLIST 2 Nov 2023 02:30:12 -
@@ -1,10 +1,9 @@
+@conflict poppler-utils-<23.10.0p0
 @conflict xpdf-utils-*
 @pkgpath textproc/xpdf,-main
 @pkgpath textproc/xpdf,-utils
-@bin bin/pdfdetach
 @bin bin/pdftopng
 @bin bin/xpdf
-@man man/man1/pdfdetach.1
 @man man/man1/pdftopng.1
 @man man/man1/xpdf.1
 @man man/man5/xpdfrc.5
Index: print/poppler/Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.177 Makefile
--- print/poppler/Makefile  7 Nov 2023 23:56:40 -   1.177
+++ print/poppler/Makefile  8 Nov 2023 09:43:26 -
@@ -10,6 +10,7 @@ PKGNAME-main= poppler-$V
 PKGNAME-utils= poppler-utils-$V
 PKGNAME-qt5=   poppler-qt5-$V
 PKGNAME-qt6=   poppler-qt6-$V
+REVISION-utils=0
 
 EXTRACT_SUFX=  .tar.xz
 
Index: print/poppler/pkg/PLIST-utils
===
RCS file: /cvs/ports/print/poppler/pkg/PLIST-utils,v
diff -u -p -r1.6 PLIST-utils
--- print/poppler/pkg/PLIST-utils   11 Mar 2022 19:51:06 -  1.6
+++ print/poppler/pkg/PLIST-utils   2 Nov 2023 02:29:07 -
@@ -1,8 +1,9 @@
+@conflict xpdf-<3.04p3
 @conflict xpdf-utils-*
 @conflict poppler-<0.18.4p0
 @pkgpath textproc/xpdf,-utils
 @bin bin/pdfattach
-@comment bin/pdfdetach
+@bin bin/pdfdetach
 @bin bin/pdffonts
 @bin bin/pdfimages
 @bin bin/pdfinfo
@@ -14,7 +15,7 @@
 @bin bin/pdftotext
 @bin bin/pdfunite
 @man man/man1/pdfattach.1
-@comment man/man1/pdfdetach.1
+@man man/man1/pdfdetach.1
 @man man/man1/pdffonts.1
 @man man/man1/pdfimages.1
 @man man/man1/pdfinfo.1

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Klemens Nanni

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/11/08 08:55:56

Modified files:
misc/findutils : Makefile distinfo 
misc/findutils/pkg: PLIST 

Log message:
update to findutils 4.9.0

Re: NEW: devel/sccache

2023-11-08 Thread Landry Breuil

Le Wed, Nov 08, 2023 at 04:25:47PM +0100, Caspar Schutijser a écrit :
> 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 ,
> > > > > > 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?

ok and thanks !

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

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Klemens Nanni

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/11/08 08:30:55

Modified files:
sysutils/upower/patches: patch-src_up-main_c 

Log message:
update comment;  OK landry

Re: APM_ARCHS: add riscv64

2023-11-08 Thread Stuart Henderson

On 2023/11/08 12:35, Jeremie Courreges-Anglas wrote:
> 
> I wanted to add riscv64 to APM_ARCHS because a few (mostly gui) ports
> are missing from bulk builds (an important one is sysutils/upower).
> machine/apmvar.h may be needed to build those ports but there is no
> promise that apm(4) / apmd(8) will be available at runtime.  sparc64 for
> example has no apm(4) driver.
> 
> I'm going to commit the following diff for riscv64.  If people want to
> add their pet architecture to the list, feel free to do so.  armv7 and
> powerpc64 already ship a machine/apmvar.h header.

I agree this variable is really useful for "will it build" (i.e. has
apmvar.h) rather than whether apm actually does anything at runtime.
Makes sense to me.

> 
> Index: arch-defines.mk
> ===
> RCS file: /home/cvs/ports/infrastructure/mk/arch-defines.mk,v
> diff -u -p -p -u -r1.98 arch-defines.mk
> --- arch-defines.mk   7 Jun 2023 13:00:33 -   1.98
> +++ arch-defines.mk   8 Nov 2023 11:29:26 -
> @@ -16,7 +16,7 @@ ALL_ARCHS = aarch64 alpha amd64 arm arm6
>   sh sparc64
>  # normally only list MACHINE_ARCH (uname -p) names in these variables,
>  # but not all powerpc have apm(4), hence the use of macppc
> -APM_ARCHS = arm64 amd64 i386 loongson macppc sparc64
> +APM_ARCHS = arm64 amd64 i386 loongson macppc riscv64 sparc64
>  BE_ARCHS = hppa m88k mips64 powerpc powerpc64 sparc64
>  LE_ARCHS = aarch64 alpha amd64 arm i386 mips64el riscv64 sh
>  LP64_ARCHS = aarch64 alpha amd64 mips64 mips64el powerpc64 riscv64 sparc64
> 
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>

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 ,
> > > > > 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

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Landry Breuil

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2023/11/08 08:09:42

Modified files:
sysutils/upower: Makefile 
Added files:
sysutils/upower/patches: patch-src_up-main_c 

Log message:
sysutils/upower: unveil() required paths to tighten upowerd environment

- needs /var/run/dbus rw to talk to systemwide dbus-daemon
- needs /var/db/upower rwc to write history files
- pledge() isn't possible due to the use of apm ioctl()s

prompted by a diff from kn@, ok kn@

Re: sysutils/upower: unveil to prevent execution

2023-11-08 Thread Klemens Nanni

On Wed, Nov 08, 2023 at 03:30:37PM +0100, Landry Breuil wrote:
> Le Wed, Nov 08, 2023 at 02:20:22PM +, Klemens Nanni a écrit :
> > On Wed, Nov 08, 2023 at 03:11:33PM +0100, Landry Breuil wrote:
> > > Le Wed, Nov 08, 2023 at 02:56:53PM +0100, Landry Breuil a écrit :
> > > > if you want to go down that road, barring any glib madness about various
> > > > ~/.cache or .local stuff, upower itself should only need wc on
> > > >  /var/db/upower/
> > > 
> > > bah, spoke too fast, it also needs var/run/dbus to talk to the
> > > systemwide dbus daemon:
> > > 
> > > +   if (unveil("/", "r") == -1)
> > > +   err(1, "unveil /");
> > > +   if (unveil("/var/run/dbus/", "rw") == -1)
> > > +   err(1, "unveil /var/run/dbus");
> > > +   if (unveil("/var/db/upower", "rwc") == -1)
> > > +   err(1, "unveil /var/db/upower");
> > > +   if (unveil(NULL, NULL) == -1)
> > > +   err(1, "unveil NULL");
> > > 
> > > with that it seems to work here.
> > 
> > I welcome this direction, but haven't gone through the code yet wrt.
> > read/write/create file access -- not as easy as hunting for x bits,
> > as you also demonstrated.
> > 
> > If consense is to use unveil() here, I'd be happy to start with a diff
> > like mine and iterate.
> 
> we're not the first ones to go this way :)
> 
> https://gitlab.freedesktop.org/upower/upower/-/blob/master/src/upower.service.in?ref_type=heads#L11
> 
> im pretty confident that rwc on /var/db/upower + rw on /var/run/dbus
> should be enough for regular use.
> 
> we create /var/db/upower in the package, the code tries to recreate
> it/set modes in
> https://gitlab.freedesktop.org/upower/upower/-/blob/master/src/up-history.c?ref_type=heads#L413
> and then the history files are written/overwritten/created as needed in
> https://gitlab.freedesktop.org/upower/upower/-/blob/master/src/up-history.c?ref_type=heads#L545

Good enough for me to start with your diff,
OK kn

> 
> it might be possible to tighten the unveil by calling it later on but
> for now it seems better than nothing.

Re: sysutils/upower: unveil to prevent execution

2023-11-08 Thread Landry Breuil

Le Wed, Nov 08, 2023 at 02:20:22PM +, Klemens Nanni a écrit :
> On Wed, Nov 08, 2023 at 03:11:33PM +0100, Landry Breuil wrote:
> > Le Wed, Nov 08, 2023 at 02:56:53PM +0100, Landry Breuil a écrit :
> > > if you want to go down that road, barring any glib madness about various
> > > ~/.cache or .local stuff, upower itself should only need wc on
> > >  /var/db/upower/
> > 
> > bah, spoke too fast, it also needs var/run/dbus to talk to the
> > systemwide dbus daemon:
> > 
> > +   if (unveil("/", "r") == -1)
> > +   err(1, "unveil /");
> > +   if (unveil("/var/run/dbus/", "rw") == -1)
> > +   err(1, "unveil /var/run/dbus");
> > +   if (unveil("/var/db/upower", "rwc") == -1)
> > +   err(1, "unveil /var/db/upower");
> > +   if (unveil(NULL, NULL) == -1)
> > +   err(1, "unveil NULL");
> > 
> > with that it seems to work here.
> 
> I welcome this direction, but haven't gone through the code yet wrt.
> read/write/create file access -- not as easy as hunting for x bits,
> as you also demonstrated.
> 
> If consense is to use unveil() here, I'd be happy to start with a diff
> like mine and iterate.

we're not the first ones to go this way :)

https://gitlab.freedesktop.org/upower/upower/-/blob/master/src/upower.service.in?ref_type=heads#L11

im pretty confident that rwc on /var/db/upower + rw on /var/run/dbus
should be enough for regular use.

we create /var/db/upower in the package, the code tries to recreate
it/set modes in
https://gitlab.freedesktop.org/upower/upower/-/blob/master/src/up-history.c?ref_type=heads#L413
and then the history files are written/overwritten/created as needed in
https://gitlab.freedesktop.org/upower/upower/-/blob/master/src/up-history.c?ref_type=heads#L545

it might be possible to tighten the unveil by calling it later on but
for now it seems better than nothing.

Re: sysutils/upower: unveil to prevent execution

2023-11-08 Thread Klemens Nanni

On Wed, Nov 08, 2023 at 03:11:33PM +0100, Landry Breuil wrote:
> Le Wed, Nov 08, 2023 at 02:56:53PM +0100, Landry Breuil a écrit :
> > if you want to go down that road, barring any glib madness about various
> > ~/.cache or .local stuff, upower itself should only need wc on
> >  /var/db/upower/
> 
> bah, spoke too fast, it also needs var/run/dbus to talk to the
> systemwide dbus daemon:
> 
> +   if (unveil("/", "r") == -1)
> +   err(1, "unveil /");
> +   if (unveil("/var/run/dbus/", "rw") == -1)
> +   err(1, "unveil /var/run/dbus");
> +   if (unveil("/var/db/upower", "rwc") == -1)
> +   err(1, "unveil /var/db/upower");
> +   if (unveil(NULL, NULL) == -1)
> +   err(1, "unveil NULL");
> 
> with that it seems to work here.

I welcome this direction, but haven't gone through the code yet wrt.
read/write/create file access -- not as easy as hunting for x bits,
as you also demonstrated.

If consense is to use unveil() here, I'd be happy to start with a diff
like mine and iterate.

Re: sysutils/upower: unveil to prevent execution

2023-11-08 Thread Landry Breuil

Le Wed, Nov 08, 2023 at 02:56:53PM +0100, Landry Breuil a écrit :
> Le Wed, Nov 08, 2023 at 01:49:56PM +, Klemens Nanni a écrit :
> > Started by D-Bus, this upowerd(8) runs as root without the usual
> > OpenBSD security considerations.
> > 
> > upowerd(8) used to support scripts, but deprecated them in 2013.
> > I don't see any other code that would fork or exec stuff.
> > 
> > apm(4) ioctls is not covered by pledge(2), sensors readying via
> > sysctl(2) should be, though.
> > 
> > So as with openbsdisks2, unveil("/", "rwc") to strip the x bit.
> > 
> > `upower --monitor-detail' and replugging my notebook's power cable
> > still provides all the details.
> > 
> > Works for me on Xfce.
> > Feedback? Objection? OK?
> 
> if you want to go down that road, barring any glib madness about various
> ~/.cache or .local stuff, upower itself should only need wc on
>  /var/db/upower/

bah, spoke too fast, it also needs var/run/dbus to talk to the
systemwide dbus daemon:

+   if (unveil("/", "r") == -1)
+   err(1, "unveil /");
+   if (unveil("/var/run/dbus/", "rw") == -1)
+   err(1, "unveil /var/run/dbus");
+   if (unveil("/var/db/upower", "rwc") == -1)
+   err(1, "unveil /var/db/upower");
+   if (unveil(NULL, NULL) == -1)
+   err(1, "unveil NULL");

with that it seems to work here.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 07:09:08

Added files:
graphics/digikam/patches: 
  patch-core_libs_metadataengine_CMakeLists_txt 

Log message:
Tentative fix for exiv2>=0.28.1.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Matthieu Herrb

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2023/11/08 07:04:07

Modified files:
wayland/sway   : Makefile distinfo 
wayland/sway/pkg: PLIST 

Log message:
Update sway to the current head. Still not linked to the build

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Matthieu Herrb

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2023/11/08 07:03:11

Modified files:
wayland/wlroots: Makefile distinfo 
wayland/wlroots/pkg: PLIST 

Log message:
Update wlroots to current head. Still not linked to the build

Warning: you need to pkg_delete the previous version to build this one.

Re: sysutils/upower: unveil to prevent execution

2023-11-08 Thread Landry Breuil

Le Wed, Nov 08, 2023 at 01:49:56PM +, Klemens Nanni a écrit :
> Started by D-Bus, this upowerd(8) runs as root without the usual
> OpenBSD security considerations.
> 
> upowerd(8) used to support scripts, but deprecated them in 2013.
> I don't see any other code that would fork or exec stuff.
> 
> apm(4) ioctls is not covered by pledge(2), sensors readying via
> sysctl(2) should be, though.
> 
> So as with openbsdisks2, unveil("/", "rwc") to strip the x bit.
> 
> `upower --monitor-detail' and replugging my notebook's power cable
> still provides all the details.
> 
> Works for me on Xfce.
> Feedback? Objection? OK?

if you want to go down that road, barring any glib madness about various
~/.cache or .local stuff, upower itself should only need wc on
/var/db/upower/

Landry

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 06:55:32

Modified files:
sysutils/google-cloud-sdk: Makefile distinfo 
sysutils/google-cloud-sdk/pkg: PLIST 

Log message:
Update to google-cloud-sdk-454.0.0.

sysutils/upower: unveil to prevent execution

2023-11-08 Thread Klemens Nanni

Started by D-Bus, this upowerd(8) runs as root without the usual
OpenBSD security considerations.

upowerd(8) used to support scripts, but deprecated them in 2013.
I don't see any other code that would fork or exec stuff.

apm(4) ioctls is not covered by pledge(2), sensors readying via
sysctl(2) should be, though.

So as with openbsdisks2, unveil("/", "rwc") to strip the x bit.

`upower --monitor-detail' and replugging my notebook's power cable
still provides all the details.

Works for me on Xfce.
Feedback? Objection? OK?


Index: Makefile
===
RCS file: /cvs/ports/sysutils/upower/Makefile,v
diff -u -p -r1.71 Makefile
--- Makefile17 Oct 2023 08:15:21 -  1.71
+++ Makefile8 Nov 2023 12:26:28 -
@@ -5,6 +5,7 @@ COMMENT =   userland power management inte
 V =v1.90.2
 DISTNAME = upower-${V}
 PKGNAME =  upower-${V:S/v//}
+REVISION = 0
 
 CATEGORIES =   sysutils
 SHARED_LIBS +=  upower-glib  3.0
@@ -17,6 +18,7 @@ MAINTAINER =  Landry Breuil 
+ #include 
+ #include 
+ #include 
+@@ -183,6 +184,11 @@ main (gint argc, gchar **argv)
+   UpState *state;
+   GBusNameOwnerFlags bus_flags;
+   gboolean replace = FALSE;
++
++  if (unveil("/", "rwc") == -1)
++  err(1, "unveil /");
++  if (unveil(NULL, NULL) == -1)
++  err(1, "unveil NULL");
+ 
+   const GOptionEntry options[] = {
+   { "timed-exit", '\0', 0, G_OPTION_ARG_NONE, _exit,

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 06:29:00

Modified files:
x11/lxqt/liblxqt: Makefile 

Log message:
Oops, forgot one in previous.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Jeremie Courreges-Anglas

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2023/11/08 05:54:51

Modified files:
devel/llvm/13  : Makefile 
devel/llvm/16  : Makefile 
devel/llvm/files: README-main 

Log message:
Fix README instructions

PREFIX->TRUEPREFIX

ok kn@ semarie@ (maintainer)

[update] Lagrange to 1.17.3

2023-11-08 Thread Florian Viehweger

Hi,

this is an update for Lagrange to 1.17.3.

Some testing done on amd64. No issues found.

portcheck and 'make port-lib-depends-check' are happy.

Changes listed here [1].

Comments?

Thanks!

[1] https://github.com/skyjake/lagrange/releases


Index: Makefile
===
RCS file: /daten/openbsdmirror/cvs/mirror/ports/net/lagrange/Makefile,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 Makefile
--- Makefile26 Oct 2023 09:49:38 -  1.69
+++ Makefile8 Nov 2023 11:27:30 -
@@ -1,5 +1,5 @@
 COMMENT =  SDL multi protocol navigator
-VERSION =  1.17.2
+VERSION =  1.17.3
 
 DISTNAME = lagrange-${VERSION}
 
Index: distinfo
===
RCS file: /daten/openbsdmirror/cvs/mirror/ports/net/lagrange/distinfo,v
retrieving revision 1.57
diff -u -p -u -p -r1.57 distinfo
--- distinfo26 Oct 2023 09:49:38 -  1.57
+++ distinfo8 Nov 2023 11:27:30 -
@@ -1,2 +1,2 @@
-SHA256 (lagrange-1.17.2.tar.gz) = F1AGmN2fkO9G3Cw2DwCzkvJN3IXU8H5mSDTuBaSkD2I=
-SIZE (lagrange-1.17.2.tar.gz) = 10205442
+SHA256 (lagrange-1.17.3.tar.gz) = zQxHl+OZCCzL9NDt6TnvKGuWhjwxhg9iOH/ZQnXdo7o=
+SIZE (lagrange-1.17.3.tar.gz) = 10204884

-- 
greetings,

Florian Viehweger

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Jeremie Courreges-Anglas

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2023/11/08 04:42:23

Modified files:
infrastructure/mk: arch-defines.mk 

Log message:
Add riscv64 to APM_ARCHS

riscv64 provides a machine/apmvar.h header needed by ports at build
time.  Like sparc64 it doesn't provide an apm(4) driver - yet.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Martin Reindl

CVSROOT:/cvs
Module name:ports
Changes by: mar...@cvs.openbsd.org  2023/11/08 04:38:29

Modified files:
devel/openmpi  : Makefile distinfo 
devel/openmpi/patches: patch-configure 

Log message:
Update openmpi to 4.1.6.

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Matthieu Herrb

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2023/11/08 04:35:56

Modified files:
graphics   : Makefile 

Log message:
Add commented out entry for fcft, missed in previous

APM_ARCHS: add riscv64

2023-11-08 Thread Jeremie Courreges-Anglas



I wanted to add riscv64 to APM_ARCHS because a few (mostly gui) ports
are missing from bulk builds (an important one is sysutils/upower).
machine/apmvar.h may be needed to build those ports but there is no
promise that apm(4) / apmd(8) will be available at runtime.  sparc64 for
example has no apm(4) driver.

I'm going to commit the following diff for riscv64.  If people want to
add their pet architecture to the list, feel free to do so.  armv7 and
powerpc64 already ship a machine/apmvar.h header.


Index: arch-defines.mk
===
RCS file: /home/cvs/ports/infrastructure/mk/arch-defines.mk,v
diff -u -p -p -u -r1.98 arch-defines.mk
--- arch-defines.mk 7 Jun 2023 13:00:33 -   1.98
+++ arch-defines.mk 8 Nov 2023 11:29:26 -
@@ -16,7 +16,7 @@ ALL_ARCHS = aarch64 alpha amd64 arm arm6
sh sparc64
 # normally only list MACHINE_ARCH (uname -p) names in these variables,
 # but not all powerpc have apm(4), hence the use of macppc
-APM_ARCHS = arm64 amd64 i386 loongson macppc sparc64
+APM_ARCHS = arm64 amd64 i386 loongson macppc riscv64 sparc64
 BE_ARCHS = hppa m88k mips64 powerpc powerpc64 sparc64
 LE_ARCHS = aarch64 alpha amd64 arm i386 mips64el riscv64 sh
 LP64_ARCHS = aarch64 alpha amd64 mips64 mips64el powerpc64 riscv64 sparc64


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Kirill Bychkov

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2023/11/08 04:33:55

Modified files:
games/naev : Makefile 

Log message:
add missung BDEP
reported by tb@, thanks!

seatd: switch to upstream SITES

2023-11-08 Thread Matthieu Herrb

Hi,

now that seatd 0.8.0 has been released with some level of
NetBSD/FreeBSD support, it becomes easier to switch to the upstream
distribution and ship patches for OpenBSD.

There is no actual functionnal change between the previous package and
the new one.

comments, oks?  (still not linked).

Index: Makefile
===
RCS file: /local/cvs/ports/sysutils/seatd/Makefile,v
diff -u -p -u -r1.3 Makefile
--- Makefile27 Sep 2023 17:16:33 -  1.3
+++ Makefile8 Nov 2023 11:20:02 -
@@ -1,12 +1,12 @@
 COMMENT=   minimal seat management daemon and universal library
 
-V =20230813
-PKGNAME =  seatd-$V
-DISTNAME = seatd-openbsd-$V
+V =0.8.0
+EPOCH =0
+DISTNAME = seatd-$V
 CATEGORIES =   sysutils
-REVISION = 0
 
-SITES =
https://gitlab.tetaneutral.net/mherrb/seatd/-/archive/openbsd-${V}/
+SITES =https://git.sr.ht/~kennylevinsen/seatd/archive/
+DISTFILES = seatd-{}${V}${EXTRACT_SUFX}
 
 SHARED_LIBS+=  seat 0.0 # 0.0
 
Index: distinfo
===
RCS file: /local/cvs/ports/sysutils/seatd/distinfo,v
diff -u -p -u -r1.2 distinfo
--- distinfo23 Aug 2023 14:03:31 -  1.2
+++ distinfo8 Nov 2023 11:20:02 -
@@ -1,2 +1,2 @@
-SHA256 (seatd-openbsd-20230813.tar.gz) = 
mw/4GTTgnfi7E5yMIDxH6KqWeYsX+K3VsFxvftDW+9U=
-SIZE (seatd-openbsd-20230813.tar.gz) = 39459
+SHA256 (seatd-0.8.0.tar.gz) = pWKkTuM8yyCVShweyakOyy23oHrWsY0KyQQyjvvPZaA=
+SIZE (seatd-0.8.0.tar.gz) = 39349
Index: patches/patch-common_drm_c
===
RCS file: patches/patch-common_drm_c
diff -N patches/patch-common_drm_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-common_drm_c  8 Nov 2023 11:20:02 -
@@ -0,0 +1,14 @@
+OpenBSD support
+
+Index: common/drm.c
+--- common/drm.c.orig
 common/drm.c
+@@ -21,7 +21,7 @@ int drm_drop_master(int fd) {
+   return ioctl(fd, DRM_IOCTL_DROP_MASTER, 0);
+ }
+ 
+-#if defined(__linux__) || defined(__NetBSD__)
++#if defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ int path_is_drm(const char *path) {
+   if (STR_HAS_PREFIX("/dev/dri/", path))
+   return 1;
Index: patches/patch-common_evdev_c
===
RCS file: patches/patch-common_evdev_c
diff -N patches/patch-common_evdev_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-common_evdev_c8 Nov 2023 11:20:02 -
@@ -0,0 +1,14 @@
+OpenBSD support 
+
+Index: common/evdev.c
+--- common/evdev.c.orig
 common/evdev.c
+@@ -25,7 +25,7 @@ int path_is_evdev(const char *path) {
+ int evdev_revoke(int fd) {
+   return ioctl(fd, EVIOCREVOKE, NULL);
+ }
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+ int path_is_evdev(const char *path) {
+   (void)path;
+   return 0;
Index: patches/patch-common_terminal_c
===
RCS file: patches/patch-common_terminal_c
diff -N patches/patch-common_terminal_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-common_terminal_c 8 Nov 2023 11:20:02 -
@@ -0,0 +1,38 @@
+OpenBSD console support 
+
+Index: common/terminal.c
+--- common/terminal.c.orig
 common/terminal.c
+@@ -21,7 +21,7 @@
+ #define K_ENABLE  K_XLATE
+ #define K_DISABLE K_RAW
+ #define FRSIG SIGIO
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+ #include 
+ #define K_ENABLE  K_XLATE
+ #define K_DISABLE K_RAW
+@@ -147,6 +147,14 @@ static int get_tty_path(int tty, char path[static TTYP
+   }
+   return 0;
+ }
++#elif defined(__OpenBSD__)
++static int get_tty_path(int tty, char path[static TTYPATHLEN]) {
++  assert(tty >= 0);
++  if (snprintf(path, TTYPATHLEN, "/dev/ttyC%d", tty) == -1) {
++  return -1;
++  }
++  return 0;
++}
+ #else
+ #error Unsupported platform
+ #endif
+@@ -175,7 +183,7 @@ int terminal_current_vt(int fd) {
+   return -1;
+   }
+   return st.v_active;
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+   int vt;
+   int res = ioctl(fd, VT_GETACTIVE, );
+   close(fd);
Index: patches/patch-common_wscons_c
===
RCS file: patches/patch-common_wscons_c
diff -N patches/patch-common_wscons_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-common_wscons_c   8 Nov 2023 11:20:02 -
@@ -0,0 +1,14 @@
+OpenBSD support
+
+Index: common/wscons.c
+--- common/wscons.c.orig
 common/wscons.c
+@@ -10,7 +10,7 @@
+ 
+ #define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
+ 
+-#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ int path_is_wscons(const char *path) {
+   static const char wskbd[] =

sysutils/openbsdisks2: unveil to prevent execution

2023-11-08 Thread Klemens Nanni

This service seems like a common dependency for desktop environments
and runs as root speaking D-Bus without any activesecurity mechanisms.

ioctl(2) for cd(4) and sysctl(2) hw.disknames usage currently prevents
using pledge(2).

Use unveil("/", "rwc") for starters to strip x bits as, by design, this
daemon is not executing anything (it spawns a thread, though).

Perhaps "c" could be dropped as well, but I haven't looked that far into
its Qt and D-Bus tentacles to check whether it does indeed never tries
to create any files.

This works for me under Xfce.
Feedback? Objection? OK?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/openbsdisks2/Makefile,v
diff -u -p -r1.8 Makefile
--- Makefile27 Sep 2023 17:16:32 -  1.8
+++ Makefile8 Nov 2023 10:27:38 -
@@ -2,6 +2,7 @@ COMMENT =   UDisks2 service implementation
 
 V =0.3.1
 DISTNAME = openbsdisks2-${V}
+REVISION = 0
 
 CATEGORIES =   sysutils
 
@@ -15,6 +16,7 @@ PERMIT_PACKAGE =  Yes
 # C++
 COMPILER = base-clang ports-gcc
 
+# uses unveil()
 WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus c m util
 
 SITES =
https://github.com/sizeofvoid/openbsdisks2/releases/download/v${V}/
Index: patches/patch-src_main_cpp
===
RCS file: patches/patch-src_main_cpp
diff -N patches/patch-src_main_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_main_cpp  8 Nov 2023 10:56:01 -
@@ -0,0 +1,28 @@
+Uncovered sysctl(2) and ioctl(2) prevents pledge(2) usage.
+unveil(2) all files read-write-create to prevent execution.
+Index: src/main.cpp
+--- src/main.cpp.orig
 src/main.cpp
+@@ -34,8 +34,10 @@
+ #include "manageradaptor.h"
+ #include "objectmanager.h"
+ 
++#include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ 
+@@ -84,6 +86,11 @@ static void msg_handler(QtMsgType type, const QMessage
+ 
+ int main(int argc, char** argv)
+ {
++if (unveil("/", "rwc") == -1)
++err(1, "unveil /");
++if (unveil(NULL, NULL) == -1)
++err(1, "unveil NULL");
++
+ qInstallMessageHandler(msg_handler);
+ 
+ qRegisterMetaType();

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Matthieu Herrb

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2023/11/08 03:46:09

Modified files:
devel  : Makefile 
graphics   : Makefile 
sysutils   : Makefile 

Log message:
Add commented-out entries for wayland related ports. ok sthen@

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Klemens Nanni

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/11/08 03:46:12

Modified files:
security/xmlsec: Makefile distinfo 
security/xmlsec/patches: patch-tests_testrun_sh 

Log message:
update to xmlsec 1.3.2

Re: add commented out wayland related ports to their categories makefiles

2023-11-08 Thread Matthieu Herrb

On Wed, Nov 08, 2023 at 09:55:48AM +, Matthieu Herrb wrote:
> Hi,
> 
> when importing the ports needed for wayland, not yet linked to the
> build, I did not add them to the Makefiles. This fixes that.
> rsadowski@ took care of the wayland/ directory.
>

New diff with wayland markers and the missed devel/ directory added:

Index: devel/Makefile
===
RCS file: /local/cvs/ports/devel/Makefile,v
diff -u -p -u -r1.2349 Makefile
--- devel/Makefile  4 Nov 2023 15:01:13 -   1.2349
+++ devel/Makefile  8 Nov 2023 10:25:50 -
@@ -329,6 +329,7 @@
  SUBDIR += libsoup
  SUBDIR += libsoup3
  SUBDIR += libspectrum
+ #SUBDIR += libstdthreads # wayland
  SUBDIR += libtalloc
  SUBDIR += libtermkey
  SUBDIR += libtool
@@ -1839,6 +1840,7 @@
  SUBDIR += tkdiff
  SUBDIR += tklib
  SUBDIR += tl-expected
+ #SUDIR += tllist  # wayland
  SUBDIR += tradcpp
  SUBDIR += ucpp
  SUBDIR += udis86
Index: graphics/Makefile
===
RCS file: /local/cvs/ports/graphics/Makefile,v
diff -u -p -u -r1.604 Makefile
--- graphics/Makefile   31 Oct 2023 13:16:10 -  1.604
+++ graphics/Makefile   8 Nov 2023 10:25:55 -
@@ -147,6 +147,7 @@
  SUBDIR += libimagequant
  SUBDIR += libiptcdata
  SUBDIR += libjxl
+ #SUBDIR += libliftoff # wayland
  SUBDIR += liblqr
  SUBDIR += libmng
  SUBDIR += libmpeg2
Index: sysutils/Makefile
===
RCS file: /local/cvs/ports/sysutils/Makefile,v
diff -u -p -u -r1.702 Makefile
--- sysutils/Makefile   27 Oct 2023 18:48:42 -  1.702
+++ sysutils/Makefile   8 Nov 2023 10:26:01 -
@@ -154,7 +154,9 @@
  SUBDIR += kubectl
  SUBDIR += lf
  SUBDIR += libburn
+ #SUBDIR += libdisplay-info # wayland
  SUBDIR += libesedb
+ #SUBDIR += libevdev-openbsd # wayland
  SUBDIR += libevt
  SUBDIR += libevtx
  SUBDIR += libfsapfs
@@ -381,6 +383,7 @@
  SUBDIR += salt-testing
  SUBDIR += sblim-sfcc
  SUBDIR += screenfetch
+ #SUBDIR += seatd # wayland
  SUBDIR += sec
  SUBDIR += serf
  SUBDIR += setquota

-- 
Matthieu Herrb

Re: add commented out wayland related ports to their categories makefiles

2023-11-08 Thread Stuart Henderson

On 2023/11/08 11:10, Antoine Jacoutot wrote:
> On the other hand a hackathon is starting. So it might be a good time for it?

Unless other ports start depending to them, adding them to the build
gives no information at all, since they won't even get installed.

Might be a good time for a test build with them linked and manually
installed (so DPB doesn't junk them). We might even get lucky and see
actual build failures, though check-lib-depends would be more useful.

> —
> Antoine
> 
> > On Nov 8, 2023, at 11:08, Stuart Henderson  wrote:
> > 
> > On 2023/11/08 09:55, Matthieu Herrb wrote:
> >> Hi,
> >> 
> >> when importing the ports needed for wayland, not yet linked to the
> >> build, I did not add them to the Makefiles. This fixes that.
> >> rsadowski@ took care of the wayland/ directory.
> > 
> > I'd prefer to have "wayland" included in the commented-out lines so it's
> > obvious why it's done (and so we can find them more easily), then it's
> > ok sthen@.
> > 
> >> Or is it time to try to link those to the build and see what happens
> >> in a full bulk?
> > 
> > Just running a bulk with them hooked isn't enough. To get good
> > information from a bulk, we really want to make sure they're installed
> > throughout the build and look for things linking to them - run
> > check-lib-depends on the produced packages; there will be a lot of noise
> > because nobody has done a full sync of LIB_DEPENDS/WANTLIB for ages,
> > and because check-lib-depends doesn't handle subdirectories properly,
> > so grepping for the specific libraries we're intereated is the way to
> > go. Without something like this there's a long drawn-out process where
> > things might break but usually won't on any given build, and hidden
> > dependencies won't show up unless we get lucky with DPB junking.
> > 
> >> Index: graphics/Makefile
> >> ===
> >> RCS file: /local/cvs/ports/graphics/Makefile,v
> >> diff -u -p -u -r1.604 Makefile
> >> --- graphics/Makefile31 Oct 2023 13:16:10 -1.604
> >> +++ graphics/Makefile8 Nov 2023 09:50:01 -
> >> @@ -147,6 +147,7 @@
> >>  SUBDIR += libimagequant
> >>  SUBDIR += libiptcdata
> >>  SUBDIR += libjxl
> >> + #SUBDIR += libliftoff
> >>  SUBDIR += liblqr
> >>  SUBDIR += libmng
> >>  SUBDIR += libmpeg2
> >> Index: sysutils/Makefile
> >> ===
> >> RCS file: /local/cvs/ports/sysutils/Makefile,v
> >> diff -u -p -u -r1.702 Makefile
> >> --- sysutils/Makefile27 Oct 2023 18:48:42 -1.702
> >> +++ sysutils/Makefile8 Nov 2023 09:50:09 -
> >> @@ -154,7 +154,9 @@
> >>  SUBDIR += kubectl
> >>  SUBDIR += lf
> >>  SUBDIR += libburn
> >> + #SUBDIR += libdisplay-info
> >>  SUBDIR += libesedb
> >> + #SUBDIR += libevdev-openbsd
> >>  SUBDIR += libevt
> >>  SUBDIR += libevtx
> >>  SUBDIR += libfsapfs
> >> @@ -381,6 +383,7 @@
> >>  SUBDIR += salt-testing
> >>  SUBDIR += sblim-sfcc
> >>  SUBDIR += screenfetch
> >> + #SUBDIR += seatd
> >>  SUBDIR += sec
> >>  SUBDIR += serf
> >>  SUBDIR += setquota
> >> 
> >> --
> >> Matthieu Herrb
> >> 
> > 
>

Re: Unable to access the Hiawatha package

2023-11-08 Thread Stuart Henderson

On 2023/11/08 08:22, Lucas Gabriel Vuotto wrote:
> Hey Jason,
> 
> On Tue, Nov 07, 2023 at 09:43:38PM +1100, jasfi...@emailme.net.au wrote:
> > I am using the latest OpenBSD 7.4 version along with Hiawatha 10.11
> > installed. Unfortunately, I am unable to update the latest version Hiawatha
> > 11.4 that found in OpenBSD Ports Readme: port www/hiawatha (openports.pl)
> > and ports/www/hiawatha/ (openbsd.org) .
> > 
> > When I run a package command pkg_add -u hiawatha-10.11 or even pkg_add
> > hiawatha-11.4 OpenBSD response in below are:
> > Can't find Hiawatha-11.4
> > Couldn't install Hiawatha-11.4
> 
> https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/hiawatha/Makefile
> 
> In revision 1.68, "PERMIT_PACKAGE = Yes" was removed due to licenses
> incompatibilities, meaning that the port is able to build but OpenBSD
> isn't able to distribute it. Your only option is building it yourself.

Hiawatha is licensed under GPL version 2 (only) but it requires a TLS
library, mbedtls. This used to be dual licensed (Apache + GPL) and at
that time it was ok to distribute binaries (the combination resulting in
GPLv2-licensed binaries).

Newer versions of hiawatha require newer mbedtls; these versions of
mbedtls are only available under Apache license. Distributing a binary
with the combination of GPLv2 code with Apache-licensed library is not
permitted by these licenses (the Apache license has extra restrictions
in the form of patent-related clauses - GPLv2 does not allow this).

Re: add commented out wayland related ports to their categories makefiles

2023-11-08 Thread Landry Breuil

Le Wed, Nov 08, 2023 at 09:55:48AM +, Matthieu Herrb a écrit :
> Hi,
> 
> when importing the ports needed for wayland, not yet linked to the
> build, I did not add them to the Makefiles. This fixes that.
> rsadowski@ took care of the wayland/ directory.
> 
> Or is it time to try to link those to the build and see what happens
> in a full bulk? 

the ones that are self-dependent can be linked right now (eg libliftoff,
libdisplay-info, seatd), afaict those dont depend on not yet linked
ports (unless they have a missing BDEP ?)

libevdev-openbsd depends on wayland/libinput-openbsd, so it should be
linked once libinput is linked to the build (along libudev-openbsd,
which isnt linked either in sysutils/Makefile)

we need to have a discussion on that :) but first find all the possible
ports that might detect them at configure time...

Re: add commented out wayland related ports to their categories makefiles

2023-11-08 Thread Stuart Henderson

On 2023/11/08 09:55, Matthieu Herrb wrote:
> Hi,
> 
> when importing the ports needed for wayland, not yet linked to the
> build, I did not add them to the Makefiles. This fixes that.
> rsadowski@ took care of the wayland/ directory.

I'd prefer to have "wayland" included in the commented-out lines so it's
obvious why it's done (and so we can find them more easily), then it's
ok sthen@.

> Or is it time to try to link those to the build and see what happens
> in a full bulk? 

Just running a bulk with them hooked isn't enough. To get good
information from a bulk, we really want to make sure they're installed
throughout the build and look for things linking to them - run
check-lib-depends on the produced packages; there will be a lot of noise
because nobody has done a full sync of LIB_DEPENDS/WANTLIB for ages,
and because check-lib-depends doesn't handle subdirectories properly,
so grepping for the specific libraries we're intereated is the way to
go. Without something like this there's a long drawn-out process where
things might break but usually won't on any given build, and hidden
dependencies won't show up unless we get lucky with DPB junking.

> Index: graphics/Makefile
> ===
> RCS file: /local/cvs/ports/graphics/Makefile,v
> diff -u -p -u -r1.604 Makefile
> --- graphics/Makefile 31 Oct 2023 13:16:10 -  1.604
> +++ graphics/Makefile 8 Nov 2023 09:50:01 -
> @@ -147,6 +147,7 @@
>   SUBDIR += libimagequant
>   SUBDIR += libiptcdata
>   SUBDIR += libjxl
> + #SUBDIR += libliftoff
>   SUBDIR += liblqr
>   SUBDIR += libmng
>   SUBDIR += libmpeg2
> Index: sysutils/Makefile
> ===
> RCS file: /local/cvs/ports/sysutils/Makefile,v
> diff -u -p -u -r1.702 Makefile
> --- sysutils/Makefile 27 Oct 2023 18:48:42 -  1.702
> +++ sysutils/Makefile 8 Nov 2023 09:50:09 -
> @@ -154,7 +154,9 @@
>   SUBDIR += kubectl
>   SUBDIR += lf
>   SUBDIR += libburn
> + #SUBDIR += libdisplay-info
>   SUBDIR += libesedb
> + #SUBDIR += libevdev-openbsd
>   SUBDIR += libevt
>   SUBDIR += libevtx
>   SUBDIR += libfsapfs
> @@ -381,6 +383,7 @@
>   SUBDIR += salt-testing
>   SUBDIR += sblim-sfcc
>   SUBDIR += screenfetch
> + #SUBDIR += seatd
>   SUBDIR += sec
>   SUBDIR += serf
>   SUBDIR += setquota
> 
> -- 
> Matthieu Herrb
>

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Otto Moerbeek

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2023/11/08 03:08:06

Modified files:
net/powerdns_recursor: Makefile distinfo 

Log message:
Update to PowerDNS Recursor 4.9.2

add commented out wayland related ports to their categories makefiles

2023-11-08 Thread Matthieu Herrb

Hi,

when importing the ports needed for wayland, not yet linked to the
build, I did not add them to the Makefiles. This fixes that.
rsadowski@ took care of the wayland/ directory.

Or is it time to try to link those to the build and see what happens
in a full bulk? 

Index: graphics/Makefile
===
RCS file: /local/cvs/ports/graphics/Makefile,v
diff -u -p -u -r1.604 Makefile
--- graphics/Makefile   31 Oct 2023 13:16:10 -  1.604
+++ graphics/Makefile   8 Nov 2023 09:50:01 -
@@ -147,6 +147,7 @@
  SUBDIR += libimagequant
  SUBDIR += libiptcdata
  SUBDIR += libjxl
+ #SUBDIR += libliftoff
  SUBDIR += liblqr
  SUBDIR += libmng
  SUBDIR += libmpeg2
Index: sysutils/Makefile
===
RCS file: /local/cvs/ports/sysutils/Makefile,v
diff -u -p -u -r1.702 Makefile
--- sysutils/Makefile   27 Oct 2023 18:48:42 -  1.702
+++ sysutils/Makefile   8 Nov 2023 09:50:09 -
@@ -154,7 +154,9 @@
  SUBDIR += kubectl
  SUBDIR += lf
  SUBDIR += libburn
+ #SUBDIR += libdisplay-info
  SUBDIR += libesedb
+ #SUBDIR += libevdev-openbsd
  SUBDIR += libevt
  SUBDIR += libevtx
  SUBDIR += libfsapfs
@@ -381,6 +383,7 @@
  SUBDIR += salt-testing
  SUBDIR += sblim-sfcc
  SUBDIR += screenfetch
+ #SUBDIR += seatd
  SUBDIR += sec
  SUBDIR += serf
  SUBDIR += setquota

-- 
Matthieu Herrb

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Klemens Nanni

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/11/08 02:54:57

Modified files:
sysutils/gitlab-cli: Makefile distinfo 

Log message:
update to gitlab-cli 1.35.0

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 02:35:06

Modified files:
x11/lxqt/liblxqt: Makefile 
devel/kf5/kauth: Makefile 
x11/lxqt/policykit: Makefile 

Log message:
x11/polkit-qt5 -> x11/polkit-qt,qt5

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 02:32:43

Modified files:
x11: Makefile 
Added files:
x11/polkit-qt  : Makefile distinfo 
x11/polkit-qt/patches: patch-PolkitQt-1Config_cmake_in 
x11/polkit-qt/pkg: DESCR PFRAG.no-qt5 PFRAG.qt5 PLIST 
Removed files:
x11/polkit-qt5 : Makefile distinfo 
x11/polkit-qt5/patches: patch-PolkitQt-1Config_cmake_in 
x11/polkit-qt5/pkg: DESCR PLIST 

Log message:
Move polkit-qt5 into polkit-qt.
Update to version 0.175.0.
Provide a FLAVOR for qt5 (default is to build against qt6).

CVS: cvs.openbsd.org: ports

2023-11-08 Thread Antoine Jacoutot

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/11/08 01:54:27

Modified files:
devel/libgusb  : Makefile distinfo 

Log message:
Update to libgusb-0.4.8.

Re: www/opensearch-dashboards not counted as rcctl start-ed since OpenBSD 7.4

2023-11-08 Thread Omar Polo

On 2023/11/07 21:49:56 +0100, Alexander Klimov  wrote:
> Hello dear maintainers,
> 
> Not very dramatic, but also not very convenient:
> 
> pkg_add opensearch opensearch-dashboards
> echo 'plugins.security.disabled: true' >>/etc/opensearch/opensearch.yml
> rcctl start opensearch
> sed -i s/https/http/g /etc/opensearch-dashboards/opensearch_dashboards.yml
> sed -i 's/^opensearch_security/#opensearch_security/' 
> /etc/opensearch-dashboards/opensearch_dashboards.yml
> rcctl start opensearch_dashboards
> 
> It's up and running and I can even open it in the browser. But!
> 
> rcctl stop opensearch_dashboards says nothing as if it's stopped.
> 
> rcctl -d start opensearch_dashboards tries to start it (as if it's stopped),
> but complains about the already used :5601.
> 
> Ask me anything.

Seems that with a previous update the pexp doesn't match the
opensearch-dashboards process anymore, so that rcctl thinks the daemon
failed.

Are you running -stable by chance?  I'm wondering whether this change
happened with the 2.11 update or earlier.


Index: Makefile
===
RCS file: /home/cvs/ports/www/opensearch-dashboards/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile21 Oct 2023 11:30:54 -  1.15
+++ Makefile8 Nov 2023 08:06:57 -
@@ -3,6 +3,7 @@ COMMENT =   visualization tool for data in
 V =2.11.0
 DISTNAME = opensearch-dashboards-$V-linux-x64
 PKGNAME =  opensearch-dashboards-$V
+REVISION = 0
 
 CATEGORIES =   www
 
Index: pkg/opensearch_dashboards.rc
===
RCS file: 
/home/cvs/ports/www/opensearch-dashboards/pkg/opensearch_dashboards.rc,v
retrieving revision 1.2
diff -u -p -r1.2 opensearch_dashboards.rc
--- pkg/opensearch_dashboards.rc3 Mar 2023 18:36:04 -   1.2
+++ pkg/opensearch_dashboards.rc8 Nov 2023 08:07:15 -
@@ -6,7 +6,7 @@ daemon_execdir="${TRUEPREFIX}/opensearch
 
 . /etc/rc.d/rc.subr
 
-pexp="${TRUEPREFIX}/bin/node 
${TRUEPREFIX}/opensearch-dashboards/bin/../src/cli/dist${daemon_flags:+ 
${daemon_flags}}"
+pexp="${TRUEPREFIX}/bin/node 
${TRUEPREFIX}/opensearch-dashboards/src/cli/dist${daemon_flags:+ 
${daemon_flags}}"
 rc_bg=YES
 rc_reload=NO

Re: Unable to access the Hiawatha package

2023-11-08 Thread Lucas Gabriel Vuotto

Hey Jason,

On Tue, Nov 07, 2023 at 09:43:38PM +1100, jasfi...@emailme.net.au wrote:
> I am using the latest OpenBSD 7.4 version along with Hiawatha 10.11
> installed. Unfortunately, I am unable to update the latest version Hiawatha
> 11.4 that found in OpenBSD Ports Readme: port www/hiawatha (openports.pl)
> and ports/www/hiawatha/ (openbsd.org) .
> 
> When I run a package command pkg_add -u hiawatha-10.11 or even pkg_add
> hiawatha-11.4 OpenBSD response in below are:
> Can't find Hiawatha-11.4
> Couldn't install Hiawatha-11.4

https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/hiawatha/Makefile

In revision 1.68, "PERMIT_PACKAGE = Yes" was removed due to licenses
incompatibilities, meaning that the port is able to build but OpenBSD
isn't able to distribute it. Your only option is building it yourself.

Not baby steps and no screenshots, but

0. Read https://www.openbsd.org/faq/ports/
1. Get the ports tree (https://www.openbsd.org/anoncvs.html for
   guidance)
2. cd /usr/ports//hiawatha && make install

Lucas

71 matches

Mail list logo