Re: update: devel/got + gitwrapper run-dep for devel/git
Le Wed, Apr 19, 2023 at 11:56:21PM +0200, Stefan Sperling a écrit : > A new release of got introduces gitwrapper which makes it much > easier to run gotd side-by-side with regular Git binaries. > Essentially, clients fetching repositories over ssh will be talking to > gotd if the repository is listed in /etc/gotd.conf. Otherwise they > will be talking to regular Git. (Unless the user account has gotsh > set as login shell, which will always talk to gotd.) > > For this to work, gitwrapper must replace two specific binaries in > the git package with symlinks to itself. I am trying to make this > work seemlessly during upgrades from got-0.86 and git-2.40.0. > > When I install the git package from the ports tree with: > make install SUDO=doas > this does not install the gitwrapper package from devel/got and the > files end up missing from disk. Can anyone tell what am I doing wrong? > I would hope the RUN_DEPENDS I've added would take care of this? I think the RDEP should be devel/got,-gitwrapper to install the -gitwrapper subpackage, devel/got,gitwrapper asks for the gitwrapper FLAVOR of the got port (which doesnt exist) Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/04/19 21:22:00 Modified files: games/py-steam : Makefile distinfo games/py-steam/pkg: PLIST games/steamctl : Makefile distinfo games/steamctl/pkg: PLIST Log message: update steamctl to 0.9.5 and py3-steam to 1.4.4; no regression on brief testing with 'steamctl depot download'
arm bulk build report
bulk build on armv7.ports.openbsd.org started on Sat Mar 25 04:24:00 MDT 2023 finished at Wed Apr 19 20:44:09 MDT 2023 lasted 25D16h20m done with kern.version=OpenBSD 7.3 (GENERIC) #116: Thu Mar 23 20:05:57 MDT 2023 built packages:8731 Mar 25:634 Mar 26:88 Mar 27:56 Mar 28:313 Mar 29:306 Mar 30:73 Mar 31:204 Apr 1:5538 Apr 2:80 Apr 3:103 Apr 4:173 Apr 5:140 Apr 6:189 Apr 7:260 Apr 8:405 Apr 9:168 Apr 10:274 Apr 11:297 Apr 12:247 Apr 13:346 Apr 14:333 Apr 15:138 Apr 16:321 Apr 17:363 Apr 18:281 Apr 19:2676 critical path missing pkgs: http://build-failures.rhaalovely.net/arm/2023-03-25/summary.log build failures: 178 http://build-failures.rhaalovely.net/arm/2023-03-25/audio/picard.log http://build-failures.rhaalovely.net/arm/2023-03-25/audio/puddletag.log http://build-failures.rhaalovely.net/arm/2023-03-25/audio/pulseaudio.log http://build-failures.rhaalovely.net/arm/2023-03-25/databases/pgbackrest.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/boost.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/doc++.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/dyncall.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/liboil.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/mtxclient.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/ptlib.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/py-buildslave.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/py-cflow2dot,python3.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/remake.log http://build-failures.rhaalovely.net/arm/2023-03-25/devel/xsd.log http://build-failures.rhaalovely.net/arm/2023-03-25/editors/micro.log http://build-failures.rhaalovely.net/arm/2023-03-25/emulators/dgen-sdl.log http://build-failures.rhaalovely.net/arm/2023-03-25/emulators/fs-uae-launcher.log http://build-failures.rhaalovely.net/arm/2023-03-25/emulators/higan.log http://build-failures.rhaalovely.net/arm/2023-03-25/emulators/ppsspp.log http://build-failures.rhaalovely.net/arm/2023-03-25/emulators/spike.log http://build-failures.rhaalovely.net/arm/2023-03-25/games/barony.log http://build-failures.rhaalovely.net/arm/2023-03-25/games/cataclysm-dda.log http://build-failures.rhaalovely.net/arm/2023-03-25/games/godot.log http://build-failures.rhaalovely.net/arm/2023-03-25/games/hyperrogue.log http://build-failures.rhaalovely.net/arm/2023-03-25/games/stockfish.log http://build-failures.rhaalovely.net/arm/2023-03-25/graphics/babl.log http://build-failures.rhaalovely.net/arm/2023-03-25/graphics/py-pyx,python3.log http://build-failures.rhaalovely.net/arm/2023-03-25/inputmethods/uim.log http://build-failures.rhaalovely.net/arm/2023-03-25/lang/STk.log http://build-failures.rhaalovely.net/arm/2023-03-25/lang/hashlink.log http://build-failures.rhaalovely.net/arm/2023-03-25/lang/janet.log http://build-failures.rhaalovely.net/arm/2023-03-25/lang/parrot.log http://build-failures.rhaalovely.net/arm/2023-03-25/lang/python/3.11,-gdbm.log http://build-failures.rhaalovely.net/arm/2023-03-25/lang/racket-minimal.log http://build-failures.rhaalovely.net/arm/2023-03-25/lang/swi-prolog.log http://build-failures.rhaalovely.net/arm/2023-03-25/mail/bogofilter,db4.log http://build-failures.rhaalovely.net/arm/2023-03-25/mail/courier-unicode.log http://build-failures.rhaalovely.net/arm/2023-03-25/mail/mutt-wizard.log http://build-failures.rhaalovely.net/arm/2023-03-25/math/lean.log http://build-failures.rhaalovely.net/arm/2023-03-25/math/mathomatic.log http://build-failures.rhaalovely.net/arm/2023-03-25/misc/astrolog.log http://build-failures.rhaalovely.net/arm/2023-03-25/misc/freeopcua/py-opcua-widgets.log http://build-failures.rhaalovely.net/arm/2023-03-25/misc/osinfo/libosinfo.log http://build-failures.rhaalovely.net/arm/2023-03-25/misc/osinfo/osinfo-db-tools.log http://build-failures.rhaalovely.net/arm/2023-03-25/net/bro.log http://build-failures.rhaalovely.net/arm/2023-03-25/net/magic-wormhole.log http://build-failures.rhaalovely.net/arm/2023-03-25/net/py-junos-eznc,python3.log http://build-failures.rhaalovely.net/arm/2023-03-25/net/py-nxos,python3.log http://build-failures.rhaalovely.net/arm/2023-03-25/net/py-txtorcon,python3.log http://build-failures.rhaalovely.net/arm/2023-03-25/net/tdlib.log http://build-failures.rhaalovely.net/arm/2023-03-25/net/ucspi-tools.log http://build-failures.rhaalovely.net/arm/2023-03-25/plan9/drawterm.log http://build-failures.rhaalovely.net/arm/2023-03-25/print/foo2zjs.log http://build-failures.rhaalovely.net/arm/2023-03-25/print/texinfo.log http://build-failures.rhaalovely.net/arm/2023-03-25/productivity/khal.log http://build-failures.rhaalovely.net/arm/2023-03-25/productivity/radicale.log http://build-failures.rhaalovely.net/arm/2023-03-25/productivity/tryton/5.0/account_asset.log http://build-failures.rhaalovely.net/arm/2023-03-25/productivity/tryton/5.0/account_deposit.log
UPDATE: QEMU 8.0.0
Here is an update to QEMU 8.0.0.
https://wiki.qemu.org/ChangeLog/8.0
Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.230
diff -u -p -u -p -r1.230 Makefile
--- Makefile21 Feb 2023 23:06:55 - 1.230
+++ Makefile20 Apr 2023 02:28:37 -
@@ -4,10 +4,8 @@ DPB_PROPERTIES=parallel
COMMENT-main= multi system emulator
COMMENT-ga=QEMU guest agent
-VERSION= 7.2.0
+VERSION= 8.0.0
DISTNAME= qemu-${VERSION}
-REVISION-ga= 0
-REVISION-main= 1
CATEGORIES=emulators
MASTER_SITES= https://download.qemu.org/
EXTRACT_SUFX= .tar.xz
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 distinfo
--- distinfo4 Jan 2023 21:33:42 - 1.68
+++ distinfo20 Apr 2023 00:44:50 -
@@ -1,2 +1,2 @@
-SHA256 (qemu-7.2.0.tar.xz) = W0nOJod0Ta1JSukKiYxSIEo0BuhNBySCoeG+hU7rIVc=
-SIZE (qemu-7.2.0.tar.xz) = 122408576
+SHA256 (qemu-8.0.0.tar.xz) = u2DwNBUxGB1sw5ad0ZoBPQQnqH+RgZOXDZrbkRMeVtA=
+SIZE (qemu-8.0.0.tar.xz) = 127835148
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.75
diff -u -p -u -p -r1.75 patch-configure
--- patches/patch-configure 4 Jan 2023 21:33:42 - 1.75
+++ patches/patch-configure 7 Apr 2023 03:13:53 -
@@ -6,7 +6,7 @@ Revert..
Index: configure
--- configure.orig
+++ configure
-@@ -77,6 +77,7 @@ TMPC="${TMPDIR1}/${TMPB}.c"
+@@ -81,6 +81,7 @@ TMPC="${TMPDIR1}/${TMPB}.c"
TMPO="${TMPDIR1}/${TMPB}.o"
TMPM="${TMPDIR1}/${TMPB}.m"
TMPE="${TMPDIR1}/${TMPB}.exe"
@@ -14,7 +14,7 @@ Index: configure
rm -f config.log
-@@ -1314,7 +1315,6 @@ if test "$static" = "yes" ; then
+@@ -1329,7 +1330,6 @@ if test "$static" = "yes" ; then
plugins="no"
fi
fi
@@ -22,7 +22,7 @@ Index: configure
cat > $TMPC << EOF
-@@ -1459,6 +1459,56 @@ if ! has "$pkg_config_exe"; then
+@@ -1474,6 +1474,56 @@ if ! has "$pkg_config_exe"; then
fi
##
@@ -79,7 +79,7 @@ Index: configure
# glib support probe
# When bumping glib_req_ver, please check also whether we should increase
-@@ -2390,6 +2440,15 @@ fi
+@@ -2403,6 +2453,15 @@ fi
if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak
Index: patches/patch-meson_build
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-meson_build,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-meson_build
--- patches/patch-meson_build 9 Jan 2023 14:26:00 - 1.9
+++ patches/patch-meson_build 7 Apr 2023 03:13:51 -
@@ -1,20 +1,10 @@
- localstatedir does not belong under prefix
- Remove hardcoding of optimization
-- thread-posix: add support for setting threads name on OpenBSD
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -75,7 +75,7 @@ have_tools = get_option('tools') \
- .allowed()
- have_ga = get_option('guest_agent') \
- .disable_auto_if(not have_system and not have_tools) \
-- .require(targetos in ['sunos', 'linux', 'windows', 'freebsd'],
-+ .require(targetos in ['sunos', 'linux', 'windows', 'freebsd', 'openbsd'],
-error_message: 'unsupported OS for QEMU guest agent') \
- .allowed()
- have_block = have_system or have_tools
-@@ -1790,7 +1790,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_
+@@ -1802,7 +1802,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_
config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') /
get_option('libexecdir'))
config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') /
qemu_icondir)
config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') /
get_option('localedir'))
@@ -23,34 +13,13 @@ Index: meson.build
config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') /
qemu_moddir)
config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') /
get_option('sysconfdir'))
-@@ -2123,6 +2123,18 @@ config_host_data.set('CONFIG_PTHREAD_SETNAME_NP_WO_TID
- pthread_create(, 0, f, 0);
- return 0;
- }''', dependencies: threads))
-+config_host_data.set('CONFIG_PTHREAD_SET_NAME_NP', cc.links(gnu_source_prefix
+ '''
-+ #include
-+ #include
-+
-+ static void *f(void *p) { return NULL; }
-+ int main(void)
-+ {
-+pthread_t thread;
-+pthread_create(, 0, f, 0);
-+pthread_set_name_np(thread, "QEMU");
-+return 0;
-+ }''', dependencies: threads))
- config_host_data.set('CONFIG_PTHREAD_CONDATTR_SETCLOCK',
cc.links(gnu_source_prefix + '''
- #include
- #include
-@@ -3756,11 +3768,9 @@ if targetos == 'darwin'
+@@ -3805,9 +3805,6 @@ if targetos == 'darwin'
www/unit update to 1.29.1
Hi,
could you please review and commit the following update.
Thank you.
Index: Makefile
===
RCS file: /cvs/ports/www/unit/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile11 Mar 2022 20:11:05 - 1.7
+++ Makefile19 Apr 2023 21:51:49 -
@@ -4,6 +4,7 @@ SUBDIR += unit-perl
SUBDIR += unit-php,php74
SUBDIR += unit-php,php80
SUBDIR += unit-php,php81
+SUBDIR += unit-php,php82
SUBDIR += unit-python
SUBDIR += unit-ruby
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.inc
--- Makefile.inc11 Oct 2022 13:56:09 - 1.6
+++ Makefile.inc19 Apr 2023 21:51:49 -
@@ -1,4 +1,4 @@
-VERSION?= 1.28.0
+VERSION?= 1.29.1
DISTNAME= unit-${VERSION}
CATEGORIES=www
Index: unit/Makefile
===
RCS file: /cvs/ports/www/unit/unit/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- unit/Makefile 8 Nov 2022 11:17:22 - 1.4
+++ unit/Makefile 19 Apr 2023 21:51:49 -
@@ -1,5 +1,4 @@
COMMENT= dynamic web application server
-REVISION= 0
WANTLIB= c crypto m pcre2-8 pthread ssl
Index: unit/distinfo
===
RCS file: /cvs/ports/www/unit/unit/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- unit/distinfo 11 Oct 2022 13:56:09 - 1.4
+++ unit/distinfo 19 Apr 2023 21:51:49 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
-SIZE (unit-1.28.0.tar.gz) = 878878
+SHA256 (unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc=
+SIZE (unit-1.29.1.tar.gz) = 906654
Index: unit-perl/distinfo
===
RCS file: /cvs/ports/www/unit/unit-perl/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- unit-perl/distinfo 11 Oct 2022 13:56:09 - 1.4
+++ unit-perl/distinfo 19 Apr 2023 21:51:49 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
-SIZE (unit-1.28.0.tar.gz) = 878878
+SHA256 (unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc=
+SIZE (unit-1.29.1.tar.gz) = 906654
Index: unit-php/Makefile
===
RCS file: /cvs/ports/www/unit/unit-php/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- unit-php/Makefile 4 Jun 2022 08:31:22 - 1.7
+++ unit-php/Makefile 19 Apr 2023 21:51:49 -
@@ -7,7 +7,7 @@ UNIT_SHORTNAME= ${FLAVOR}
MODULES= lang/php
-FLAVORS= php74 php80 php81
+FLAVORS= php74 php80 php81 php82
FLAVOR?= php74
MODPHP_VERSION=${FLAVOR:C/php([0-9])([0-9])/\1.\2/}
MODPHP_BUILDDEP= Yes
Index: unit-php/distinfo
===
RCS file: /cvs/ports/www/unit/unit-php/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- unit-php/distinfo 11 Oct 2022 13:56:09 - 1.4
+++ unit-php/distinfo 19 Apr 2023 21:51:49 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
-SIZE (unit-1.28.0.tar.gz) = 878878
+SHA256 (unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc=
+SIZE (unit-1.29.1.tar.gz) = 906654
Index: unit-python/Makefile
===
RCS file: /cvs/ports/www/unit/unit-python/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- unit-python/Makefile13 Nov 2022 15:30:20 - 1.4
+++ unit-python/Makefile19 Apr 2023 21:51:49 -
@@ -1,5 +1,3 @@
-REVISION= 0
-
UNIT_MODNAME= python${MODPY_VERSION}
UNIT_SHORTNAME=python
Index: unit-python/distinfo
===
RCS file: /cvs/ports/www/unit/unit-python/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- unit-python/distinfo11 Oct 2022 13:56:09 - 1.4
+++ unit-python/distinfo19 Apr 2023 21:51:49 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
-SIZE (unit-1.28.0.tar.gz) = 878878
+SHA256 (unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc=
+SIZE (unit-1.29.1.tar.gz) = 906654
Index: unit-ruby/distinfo
===
RCS file: /cvs/ports/www/unit/unit-ruby/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- unit-ruby/distinfo 11 Oct 2022 13:56:09 - 1.4
+++ unit-ruby/distinfo 19 Apr 2023 21:51:49 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
-SIZE (unit-1.28.0.tar.gz) = 878878
+SHA256
update: devel/got + gitwrapper run-dep for devel/git
A new release of got introduces gitwrapper which makes it much
easier to run gotd side-by-side with regular Git binaries.
Essentially, clients fetching repositories over ssh will be talking to
gotd if the repository is listed in /etc/gotd.conf. Otherwise they
will be talking to regular Git. (Unless the user account has gotsh
set as login shell, which will always talk to gotd.)
For this to work, gitwrapper must replace two specific binaries in
the git package with symlinks to itself. I am trying to make this
work seemlessly during upgrades from got-0.86 and git-2.40.0.
When I install the git package from the ports tree with:
make install SUDO=doas
this does not install the gitwrapper package from devel/got and the
files end up missing from disk. Can anyone tell what am I doing wrong?
I would hope the RUN_DEPENDS I've added would take care of this?
diff /usr/ports
commit - 6e3c62131849d4c5d8f47e7e4e2d5d95fb0a263f
path + /usr/ports
blob - ddabef359f8634fd9bbf1bb3b9ca610794cad214
file + devel/git/Makefile
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -3,6 +3,7 @@ DISTNAME = git-${V}
COMMENT-x11 = graphical tools
V =2.40.0
+REVISION = 0
DISTNAME = git-${V}
CATEGORIES = devel
@@ -33,6 +34,8 @@ MULTI_PACKAGES = -main -svn -x11
textproc/asciidoc \
textproc/xmlto
+RUN_DEPENDS = devel/got,gitwrapper
+
MULTI_PACKAGES = -main -svn -x11
WANTLIB-main = c crypto curl expat iconv intl pthread ssl z
@@ -137,5 +140,7 @@ post-install:
perl -pi -e "s|${WRKINST}||g" ${PREFIX}/share/gitweb/gitweb.cgi
${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
${MODTCL_WISH_ADJ} ${PREFIX}/libexec/git/git-gui--askpass
+ rm ${PREFIX}/bin/git-receive-pack # handled by gitwrapper
+ rm ${PREFIX}/bin/git-upload-pack# handled by gitwrapper
.include
blob - ae0a7f1539223a157f78d388e6c358f9f4c8107b
file + devel/git/pkg/PLIST-main
--- devel/git/pkg/PLIST-main
+++ devel/git/pkg/PLIST-main
@@ -5,10 +5,8 @@ bin/git-cvsserver
@rcscript ${RCDIR}/gitdaemon
@bin bin/git
bin/git-cvsserver
-@bin bin/git-receive-pack
@shell bin/git-shell
@bin bin/git-upload-archive
-@bin bin/git-upload-pack
@bin bin/scalar
@static-lib lib/libgit.a
${P5SITE}/Git/
blob - 84f229d487bb8f3fbf6d1b3a1f04693f75daaa3b
file + devel/got/Makefile
--- devel/got/Makefile
+++ devel/got/Makefile
@@ -1,11 +1,13 @@
COMMENT-main = game of trees version control system
COMMENT-server = game of trees repository server
COMMENT-webd = game of trees repository fast-cgi server
+COMMENT-gitwrapper = invoke an appropriate Git repository server
-V =0.86
+V =0.87
DISTNAME = got-${V}
PKGNAME-server = gotd-${V}
PKGNAME-webd = gotwebd-${V}
+PKGNAME-gitwrapper = gitwrapper-${V}
CATEGORIES = devel
HOMEPAGE = https://gameoftrees.org
MAINTAINER = Stefan Sperling
@@ -13,12 +15,13 @@ MULTI_PACKAGES =-main -server -webd
# ISC
PERMIT_PACKAGE = Yes
-MULTI_PACKAGES = -main -server -webd
+MULTI_PACKAGES = -main -server -webd -gitwrapper
# uses pledge()
WANTLIB-main = c curses m panel pthread util z
WANTLIB-server = c event m util z
WANTLIB-webd = c event m util z
+WANTLIB-gitwrapper = c
MAKE_FLAGS = CC="${CC}"
ALL_TARGET = all server webd
@@ -38,4 +41,8 @@ FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VA
TEST_TARGET = regress
FAKE_FLAGS = MANDIR=${PREFIX}/man/man CHROOT_DIR=${VARBASE}/www
+post-install:
+ @ln -s gitwrapper ${PREFIX}/bin/git-upload-pack
+ @ln -s gitwrapper ${PREFIX}/bin/git-receive-pack
+
.include
blob - e5e69b24f97535a28a03dea6989f19bd9fdd61f6
file + devel/got/distinfo
--- devel/got/distinfo
+++ devel/got/distinfo
@@ -1,2 +1,2 @@
-SHA256 (got-0.86.tar.gz) = JHOjr8U1bRmZ74/qf/P3PqZJGUYq34cQVCSw+jurh+w=
-SIZE (got-0.86.tar.gz) = 806708
+SHA256 (got-0.87.tar.gz) = dPi14M4RWMh3Yo4NlaQrjhzh/gr8L8AZEbpOpHGXhgU=
+SIZE (got-0.87.tar.gz) = 822791
blob - /dev/null
file + devel/got/pkg/DESCR-gitwrapper (mode 644)
--- /dev/null
+++ devel/got/pkg/DESCR-gitwrapper
@@ -0,0 +1,8 @@
+The gitwrapper program is designed to replace git-upload-pack(1) and
+git-receive-pack(1) and to invoke an appropriate Git server based on
+configuration information placed in gotd.conf(5). This permits the
+administrator to configure which Git server is to be invoked on the
+system at run-time. Git repositories which are listed in gotd.conf(5)
+and exist on the filesystem will be served by gotsh(1). Any other Git
+repositories will be served by git-upload-pack(1) and
+git-receive-pack(1).
blob - /dev/null
file + devel/got/pkg/PLIST-gitwrapper (mode 644)
--- /dev/null
+++ devel/got/pkg/PLIST-gitwrapper
@@ -0,0 +1,5 @@
+@conflict git-<=2.40.0
+bin/git-receive-pack
Re: WM_CLASS/StartupWMClass, desktop files & mozilla ports (was: Re: help creating new port: x11/xfce4/xfce4-docklike)
Le 19/04/2023 à 09:47, Joel Carnat a écrit : More testing needed, but feedback on the rationale more than welcome ! Landry I have tested various combination and long-story-short, nothing worked except the dirty modification of Exec. StartupWMClass doesn't seem to be taken in account, or at least WM_CLASS isn't changed (tested with xprop). Using `firefox --class firefox` from xterm does show the proper icon. You can then pin it on docklike. But it is pinned without the flags. You have to edit the launcher to add "--class firefox". Then, clicking docklike icon will start Firefox with the overwritten class and show the icon. I have noticed that when you modify the launcher from docklike, it automatically modifies ~/.local/share/applications/firefox.desktop with "Exec=firefox --class firefox %u". Was all this testing with standard packages, or my wip packages setting MOZ_APP_REMOTINGNAME ? It was the standard packages. I forgot to test with your packages. I’ll have a look this evening and let you know. So I tested your firefox-esr package. Long-story-short, it works as expected. - starting firefox-esr from xterm sets a FF icon in docklike. checking wmclass shows WM_CLASS(STRING) = "Navigator", "firefox-esr" - same thing happens when I remove any *firefox*desktop from my ~/.local/share/applications directory. - starting firefox-esx and pinning it to docklike keeps the FF icon. clicking on the icon start Firefox ESR as expected and swallow the instance using the icon. Regards, Joel C.
Re: UPDATE: cad/geda-gaf 1.10.2
On Fri, Apr 07, 2023 at 08:58:22PM +0200, Sven M. Hallberg wrote: > Ping. > > Here's a fresh full patch with the "icon theme installer" patch added back > in. I think we should land this. There's been a massive amount of work that went into this update. The patches look good to me and the old port was on life support for way too long. If there is anything that needs fixing, I think we can as well address that in tree. I am going to commit this in a few days unless I hear objections. I'm of course also happy if someone commits with my ok.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2023/04/19 14:40:38 Removed files: textproc/recutils/patches: patch-lib_vasnprintf_c Log message: textproc/recutils: remove empty patch file
UPDATE: net/nextcloudclient-3.8.1
Hi.
Update for net/nextcloudclient v3.8.0
Changelog: https://github.com/nextcloud/desktop/releases/v3.8.1
* [desktop#5570] sort encrypted files by their id to compute checksum
* [desktop#5573] try different permutation to try to recover the
broken checksum
* [desktop#5578] Fix unit tests SecureFileDrop
* [desktop#5582] Do not display error status and messages when
aborting a sync during hydration request in VFS mode
* [desktop#5589] in case server has no private key, let e2ee init fail
* [desktop#5592] Edit locally. Restart current folder sync immediately
after file opened.
* [desktop#5597] Alway add the item at the end of the layout.
* [desktop#5599] properly preserve the format of e2ee metadata during
DB operations
Obrigado!
--
Adriano
Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile15 Apr 2023 10:58:22 - 1.49
+++ Makefile19 Apr 2023 20:04:17 -
@@ -2,9 +2,8 @@ USE_WXNEEDED = Yes
COMMENT = desktop sync client for Nextcloud
-V =3.8.0
+V =3.8.1
DISTNAME = nextcloudclient-${V}
-REVISION = 0
GH_ACCOUNT = nextcloud
GH_PROJECT = desktop
@@ -14,8 +13,8 @@ CATEGORIES = net
HOMEPAGE = https://nextcloud.com
-SHARED_LIBS += nextcloudsync 10.0 # 3.8.0
-SHARED_LIBS += nextcloud_csync 3.1 # 3.8.0
+SHARED_LIBS += nextcloudsync 10.1 # 3.8.1
+SHARED_LIBS += nextcloud_csync 4.0 # 3.8.1
SHARED_LIBS += nextcloudsync_vfs_suffix 0.1 # 3.6.6
MAINTAINER = Adriano Barbosa
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo1 Apr 2023 17:52:07 - 1.39
+++ distinfo19 Apr 2023 20:04:17 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.8.0.tar.gz) =
YSpgRSJpMILOMEBWVUMAeRIrdqx0wnffuz5aYqI5U/Q=
-SIZE (nextcloudclient-3.8.0.tar.gz) = 15729588
+SHA256 (nextcloudclient-3.8.1.tar.gz) =
+RmgnCYQOd24/LbBDxCxxqijH2S/m4sU/0a10C5Civw=
+SIZE (nextcloudclient-3.8.1.tar.gz) = 15738143
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/04/19 14:14:13 Modified files: lang/vala : Makefile distinfo Log message: Update to vala-0.56.7.
Re: OpenBSD 7.3, roundcubemail & php 8.0 vs php 8.1
On 2023/04/19 17:50, Manuel Giraud wrote: > "Steve Williams (Contractor)" writes: > > [...] > > > I can move the php/php_fpm configs to php-8.1.18 and then pkg_delete > > the php-8.0.28p1 associated packages, but I wanted to make sure this > > was the correct approach. > > I think the correct approach is to test whether your not packaged > application happens to be working with PHP 8.1. For this you could, as > you said, move your 8.0 config to 8.1 (you may have to install needed > php 8.1 modules too) and do: > > $ rcctl stop php80_fpm > $ rcctl disable php80_fpm > $ rcctl enable php81_fpm > $ rcctl start php81_fpm > > If this does not work, I think you could have both php80_fpm and > php81_fpm but you'd have to set their flags into rc.conf.local to use > their particular config (or by default both would use /etc/php-fpm.conf > which would lead to errors) exactly. (if you do need multiple PHP versions, then see the "If you need to run multiple versions of PHP on one machine" text in php's pkg-readme for details).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/04/19 12:16:58 Modified files: net/isc-bind : Tag: OPENBSD_7_3 Makefile distinfo net/isc-bind/patches: Tag: OPENBSD_7_3 patch-lib_isc_netmgr_netmgr_c net/isc-bind/pkg: Tag: OPENBSD_7_3 PLIST Log message: update to isc-bind-9.18.14
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/04/19 12:16:52 Modified files: net/isc-bind : Makefile distinfo net/isc-bind/patches: patch-lib_isc_netmgr_netmgr_c net/isc-bind/pkg: PLIST Log message: update to isc-bind-9.18.14
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/19 12:04:18 Modified files: x11/xfce4/xfce4-fsguard: Makefile distinfo Log message: x11/xfce4/xfce4-fsguard: update to 1.1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/04/19 12:03:52 Modified files: x11/xfce4/xfce4-battery: Makefile distinfo x11/xfce4/xfce4-battery/pkg: PLIST Log message: x11/xfce4/xfce4-battery: update to 1.1.5
Re: OpenBSD 7.3, roundcubemail & php 8.0 vs php 8.1
"Steve Williams (Contractor)" writes: [...] > I can move the php/php_fpm configs to php-8.1.18 and then pkg_delete > the php-8.0.28p1 associated packages, but I wanted to make sure this > was the correct approach. I think the correct approach is to test whether your not packaged application happens to be working with PHP 8.1. For this you could, as you said, move your 8.0 config to 8.1 (you may have to install needed php 8.1 modules too) and do: $ rcctl stop php80_fpm $ rcctl disable php80_fpm $ rcctl enable php81_fpm $ rcctl start php81_fpm If this does not work, I think you could have both php80_fpm and php81_fpm but you'd have to set their flags into rc.conf.local to use their particular config (or by default both would use /etc/php-fpm.conf which would lead to errors) -- Manuel Giraud
Re: OpenBSD 7.3, roundcubemail & php 8.0 vs php 8.1
Le Wed, Apr 19, 2023 at 09:16:38AM -0600, Steve Williams (Contractor) a écrit : > Hi, > > I just completed the 7.5 upgrade process and after running the pkg_add -u, I > ended up with both > > * php-8.0.28p1 > * php-8.1.18 > > Poking around, I find that php 8.1.18 is pulled in as a dependency of > roundcubemail. > > I have php-8.0.28p1 installed (upgraded from 7.2). I have a couple of > un-packaged web applications (eg: piwigo) that need php. > > Is the "default" version of PHP the 8.1.18 version for OnBase 7.3? Yes, see MODPHP_VERSION in ports/lang/php/php.port.mk since https://github.com/openbsd/ports/commit/bc7244a37c7e49cb00981e53b217069819877e7f > For example, rc.conf.local still has php80_fpm in it, rather than php81_fpm. the ports/packages don't touch rc.conf.local :) that's the administrator's job.. > I can move the php/php_fpm configs to php-8.1.18 and then pkg_delete the > php-8.0.28p1 associated packages, but I wanted to make sure this was the > correct approach. yes; test all your php apps by moving php pools from 8.0 to 8.1, and if all are happy you can drop 8.0 from your system.
Re: [readd] games/hedgewars
On 2023-04-04, Lucas de Sena wrote: > Hi, > > This is a revised port from my last attempt to readd games/headgewars, > in its last version. > > The client for hedgewars can be built again since its dependency > lang/fpc had been readded into the ports. > > The server flavor, however, could not be built; for lots of its haskell > dependencies got deleted from the ports. > > Comments? > > Lucas de Sena. Ping.
Re: [new] games/dsda-doom
On 2023-04-04, Lucas de Sena wrote: > Hi, > > This is a port for DSDA-Doom. > > DSDA-Doom is a new DOOM source port based on prboom-plus. It has extra > tooling for demo recording and playback, with a focus on speedrunning. > It also implements several new standards for mod and map authors alike. > > Noteworthy features include the hability to rewind the game; support for > Heretic and Hexen (two games based on DOOM, but with a wizardry/medieval > theme); and support for UMAPINFO, in which a WAD can provide meta-data > associated to levels, such as the level author, the name of the music > playing in the level, etc. > > DSDA-Doom has gained popularity among DOOM players and the users of the > doomworld.com forums. > > Article on the DOOM Wiki: https://doomwiki.org/wiki/DSDA-Doom > Post on the DoomWorld forums: https://www.doomworld.com/vb/thread/118074 > Repository on Github: https://github.com/kraflab/dsda-doom > > Lucas de Sena Ping.
OpenBSD 7.3, roundcubemail & php 8.0 vs php 8.1
Hi, I just completed the 7.5 upgrade process and after running the pkg_add -u, I ended up with both * php-8.0.28p1 * php-8.1.18 Poking around, I find that php 8.1.18 is pulled in as a dependency of roundcubemail. I have php-8.0.28p1 installed (upgraded from 7.2). I have a couple of un-packaged web applications (eg: piwigo) that need php. Is the "default" version of PHP the 8.1.18 version for OnBase 7.3? For example, rc.conf.local still has php80_fpm in it, rather than php81_fpm. I can move the php/php_fpm configs to php-8.1.18 and then pkg_delete the php-8.0.28p1 associated packages, but I wanted to make sure this was the correct approach. Here's what my system looks like post upgrade: php-8.0.28p1 server-side HTML-embedded scripting language php-8.1.18 server-side HTML-embedded scripting language php-bz2-8.0.28p1 bzip2 compression extensions for php php-curl-8.0.28p1 curl URL library extensions for php php-gd-8.0.28p1 image manipulation extensions for php php-intl-8.0.28p1 intl library support for php php-intl-8.1.18 intl library support for php php-mysqli-8.0.28p1 mysql database access extensions for php php-pdo_mysql-8.0.28p1 PDO mysql database access extensions for php php-pdo_pgsql-8.1.18 PDO pgsql database access extensions for php php-pspell-8.0.28p1 pspell library extensions for php php-pspell-8.1.18 pspell library extensions for php php-zip-8.0.28p1 zip functions for php php-zip-8.1.18 zip functions for php Thanks, Steve Williams
[new] sysutils/gdu 5.23.0
Hi, proposal to import sysutils/gdu for the latest version 5.23.0 gdu is a fast disk usage analyzer with console interface written in Go => https://github.com/dundee/gdu A simple port accordingly to go-modules with a patch to simplify version output. Comments welcome and please commit if OK. Laurent gdu-5.23.0.tar.gz Description: GNU Zip compressed data
Re: [new] x11/xfiles
On 2023-04-15, Lucas de Sena wrote: > On 2023-04-15, Omar Polo wrote: > > If you're fine with it, the attached port is ok op@ to import. > > It's fine, thanks. > > I just bumped to version 1.0.4 with a bugfix. > The attached port has the bumped version and updated distinfo. > > Lucas de Sena. Ping.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/04/19 06:39:16 Modified files: geo/traccar: Makefile geo/traccar/patches: patch-conf_default_xml geo/traccar/pkg: traccar.rc Log message: use daemon_execdir in traccar's rc script so that the upstream standard relative paths work. remove patched paths from default.xml. ok maintainer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/04/19 06:12:27 Modified files: textproc/py-pygments: Makefile distinfo textproc/py-pygments/pkg: PLIST Log message: update to py3-pygments-2.15.1
Re: [update] geo/traccar 5.7
On 4/19/23 12:55, Stuart Henderson wrote:
On 2023/04/19 11:31, Renaud Allard wrote:
Here's a different approach to allowing it to find the files, which
gets rid of most of the patches to default.xml and use the relative
paths. What do you think?
If you tested it and everything works as expected, it looks indeed much
cleaner.
Index: Makefile
===
RCS file: /cvs/ports/geo/traccar/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile19 Apr 2023 09:46:00 - 1.30
+++ Makefile19 Apr 2023 10:53:44 -
@@ -1,5 +1,6 @@
COMMENT = modern GPS tracking platform
V = 5.7
+REVISION = 0
PKGNAME = traccar-${V}
DISTNAME =traccar-other-${V}
EXTRACT_SUFX =.zip
Index: pkg/traccar.rc
===
RCS file: /cvs/ports/geo/traccar/pkg/traccar.rc,v
retrieving revision 1.4
diff -u -p -r1.4 traccar.rc
--- pkg/traccar.rc 24 May 2022 18:51:25 - 1.4
+++ pkg/traccar.rc 19 Apr 2023 10:53:44 -
@@ -2,6 +2,7 @@
daemon="${TRUEPREFIX}/share/traccar/tracker-server.jar"
daemon_user="_traccar"
+daemon_execdir="${TRUEPREFIX}/share/traccar"
. /etc/rc.d/rc.subr
Index: patches/patch-conf_default_xml
===
RCS file: /cvs/ports/geo/traccar/patches/patch-conf_default_xml,v
retrieving revision 1.12
diff -u -p -r1.12 patch-conf_default_xml
--- patches/patch-conf_default_xml 19 Apr 2023 09:46:00 - 1.12
+++ patches/patch-conf_default_xml 19 Apr 2023 10:53:44 -
@@ -1,15 +1,11 @@
-seems that database.changelog requires a relative path
-
Index: conf/default.xml
--- conf/default.xml.orig
+++ conf/default.xml
-@@ -11,7 +11,8 @@
- -->
+@@ -12,6 +12,7 @@
8082
--./modern
+ ./modern
+127.0.0.1
-+${LOCALBASE}/share/traccar/modern
false
false
@@ -22,22 +18,12 @@ Index: conf/default.xml
true
true
-@@ -30,16 +31,14 @@
-
- true
-
--./media
-+${LOCALBASE}/share/traccar/media
+@@ -33,8 +34,6 @@
+ ./media
web,mail,command
-
--https://www.traccar.org/analytics/
-
- true
+-https://www.traccar.org/analytics/
- true
--./schema/changelog-master.xml
-+../../..${LOCALBASE}/share/traccar/schema/changelog-master.xml
+ true
- 5001
- 5002
smime.p7s
Description: S/MIME Cryptographic Signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/04/19 05:27:41 Modified files: devel/py-hatchling: Makefile distinfo devel/py-hatchling/pkg: PLIST Log message: update to py3-hatchling-1.14.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/04/19 05:23:59 Modified files: devel : Makefile Log message: + py-calver, py-trove-classifiers
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/04/19 05:23:44 Log message: imports ports/devel/py-trove-classifiers, ok landry@ Canonical source for classifiers on PyPI. Classifiers categorize projects per PEP 301. Use this package to validate classifiers in packages for PyPI upload or download. Status: Vendor Tag: sthen Release Tags: sthen_20230419 N ports/devel/py-trove-classifiers/Makefile N ports/devel/py-trove-classifiers/distinfo N ports/devel/py-trove-classifiers/pkg/PLIST N ports/devel/py-trove-classifiers/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/04/19 05:23:04 Log message: import ports/devel/py-calver, ok landry@ The calver package is a setuptools extension for automatically defining your Python package version as a calendar version. Status: Vendor Tag: sthen Release Tags: sthen_20230419 N ports/devel/py-calver/Makefile N ports/devel/py-calver/distinfo N ports/devel/py-calver/pkg/PLIST N ports/devel/py-calver/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2023/04/19 05:17:14
Modified files:
mail/tnef : Makefile
Added files:
mail/tnef/patches: patch-src_main_c
Log message:
mail/tnef seems happy with a pledge("stdio rpath wpath cpath")
Re: [update] geo/traccar 5.7
On 2023/04/19 11:31, Renaud Allard wrote:
>
>
> On 4/19/23 11:29, Stuart Henderson wrote:
> > On 2023/04/18 08:58, Renaud Allard wrote:
> > > Hello,
> > >
> > > Here is an update to geo/traccar 5.7.
> > > There are no imcompatible changes. However default.xml config file has
> > > changed and now needs 3 times ../ in the changelog path for some reason.
> >
> > oh, that is a nuisance (and I don't see which commit does it..)
> >
> > Do you mind if I add a readme change as well, to reduce the chance that
> > users might need to edit default.xml?
> >
> I have no objection to that, it might be clearer
more important than being clearer, is that it means you don't need to
maintain a modified copy of default.xml and keep track of changes
during updates :)
> I also don't understand
> why a 3rd ../ is needed given base is supposed to be /var/empty.
> don't understand why they don't allow to put an absolute path, which would
> be way more convenient.
I do kind-of see why liquibase changed this, they were originally
searching for this file relative to all dirs in classPath, and that was
setup to include /.
They later changed to using searchPath which supposed can be set via a
system property, which I would normally expect to be able to set with
e.g. -Dliquibase.searchPath=/path/to/dir which, if it worked, would
allow upstream's default path - but that doesn't seem to be respected.
Anyway for whatever reason that's a liquibase thing and not really
in traccar's control. Well, traccar could use an absolute path, but
that would tie things down to a certain directory layout, so it wouldn't
be good for all of $random_linux / Windows / ..., whereas for most
people it should be OK to just use a path relative to traccar's install
dir.
Here's a different approach to allowing it to find the files, which
gets rid of most of the patches to default.xml and use the relative
paths. What do you think?
Index: Makefile
===
RCS file: /cvs/ports/geo/traccar/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile19 Apr 2023 09:46:00 - 1.30
+++ Makefile19 Apr 2023 10:53:44 -
@@ -1,5 +1,6 @@
COMMENT = modern GPS tracking platform
V =5.7
+REVISION = 0
PKGNAME = traccar-${V}
DISTNAME = traccar-other-${V}
EXTRACT_SUFX = .zip
Index: pkg/traccar.rc
===
RCS file: /cvs/ports/geo/traccar/pkg/traccar.rc,v
retrieving revision 1.4
diff -u -p -r1.4 traccar.rc
--- pkg/traccar.rc 24 May 2022 18:51:25 - 1.4
+++ pkg/traccar.rc 19 Apr 2023 10:53:44 -
@@ -2,6 +2,7 @@
daemon="${TRUEPREFIX}/share/traccar/tracker-server.jar"
daemon_user="_traccar"
+daemon_execdir="${TRUEPREFIX}/share/traccar"
. /etc/rc.d/rc.subr
Index: patches/patch-conf_default_xml
===
RCS file: /cvs/ports/geo/traccar/patches/patch-conf_default_xml,v
retrieving revision 1.12
diff -u -p -r1.12 patch-conf_default_xml
--- patches/patch-conf_default_xml 19 Apr 2023 09:46:00 - 1.12
+++ patches/patch-conf_default_xml 19 Apr 2023 10:53:44 -
@@ -1,15 +1,11 @@
-seems that database.changelog requires a relative path
-
Index: conf/default.xml
--- conf/default.xml.orig
+++ conf/default.xml
-@@ -11,7 +11,8 @@
- -->
+@@ -12,6 +12,7 @@
8082
--./modern
+ ./modern
+127.0.0.1
-+${LOCALBASE}/share/traccar/modern
false
false
@@ -22,22 +18,12 @@ Index: conf/default.xml
true
true
-@@ -30,16 +31,14 @@
-
- true
-
--./media
-+${LOCALBASE}/share/traccar/media
+@@ -33,8 +34,6 @@
+ ./media
web,mail,command
-
--https://www.traccar.org/analytics/
-
- true
+-https://www.traccar.org/analytics/
- true
--./schema/changelog-master.xml
-+../../..${LOCALBASE}/share/traccar/schema/changelog-master.xml
+ true
- 5001
- 5002
Re: [New] security/Nuclei 2.9.0
On Wed, 12 Apr 2023 21:58:02 +0200, Omar Polo wrote:
> The problem is that by default 'go build' fetches the dependencies at
> build-time, which is a big no for the ports infrastructure. (the
> build will fail if you run with PORTS_PRIVSEP and default pf.conf.)
>
> Instead, please use the go-module(5), set up MODGO_{MODNAME,VERSION}
> and issue `make modgo-gen-modules >modules.inc' to list the
> dependencies. The `make makesum' to update the checksums and the
> usual to build the port.
Thanks Omar to fix this port accordingly go-modules.
> I'm attaching a diff against your Makefie and an updated tarball
> (while there I've also bumped the version to the latest 2.9.1.)
Build OK for version nuclei v2.9.1 on current/amd64.
Tests of Nuclei with basic config/templates are OK.
Laurent
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/04/19 03:46:00 Modified files: geo/traccar: Makefile distinfo geo/traccar/patches: patch-conf_default_xml geo/traccar/pkg: PLIST README Log message: update to traccar-5.7, from Renaud Allard (maintainer) Note that default.xml has changed a path; if you have modified it (which is not recommended, but might have been done to disable unwanted protocols) you need to merge the changes. Update pkg-readme to show a better way to disable protocols that avoids the need to touch default.xml (this part from me).
Re: [update] geo/traccar 5.7
On 4/19/23 11:29, Stuart Henderson wrote:
On 2023/04/18 08:58, Renaud Allard wrote:
Hello,
Here is an update to geo/traccar 5.7.
There are no imcompatible changes. However default.xml config file has
changed and now needs 3 times ../ in the changelog path for some reason.
oh, that is a nuisance (and I don't see which commit does it..)
Do you mind if I add a readme change as well, to reduce the chance that
users might need to edit default.xml?
I have no objection to that, it might be clearer. I also don't
understand why a 3rd ../ is needed given base is supposed to be
/var/empty. But I also don't understand why they don't allow to put an
absolute path, which would be way more convenient.
Index: pkg/README
===
RCS file: /cvs/ports/geo/traccar/pkg/README,v
retrieving revision 1.3
diff -u -p -r1.3 README
--- pkg/README 1 Mar 2022 17:58:56 - 1.3
+++ pkg/README 19 Apr 2023 09:26:55 -
@@ -46,13 +46,18 @@ Open Network Ports
==
By default, traccar will listen on many network ports. Each tracker protocol
-requires its own open port. So you should really block those ports using pf and
-only allow the protocols you actually use.
+requires its own open port, which requires a large number of file descriptors
+and may conflict with other software.
-You can also restrict the open ports by altering the default.xml file and remove
-all the protocols you don't use. However, the default.xml file will change on
-almost every revision, so if you do that you should do it on a copy of
-default.xml and reference that copy in traccar.xml configuration file. Also,
you
-should ensure that at every upgrade, you track the changes in default.xml as
-the file contains important informations about SQL queries. This is definitely
-more complex than firewalling the unused ports.
+The list of protocols can be seen in ${SYSCONFDIR}/traccar/default.xml, along
+with various other settings, but do not edit defalut.xml. Instead, you can
+list the specific protocols to enable in ${SYSCONFDIR}/traccar/traccar.xml.
+For examply, to allow only teltonika and osmand protocols, add this:
+
+ teltonika,osmand
+
+You may like to override other settings from default.xml - again, change
+traccar.xml instead by copying the entry to override. For example, to
+avoid sending positions to a network-based geocoder service:
+
+ false
smime.p7s
Description: S/MIME Cryptographic Signature
Re: [update] geo/traccar 5.7
On 2023/04/18 08:58, Renaud Allard wrote:
> Hello,
>
> Here is an update to geo/traccar 5.7.
> There are no imcompatible changes. However default.xml config file has
> changed and now needs 3 times ../ in the changelog path for some reason.
oh, that is a nuisance (and I don't see which commit does it..)
Do you mind if I add a readme change as well, to reduce the chance that
users might need to edit default.xml?
Index: pkg/README
===
RCS file: /cvs/ports/geo/traccar/pkg/README,v
retrieving revision 1.3
diff -u -p -r1.3 README
--- pkg/README 1 Mar 2022 17:58:56 - 1.3
+++ pkg/README 19 Apr 2023 09:26:55 -
@@ -46,13 +46,18 @@ Open Network Ports
==
By default, traccar will listen on many network ports. Each tracker protocol
-requires its own open port. So you should really block those ports using pf and
-only allow the protocols you actually use.
+requires its own open port, which requires a large number of file descriptors
+and may conflict with other software.
-You can also restrict the open ports by altering the default.xml file and
remove
-all the protocols you don't use. However, the default.xml file will change on
-almost every revision, so if you do that you should do it on a copy of
-default.xml and reference that copy in traccar.xml configuration file. Also,
you
-should ensure that at every upgrade, you track the changes in default.xml as
-the file contains important informations about SQL queries. This is definitely
-more complex than firewalling the unused ports.
+The list of protocols can be seen in ${SYSCONFDIR}/traccar/default.xml, along
+with various other settings, but do not edit defalut.xml. Instead, you can
+list the specific protocols to enable in ${SYSCONFDIR}/traccar/traccar.xml.
+For examply, to allow only teltonika and osmand protocols, add this:
+
+ teltonika,osmand
+
+You may like to override other settings from default.xml - again, change
+traccar.xml instead by copying the entry to override. For example, to
+avoid sending positions to a network-based geocoder service:
+
+ false
[maintainer update] net/headscale 0.21.0
Hi,
update for net/headscale to the latest version 0.21.0
Changelog for major version 0.21.0 :
https://github.com/juanfont/headscale/releases/tag/v0.21.0
- Update Makefile to install only headscale binary in ${PREFIX}/bin
- Update pkg/MESSAGE and pkg/README for modification in version 0.19.0
(keyword Namespace replaced by User), see
https://github.com/juanfont/headscale/releases/tag/v0.19.0
Build and tests OK on amd64.
Comments welcome and please commit if OK.
Laurent
headscale-0.21.0.diff.gz
Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/04/19 02:25:51 Modified files: print : Makefile Log message: Link print/xournalpp.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/04/19 02:17:35 Log message: Import print/xournalpp. ``` Xournal++ is an open-source and cross-platform note-taking software that is fast, flexible, and functional. A modern rewrite and a more feature-rich version of the wonderful Xournal program. ``` Lots of input and OK op@, thanks! Status: Vendor Tag: edd Release Tags: edd_20230419 N ports/print/xournalpp/Makefile N ports/print/xournalpp/distinfo N ports/print/xournalpp/pkg/PLIST N ports/print/xournalpp/pkg/DESCR N ports/print/xournalpp/patches/patch-man_CMakeLists_txt N ports/print/xournalpp/patches/patch-src_control_settings_LatexSettings_h N ports/print/xournalpp/patches/patch-src_util_Stacktrace_cpp N ports/print/xournalpp/patches/patch-src_control_settings_Settings_cpp N ports/print/xournalpp/patches/patch-CMakeLists_txt No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2023/04/19 02:04:46 Modified files: audio/portaudio-svn: Makefile audio/portaudio-svn/pkg: PLIST Log message: audio/portaudio-svn: enable C++ bindings. Required for an upcoming xournalpp port. OK op@, thanks!
New: devel/py-trove-classifiers, py-calver
Here are ports for py-trove-classifier and a required BDEP, py-calver, which are needed for newer versions of py-hatchling. Newer versions of some other ports require new hatchling. OK to import? --- Canonical source for classifiers on PyPI. Classifiers categorize projects per PEP 301. Use this package to validate classifiers in packages for PyPI upload or download. --- The calver package is a setuptools extension for automatically defining your Python package version as a calendar version. --- trove-classifiers.tgz Description: application/tar-gz
Re: WM_CLASS/StartupWMClass, desktop files & mozilla ports (was: Re: help creating new port: x11/xfce4/xfce4-docklike)
> Le 19 avr. 2023 à 07:48, Landry Breuil a écrit : > > Le Tue, Apr 18, 2023 at 10:20:54PM +0200, Joel Carnat a écrit : >>> Le 18/04/2023 à 16:08, Landry Breuil a écrit : > > Can you try removing the '-default' suffixing horror, and just add > StartupWMClass=firefox (or thunderbird, or firefox-esr..) to your custom > desktop file and check this also fixes the problem ? > > The firefox-flatpak desktop file has a bit more actions, more > translations, and seems better maintained upstream, so instead of > setting MOZ_APP_REMOTINGNAME in the build i'd rather switch to this > desktop file as a source for the one we install in the package. > > My understanding of the root issue is that docklike relies on the > WM_CLASS value to match running processes, which doesnt work for mozilla > windows because of the -default suffix. You can see for yourself what > is the WM_CLASS for all existing windows using 'xlsclients', that might > also show other applications behaving weird. >>> >>> Thinking more about it, i'm not sure fixing the desktop file is enough, >>> since that only might account for the browsers launched from clicking on >>> a proper launcher, and might not have the same behaviour with starting >>> "firefox" in a terminal. >>> >>> More testing needed, but feedback on the rationale more than welcome ! >>> >>> Landry >>> >> >> I have tested various combination and long-story-short, nothing worked >> except the dirty modification of Exec. StartupWMClass doesn't seem to be >> taken in account, or at least WM_CLASS isn't changed (tested with xprop). >> >> Using `firefox --class firefox` from xterm does show the proper icon. You >> can then pin it on docklike. But it is pinned without the flags. You have to >> edit the launcher to add "--class firefox". Then, clicking docklike icon >> will start Firefox with the overwritten class and show the icon. >> >> I have noticed that when you modify the launcher from docklike, it >> automatically modifies ~/.local/share/applications/firefox.desktop with >> "Exec=firefox --class firefox %u". > > Was all this testing with standard packages, or my wip packages setting > MOZ_APP_REMOTINGNAME ? It was the standard packages. I forgot to test with your packages. I’ll have a look this evening and let you know. > >> Note that Thunderbird also has the StartupWMClass in the default desktop >> file ; and the icon is ignored. I have also seen >> /usr/local/share/applications/writer.desktop having "Exec=libreoffice7.5 >> --writer %U" in the stock file. > > And.. what is the behaviour for writer ? works ? wrong icon ? wrong > class ? With Libreoffice, everything worked out of the box. I never thought about checking its desktop files before yesterday. > For thunderbird the issue is the same as firefox, it has > 'thunderbird-default' as > WM_CLASS: > WM_CLASS(STRING) = "Mail", "thunderbird-default" > and the desktop file is wrong too, since it has > 'StartupWMClass=Thunderbird-bin' > which doesnt match the binary name nor the WM_CLASS. > > To my understanding, for the icon to work (in all situations, eg > launched from a terminal or from a command in a shell), the value in > xlsclients (set via --class arg on the commandline or gdk_set_wm_class() > in the code) has to match the binary name. > > Landry
