Re: Ports documentation: document that TRUSTED_PKG_PATH is needed in doas.conf?

[Marc Espie]

As the idiot responsible for how the framework actually works, I'm always
running with keepenv.

Building ports by hand always end up installing *whatever* as root, so
I don't see nopass as much of a security risk either. Heck, you're going to
put that shit in /usr/local/bin and run it anyway.


PORTS_PRIVSEP is a much better security measure. Preventing ports from
accidentally accessing the network or writing all over the system is good.

The main reason PORTS_PRIVSEP is not the default is that it requires some
awkward setup (fix-permissions) and that you definitely need some scripts
to handle editing files as the right guy (or put yourself in the right
group in any case, you have to do stuff correctly to handle ports).


Ports has a somewhat low entry barrier compared to other parts of the
system, but a secure setup still requires some basic understanding of
things.

At some point, either you put in the work, or just use the darn packages.

Re: PostgreSQL 13.1 Upgrade

[Pierre-Emmanuel Andr??]

On Thu, Feb 04, 2021 at 01:32:31PM +, Stuart Henderson wrote:
> > >  @conflict postgresql-*
> > > -@ask-update postgresql-server-<${V_MAJOR} Make sure your existing 
> > > database is backed up
> > > +@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for 
> > > pg_upgrade, make sure your database is backed up
> > 
> > 
> > yes ok pea@
> 
> Here is an updated version of the pgsql 13.1 update, based on
> https://marc.info/?l=openbsd-ports&m=160592088315669&w=2 with the
> above and the following other changes (some of which were mentioned
> in the thread but I didn't find another full diff):
> 
> - don't bump libraries unnecessarily; only pq has a minor bump
> - https homepage
> - sync WANTLIB/LIB_DEPENDS
> - knock out backtrace_symbols/libexecinfo (found by Mark Patruck ;)
> - line up some tabs
> 
> this one is OK with me

ok pea@ too

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.266
> diff -u -p -r1.266 Makefile
> --- Makefile  14 Nov 2020 13:03:49 -  1.266
> +++ Makefile  4 Feb 2021 13:28:44 -
> @@ -7,8 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
>  COMMENT-plpython=Python procedural language for PostgreSQL
>  COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous 
> version
>  
> -VERSION= 12.5
> -PREV_MAJOR=  11
> +VERSION= 13.1
> +PREV_MAJOR=  12
>  DISTNAME=postgresql-${VERSION}
>  PKGNAME-main=postgresql-client-${VERSION}
>  PKGNAME-server=  postgresql-server-${VERSION}
> @@ -16,16 +16,16 @@ PKGNAME-docs= postgresql-docs-${VERSION}
>  PKGNAME-contrib=postgresql-contrib-${VERSION}
>  PKGNAME-plpython=postgresql-plpython-${VERSION}
>  PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
> -REVISION-server= 0
>  
> +DPB_PROPERTIES=  parallel
>  
>  CATEGORIES=  databases
>  SHARED_LIBS= ecpg7.10 \
>   ecpg_compat 4.10 \
>   pgtypes 4.9 \
> - pq  6.11
> + pq  6.12
>  
> -HOMEPAGE=http://www.postgresql.org/
> +HOMEPAGE=https://www.postgresql.org/
>  
>  MAINTAINER=  Pierre-Emmanuel Andre 
>  
> @@ -51,10 +51,12 @@ MODULES=  lang/python
>  MODPY_RUNDEP=No
>  
>  CONFIGURE_ENV=   ac_cv_path_PYTHON=${MODPY_BIN} \
> + ac_cv_search_backtrace_symbols=no \
>   CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
>  
> -CONFIGURE_ARGS=  --disable-rpath --with-openssl=/usr \
> +CONFIGURE_ARGS=  --disable-rpath \
> + --with-openssl=/usr \
>   --with-bsd-auth \
>   --with-perl \
>   --with-python \
> @@ -76,7 +78,7 @@ CONFIGURE_ARGS= --disable-rpath --with-o
>  # (apparently) a serious performance hit doing this.
>  
>  .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "hppa"
> -CONFIGURE_ARGS+=--disable-spinlocks
> +CONFIGURE_ARGS+= --disable-spinlocks
>  .endif
>  
>  # To avoid problems with missed floating point overflow checks.
> @@ -96,30 +98,27 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/conf
>  ALL_TARGET=  world
>  INSTALL_TARGET=  install-world
>  
> -LIB_DEPENDS-main=archivers/xz \
> - converters/libiconv \
> - textproc/libxml
> -WANTLIB-main =   ${WANTLIB} iconv lzma xml2
> +LIB_DEPENDS-main=textproc/libxml
> +WANTLIB-main=${WANTLIB} xml2
>  
> -
> -LIB_DEPENDS-server= databases/postgresql=${VERSION} \
> - ${LIB_DEPENDS-main}
> -WANTLIB-server=  ${WANTLIB-main} perl pq
> -
> -RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
> -LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
> -  ${LIB_DEPENDS-main}
> +LIB_DEPENDS-server=  databases/postgresql=${VERSION} \
> + ${LIB_DEPENDS-main}
> +WANTLIB-server=  ${WANTLIB-main} perl pq
> +
> +RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
> +LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
> + ${LIB_DEPENDS-main}
>  WANTLIB-contrib= ${WANTLIB-main} perl pq
>  
>  RUN_DEPENDS-pg_upgrade=  databases/postgresql,-server=${VERSION} \
>   databases/postgresql-previous>=${PREV_MAJOR}
>  LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
> -  ${LIB_DEPENDS-main}
> + ${LIB_DEPENDS-main}
>  
> -WANTLIB-pg_upgrade = ${WANTLIB-main} pq
> +WANTLIB-pg_upgrade=  ${WANTLIB-main} pq
>  
>  LIB_DEPENDS-plpython=${MODPY_LIB_DEPENDS}
> -WANTLIB-plpython =   c m pthread util \
> +WANTLIB-plpython=c intl m pthread util \
>   ${MODPY_WANTLIB}
>  RUN_DEPENDS-plpython=databases/postgresql,-server=${VERSION}
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/databases/postgresql/distinfo,v
> retriev

Re: Fix x11/remmina -fno-common from upstream

[Stuart Henderson]

On 2021/02/04 22:21, Greg Steuck wrote:
> With this remmina still starts. I don't use it, so haven't tested any further.
> 
> OK?

Please bump REVISION. OK.

> From 186c110fb0d4e38902631e5f1ec81d0d7e82a9a1 Mon Sep 17 00:00:00 2001
> From: Greg Steuck 
> Date: Thu, 4 Feb 2021 22:18:59 -0800
> Subject: [PATCH] Fix x11/remmina -fno-common from upstream
> 
> ---
>  x11/remmina/patches/patch-src_remmina_stats_c | 27 +++
>  1 file changed, 27 insertions(+)
>  create mode 100644 x11/remmina/patches/patch-src_remmina_stats_c
> 
> diff --git x11/remmina/patches/patch-src_remmina_stats_c 
> x11/remmina/patches/patch-src_remmina_stats_c
> new file mode 100644
> index 000..16ede22637d
> --- /dev/null
> +++ x11/remmina/patches/patch-src_remmina_stats_c
> @@ -0,0 +1,27 @@
> +$OpenBSD$
> +
> +Makes compile with -fno-common. Taken from upstream:
> +https://github.com/FreeRDP/Remmina/commit/27f84d1c0a2e4c2432281f25ef3026bb00bbdc15
> +
> +Index: src/remmina_stats.c
> +--- src/remmina_stats.c.orig
>  src/remmina_stats.c
> +@@ -158,8 +158,6 @@
> + #endif
> + #include "remmina_stats.h"
> + 
> +-struct utsname u;
> +-
> + struct ProfilesData {
> + GHashTable *proto_count;
> + GHashTable *proto_date;
> +@@ -805,9 +803,6 @@ JsonNode *remmina_stats_get_all()
> + n = remmina_stats_get_version();
> + json_builder_set_member_name(b, "REMMINAVERSION");
> + json_builder_add_value(b, n);
> +-
> +-if (uname(&u) == -1)
> +-g_print("uname:");
> + 
> + n = remmina_stats_get_os_info();
> + json_builder_set_member_name(b, "SYSTEM");
> -- 
> 2.30.0
> 

-fno-common update: broken ports

[Stuart Henderson]

Updated list, with the dependent ports listed (which may or may not
be broken, but can't be built until the parent is fixed) It's gradually.
shrinking, and the majority of these are edge ports now.

If there is something you care about on the list, just type
<< portname "-fno-common" >> or << portname "gcc 10" >> into your
favourite search engine - the majority of ports I've fixed for this
have had patches upstream or in other OS and are simple to fix.

This is from an i386 build, I've merged in the !i386 one that I know
about (nagios) but there's a chance another is hiding.

astro/wmspaceweather
astro/wmsun
audio/audacity
audio/gimmix
audio/gtkpod
audio/nspmod
audio/scmpc
audio/wmmp3
audio/wmtune
audio/xhippo
audio/ympd
cad/geda-gaf
cad/graywolf -> cad/qflow
comms/birda
comms/efax
comms/jpilot
comms/lcdproc
comms/minicom
comms/scmxx
comms/seyon
comms/xastir
comms/xdx
databases/citus (update pending with postgresql update may help)
databases/pgpool
devel/arm-none-eabi/gdb
devel/avr32/binutils -> devel/avr32/*
devel/blame
devel/giggle
devel/libowfat
devel/mingw
devel/remake
devel/ti-msp430gcc
editors/beaver
editors/hexcurse
editors/hnb
editors/tea
education/gamgi
emulators/advancemame
emulators/coldfire
emulators/fuse
emulators/libretro-genesis-plus-gx
emulators/mupen64plus/rsp-cxd4
emulators/pcsxr
emulators/simh
games/angband
games/atomix
games/clonekeen
games/corewars
games/egoboo
games/freeblocks
games/freedroid
games/freedroidrpg
games/gnurobbo
games/heroes
games/jumpnbump
games/lincity
games/megaglest/base
games/mirrormagic
games/nethack/3.6
games/oolite
games/openjk
games/opentyrian
games/pacman-arena
games/prboom
games/prboom-plus
games/sdlpop
games/sdlroids
games/spider
games/typespeed
games/vms-empire
games/wmtictactoe
games/xboard
games/xboing
games/xmj
geo/osm2pgrouting
geo/pgpointcloud
graphics/barcode
graphics/dpic
graphics/enjoympeg
graphics/gimp/liquid-rescale
graphics/ocaml-cairo -> x11/lablgtk3, math/coq, lang/compcert
inputmethods/cellwriter
japanese/Wnn -> japanese/kinput2, japanese/onew
japanese/canna -> japanese/kinput2, japanese/onew
lang/arena
lang/erlang/19 -> net/rabbitmq, benchmarks/tsung
lang/moarvm -> lang/nqp, lang/rakudo
lang/pcc
lang/snobol4
mail/avenger
mail/mlmmj
mail/sma
mail/wmmultipop3
mail/wmpop3
math/abs
math/foma
math/mcl
math/pspp
misc/brltty
misc/geekcode
misc/hfsplus
misc/logjam
misc/plan -> misc/cbb
misc/viz
misc/wmmand
multimedia/audiopreview
multimedia/avinfo
multimedia/lives
multimedia/minidlna
multimedia/swftools
net/angst
net/argus
net/argus-clients
net/dico
net/ekg
net/epic4
net/ettercap
net/gophernicus
net/grsync
net/honeyd
net/icli
net/iftop
net/ipv6-toolkit
net/jftpgw
net/msdl
net/nagios/nagios -> net/nagios/cnagios, net/nagios/nsca
net/netatalk
net/openmdns
net/plushs
net/sniproxy
net/snort
net/tcpreplay
net/tinyfugue
net/weex
net/yersinia
news/nn
news/trn
print/cups-bjnp
print/gtklp
productivity/glabels
productivity/siag
productivity/xinvest
productivity/xquote
security/bsd-airtools
security/dirb
security/flasm
security/foremost
security/fwknop
security/gringotts
security/hydra
security/ipguard
security/ossec-hids
security/p0f
security/tempwatch
sysutils/conky
sysutils/fprintd
sysutils/radmind
sysutils/wmcube
sysutils/wmmon
sysutils/wmwlmon
telephony/fobbit
textproc/zoem
www/sarg
www/uget
www/www6to4
x11/agar/test
x11/asclock
x11/bricons
x11/compiz/plugins-main
x11/fbpanel
x11/gcolor2
x11/gnome-mplayer
x11/gnustep/corebase
x11/gnustep/gworkspace -> gnustep/addresses, gnumail, simpleagenda
x11/gnustep/terminal
x11/golem
x11/oroborus
x11/remmina
x11/rox-filer
x11/roxterm
x11/skippy
x11/uwm
x11/wind
x11/wmii
x11/wminfo
x11/wmtime
x11/xfed
x11/xforms

misc/ietf-cli fix dump status info

[Peter Hessler]

If you use ietf-cli to mirror RFCs for convienence, you may see this error:

Making the RFC status index 
Could not dump status info to
'/var/db/ietf-mirrors/in-notes/ietf-rfc-status.json'. Exiting. 

There is a Pull Request to fix it, but it seems upstream hasn't yet
reacted to it.  the pull request works for me, and makes sense.

OK?

Index: misc/ietf-cli/Makefile
===
RCS file: /home/cvs/openbsd/ports/misc/ietf-cli/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- misc/ietf-cli/Makefile  3 Jul 2020 21:12:58 -   1.5
+++ misc/ietf-cli/Makefile  21 Jan 2021 22:34:18 -
@@ -6,7 +6,7 @@ GH_ACCOUNT= paulehoffman
 GH_PROJECT=ietf-cli
 GH_TAGNAME=4b2b52dc333b6b59403b102349572f8af1b20a52
 DISTNAME=  ${GH_PROJECT}-1.16
-REVISION=  0
+REVISION=  1
 
 CATEGORIES=misc net books
 
Index: misc/ietf-cli/patches/patch-ietf
===
RCS file: /home/cvs/openbsd/ports/misc/ietf-cli/patches/patch-ietf,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-ietf
--- misc/ietf-cli/patches/patch-ietf14 Mar 2020 15:59:46 -  1.2
+++ misc/ietf-cli/patches/patch-ietf5 Feb 2021 10:36:45 -
@@ -2,6 +2,8 @@ $OpenBSD: patch-ietf,v 1.2 2020/03/14 15
 
 Adjust ConfigPlaces.
 
+Remove binary flag when opening a text file to write to it (GitHub PR 4)
+
 Index: ietf
 --- ietf.orig
 +++ ietf
@@ -14,3 +16,21 @@ Index: ietf
  
  # Make a block of text that can be executed in the CLI
  CLICmdCode = ""
+@@ -751,7 +751,7 @@ def Cmd_mirror(Args):
+   for ThisFoundInnerAuthor in 
ThisFoundOuterAuthor.findall(TagBase + "name"):
+   
RFCStatus[ThisRFCNum]["authors"].append(ThisFoundInnerAuthor.text)
+   try:
+-  with open(RFCStatusFileLoc, mode="wb") as statusf:
++  with open(RFCStatusFileLoc, mode="w") as statusf:
+   json.dump(RFCStatus, statusf)
+   except:
+   exit("Could not dump status info to '" + RFCStatusFileLoc + "'. 
Exiting.")
+@@ -783,7 +783,7 @@ def Cmd_mirror(Args):
+   "title": TheFields[13], \
+   "authors": TheFields[14].rstrip() }
+   try:
+-  with open(IDStatusFileLoc, mode="wb") as statusf:
++  with open(IDStatusFileLoc, mode="w") as statusf:
+   json.dump(IDStatus, statusf)
+   except:
+   exit("Could not dump status info to '" + IDStatusFileLoc + "'. 
Exiting.")   


-- 
Q:  How many Zen masters does it take to screw in a light bulb?
A:  None.  The Universe spins the bulb, and the Zen master stays out
of the way.

Re: misc/ietf-cli fix dump status info

[Klemens Nanni]

On Fri, Feb 05, 2021 at 12:15:33PM +0100, Peter Hessler wrote:
> If you use ietf-cli to mirror RFCs for convienence, you may see this error:
> 
> Making the RFC status index 
> Could not dump status info to
> '/var/db/ietf-mirrors/in-notes/ietf-rfc-status.json'. Exiting. 
Yes.

> There is a Pull Request to fix it, but it seems upstream hasn't yet
> reacted to it.  the pull request works for me, and makes sense.
Thanks for that, OK kn.

  
> Index: misc/ietf-cli/patches/patch-ietf
> ===
> RCS file: /home/cvs/openbsd/ports/misc/ietf-cli/patches/patch-ietf,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-ietf
> --- misc/ietf-cli/patches/patch-ietf  14 Mar 2020 15:59:46 -  1.2
> +++ misc/ietf-cli/patches/patch-ietf  5 Feb 2021 10:36:45 -
> @@ -2,6 +2,8 @@ $OpenBSD: patch-ietf,v 1.2 2020/03/14 15
>  
>  Adjust ConfigPlaces.
>  
> +Remove binary flag when opening a text file to write to it (GitHub PR 4)
> +
Can you link https://github.com/paulehoffman/ietf-cli/pull/4 here?
HOMEPAGE points to the old SVN repo which has a text file which points
to the GitHub repo... a link makes it easier for porters to check on the
next update.

Re: [update, fix] games/xmj 1.0 -> 1.16 (-fno-common)

[Charlene Wendling]

On Sat, 30 Jan 2021 20:40:58 +0100
Charlene Wendling  wrote:

> Hi,
> 
> On top of failing with `-fno-common', xmj does not work at all, here
> on my amd64 machine:
> 
> $ doas pkg_add xmj
> $ xmj
> Segmentation Fault
> 
> So, here is an update for the 20 years old xmj 1.0, to 2020's 1.16.
> There are major upstream changes, notably they dropped Imake (yay!),
> and xmj is now gtk+2 based. This fixes the -fno-common failure ootb.
> 
> Port changes:
> 
> - Update license marker, refresh WANTLIB (ports-lib-depends-check is
> happy)
> - Use up to date HOMEPAGE and MASTER_SITES (found out thanks to
> Macports and repology)
> - Requires gmake.
> - Install the manpages
> 
> 
> Testing:
> 
> - It builds fine on macppc (vanilla clang) and amd64 (modified with
>   naddy's patch)
> - The runtime is great on these 2 platforms. I tried networked games
>   without issues.
> 
> Comments/feedback are welcome,
> 
> Charlène.

^ edited; i was looking at my backlog and took into account what sthen
told me about MAKE_FLAGS, making the diff way smaller :)

I accidentally built xmj with gcc and met the infamous "C99 styled
declarations in for loops" error, so it will require gnu99 on base-gcc
archs. This still builds and works fine with clang on macppc and amd64,
with that flag, so i have not brought bsd.port.arch.mk.

Index: Makefile
===
RCS file: /cvs/ports/games/xmj/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile12 Jul 2019 20:46:27 -  1.25
+++ Makefile5 Feb 2021 01:50:14 -
@@ -2,22 +2,37 @@
 
 COMMENT=   Mahjongg game for X11
 
-DISTNAME=   xmj
-PKGNAME=   xmj-1.0
-REVISION = 3
+DISTNAME=  mj-1.16-src
+PKGNAME=   x${DISTNAME:S/-src$//}
+
 CATEGORIES=games
 
-# BSD
+HOMEPAGE=  https://mahjong.julianbradfield.org/
+
+# GPLv2
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   X11 Xau Xdmcp Xext c xcb
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 z
+
+MASTER_SITES=  ${HOMEPAGE}/Source/
+
+LIB_DEPENDS=   x11/gtk+2
+
+MAKE_FLAGS+=   CC="${CC}" EXTRA_CFLAGS="${CFLAGS}" CDEBUGFLAGS=
+# The final '/' matters
+FAKE_FLAGS+=   DESTDIR="${WRKINST}${PREFIX}/"
+
+USE_GMAKE= Yes
 
-CONFIGURE_STYLE=imake noman
 NO_TEST=   Yes
 
-pre-configure:
-   @perl -pi -e 's,_height=,_height ,g;' \
-   -e 's,_width=,_width ,g' $i \
-   ${WRKSRC}/tiles/c*
+# base-gcc fix for "c99 initial declarations in for loops" error
+CFLAGS+=   -std=gnu99
+
+INSTALL_TARGET=install install.man
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/games/xmj/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:14:04 -  1.4
+++ distinfo5 Feb 2021 01:50:14 -
@@ -1,2 +1,2 @@
-SHA256 (xmj.tar.gz) = EGcUMVIKBYSp3BJHqnYPM988WHP7G7IVgN//NK7xhyg=
-SIZE (xmj.tar.gz) = 52255
+SHA256 (mj-1.16-src.tar.gz) = wl6YSPSfcGNeXjugy1l5nlvBSalfeGYhuZaWtmeHop0=
+SIZE (mj-1.16-src.tar.gz) = 403981
Index: patches/patch-Imakefile
===
RCS file: patches/patch-Imakefile
diff -N patches/patch-Imakefile
--- patches/patch-Imakefile 27 Oct 2007 13:32:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-Imakefile,v 1.1 2007/10/27 13:32:05 ajacoutot Exp $
 Imakefile.orig Fri May  5 16:46:04 1989
-+++ Imakefile  Sat Oct 27 15:15:14 2007
-@@ -4,4 +4,4 @@ LOCAL_LIBRARIES = $(XLIB)
-OBJS = bicons.o cicons.o cicons1.o cicons2.o cicons3.o cicons4.o \
- cicons5.o event.o icons.o mj.o nicons.o
- 
--ComplexProgramTarget(xmj)
-+ComplexProgramTargetNoMan(xmj)
Index: patches/patch-event_c
===
RCS file: patches/patch-event_c
diff -N patches/patch-event_c
--- patches/patch-event_c   19 Apr 2017 22:02:45 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-event_c,v 1.1 2017/04/19 22:02:45 espie Exp $
 event.c.orig   Thu Apr 20 00:00:59 2017
-+++ event.cThu Apr 20 00:01:22 2017
-@@ -599,6 +599,7 @@ void board_num_proc()
- place_tiles(FALSE);
- }
- 
-+void
- msg_event_proc(event)
- XEvent *event;
- {
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/xmj/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST   7 Apr 2002 01:54:49 -   1.2
+++ pkg/PLIST   5 Feb 2021 01:50:14 -
@@ -1,2 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.2 2002/04/07 01:54:49 naddy Exp $
-bin/xmj
+@bin bin/mj-player
+@bin bin/mj-server
+@bin b

Re: [UPDATE] misc/astrolog 5.40 -> 7.10

[Stuart Henderson]

On 2021/01/16 13:58, Evandro Rathke wrote:
> Hi @ports,
> 
> I updated the misc/astrolog port to the latest version.
> Since the last update has been a while, I reorganized the port with
> subpackages and flavors.
> 
> Best regards,
> Evandro Rathke
> 
> *Mobile/WhatsApp*: +55 51 9 9921-5584
> *Skype*: erathke

I've committed an update based on this. I dropped the no_x11 parts for
now, they would need to be FLAVOR not PSEUDO_FLAVOR but I'm not convinced
it's worth the extra complication in the port, do you have a use case
for that? Also included the ephemeris in the main package because there
doesn't seem a benefit to subpackaging.

wpa-supplicant security 2020-2

[Tobias Heider]

Hi,

the diff below adds a security patch released by wpa_supplicant yesterday.
For more infos, see https://w1.fi/security/2020-2/

ok?

diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile
index 1ae7b15dc8e..4bf372e1e06 100644
--- a/security/wpa_supplicant/Makefile
+++ b/security/wpa_supplicant/Makefile
@@ -3,6 +3,7 @@
 COMMENT=   IEEE 802.1X supplicant
 
 DISTNAME=  wpa_supplicant-2.9
+REVISION=  0
 CATEGORIES=security net
 
 HOMEPAGE=  https://w1.fi/wpa_supplicant/
diff --git a/security/wpa_supplicant/patches/patch-src_p2p_p2p_c 
b/security/wpa_supplicant/patches/patch-src_p2p_p2p_c
new file mode 100644
index 000..5f105084f94
--- /dev/null
+++ b/security/wpa_supplicant/patches/patch-src_p2p_p2p_c
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/p2p/p2p.c
+--- src/p2p/p2p.c.orig
 src/p2p/p2p.c
+@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *de
+   dev->info.config_methods = cli->config_methods;
+   os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
+   dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
++  if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN)
++  dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN;
+   os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
+ dev->info.wps_sec_dev_type_list_len);
+ }

Re: wpa-supplicant security 2020-2

[Stuart Henderson]

On 2021/02/05 15:14, Tobias Heider wrote:
> Hi,
> 
> the diff below adds a security patch released by wpa_supplicant yesterday.
> For more infos, see https://w1.fi/security/2020-2/
> 
> ok?

I'm OK with adding to the port, but it's a noop for us, we don't build
with CONFIG_P2P.

> diff --git a/security/wpa_supplicant/Makefile 
> b/security/wpa_supplicant/Makefile
> index 1ae7b15dc8e..4bf372e1e06 100644
> --- a/security/wpa_supplicant/Makefile
> +++ b/security/wpa_supplicant/Makefile
> @@ -3,6 +3,7 @@
>  COMMENT= IEEE 802.1X supplicant
>  
>  DISTNAME=wpa_supplicant-2.9
> +REVISION=0
>  CATEGORIES=  security net
>  
>  HOMEPAGE=https://w1.fi/wpa_supplicant/
> diff --git a/security/wpa_supplicant/patches/patch-src_p2p_p2p_c 
> b/security/wpa_supplicant/patches/patch-src_p2p_p2p_c
> new file mode 100644
> index 000..5f105084f94
> --- /dev/null
> +++ b/security/wpa_supplicant/patches/patch-src_p2p_p2p_c
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/p2p/p2p.c
> +--- src/p2p/p2p.c.orig
>  src/p2p/p2p.c
> +@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *de
> + dev->info.config_methods = cli->config_methods;
> + os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
> + dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
> ++if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN)
> ++dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN;
> + os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
> +   dev->info.wps_sec_dev_type_list_len);
> + }

-fno-common fix for japanese/Wnn

[Marc Espie]

Seems to build alright.

okay ?

Index: patches/patch-Wnn_jserver_de_c
===
RCS file: /cvs/ports/japanese/Wnn/patches/patch-Wnn_jserver_de_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Wnn_jserver_de_c
--- patches/patch-Wnn_jserver_de_c  29 Apr 2017 14:31:40 -  1.3
+++ patches/patch-Wnn_jserver_de_c  5 Feb 2021 15:57:04 -
@@ -1,4 +1,5 @@
 $OpenBSD: patch-Wnn_jserver_de_c,v 1.3 2017/04/29 14:31:40 espie Exp $
+Index: Wnn/jserver/de.c
 --- Wnn/jserver/de.c.orig
 +++ Wnn/jserver/de.c
 @@ -53,6 +53,8 @@
@@ -36,6 +37,15 @@ $OpenBSD: patch-Wnn_jserver_de_c,v 1.3 2
 +#undef NOFILE
  #define NOFILE getdtablesize() 
  #endif
+ 
+@@ -153,7 +162,7 @@ static charrcv_buf[S_BUF_SIZ]; /** 
¼õ¿®¥Ð¥Ã¥Õ¥¡ **/
+ #endif /* defined(EAGAIN) */
+ 
+ /*Client Table*/
+-int   clientp;/** cblk¤ÎÍ­¸ú¤Ê¥Ç¡¼¥¿¤ÎºÇ¸å¤òº¹¤·¤Æ¤¤¤ë **/
++extern intclientp;/** cblk¤ÎÍ­¸ú¤Ê¥Ç¡¼¥¿¤ÎºÇ¸å¤òº¹¤·¤Æ¤¤¤ë **/
+ 
+ int   cur_clp;/** ¸½ºß¤Î¥¯¥é¥¤¥¢¥ó¥È¤ÎÈÖ¹æ **/
  
 @@ -187,7 +196,7 @@ int get2_cur();
  char cmd_name[80];
Index: patches/patch-Xwnmo_xjutil_init_w_c
===
RCS file: /cvs/ports/japanese/Wnn/patches/patch-Xwnmo_xjutil_init_w_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Xwnmo_xjutil_init_w_c
--- patches/patch-Xwnmo_xjutil_init_w_c 29 Apr 2017 14:31:40 -  1.2
+++ patches/patch-Xwnmo_xjutil_init_w_c 5 Feb 2021 15:57:04 -
@@ -1,4 +1,5 @@
 $OpenBSD: patch-Xwnmo_xjutil_init_w_c,v 1.2 2017/04/29 14:31:40 espie Exp $
+Index: Xwnmo/xjutil/init_w.c
 --- Xwnmo/xjutil/init_w.c.orig
 +++ Xwnmo/xjutil/init_w.c
 @@ -35,6 +35,7 @@
@@ -9,7 +10,30 @@ $OpenBSD: patch-Xwnmo_xjutil_init_w_c,v 
  #include "commonhd.h"
  #include "sdefine.h"
  #include "xjutil.h"
-@@ -76,7 +77,6 @@ env_state()
+@@ -49,7 +50,7 @@
+ LeaveWindowMask | ExposureMask)
+ 
+ Display   *dpy = 0;
+-Xjutil*xjutil;
++extern Xjutil *xjutil;
+ 
+ char  xjutil_name[32] = {0};
+ char  xjutil_name_ok[32] = {0};
+@@ -64,9 +65,10 @@ XSetWindowAttributes attributes;
+ Atom  wm_id = 0;
+ Atom  wm_id1 = 0;
+ 
+-Atom actual_type;
+-int actual_format;
+-unsigned long nitems, byte_after, leftover;
++extern Atom actual_type;
++extern int actual_format;
++extern unsigned long nitems, leftover;
++unsigned long byte_after;
+ 
+ wchar_t dol_wchar_t;
+ 
+@@ -76,7 +78,6 @@ env_state()
  char *p;
  char ret = '\0';
  #ifndef SYSVR2
Index: patches/patch-Xwnmo_xwnmo_change_c
===
RCS file: patches/patch-Xwnmo_xwnmo_change_c
diff -N patches/patch-Xwnmo_xwnmo_change_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Xwnmo_xwnmo_change_c  5 Feb 2021 15:57:04 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Xwnmo/xwnmo/change.c
+--- Xwnmo/xwnmo/change.c.orig
 Xwnmo/xwnmo/change.c
+@@ -42,7 +42,7 @@
+ #include "proto.h"
+ #include "ext.h"
+ 
+-XGCValues xgcv;
++extern XGCValues xgcv;
+ 
+ void
+ reset_preedit(xc)
Index: patches/patch-Xwnmo_xwnmo_multi_lang_c
===
RCS file: /cvs/ports/japanese/Wnn/patches/patch-Xwnmo_xwnmo_multi_lang_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Xwnmo_xwnmo_multi_lang_c
--- patches/patch-Xwnmo_xwnmo_multi_lang_c  29 Apr 2017 14:31:40 -  
1.1
+++ patches/patch-Xwnmo_xwnmo_multi_lang_c  5 Feb 2021 15:57:04 -
@@ -1,6 +1,18 @@
 $OpenBSD: patch-Xwnmo_xwnmo_multi_lang_c,v 1.1 2017/04/29 14:31:40 espie Exp $
+Index: Xwnmo/xwnmo/multi_lang.c
 --- Xwnmo/xwnmo/multi_lang.c.orig
 +++ Xwnmo/xwnmo/multi_lang.c
+@@ -46,8 +46,8 @@
+ #include "ext.h"
+ 
+ 
+-XSetWindowAttributes  attributes;
+-XGCValues xgcv;
++extern XSetWindowAttributes   attributes;
++extern XGCValues  xgcv;
+ 
+ char *
+ get_default_font_name(lang)
 @@ -367,7 +367,7 @@ char *c_data;
  short *detail;
  {

Re: Fix games/jumpnbump -fno-common

[Charlene Wendling]

Hi,

On Sat, 30 Jan 2021 00:02:22 +
Brian Callahan  wrote:

> Hello ports --
> 
> Attached is a fix for games/jumpnbump for -fno-common.
> Taken from upstream (no new release since this commit):
> https://gitlab.com/LibreGames/jumpnbump/-/commit/b72b70a4233776bdaa6a683c89af2becefd53bd6.diff
> 
> Left off the Makefile portion, since it is a no-op for us.
> 
> OK?

OK cwen@

> ~Brian

UPDATE: Duf-0.6.0

[Gonzalo L. Rodriguez]

Hello,

Update for Duf 0.6.0:

https://github.com/muesli/duf/releases/tag/v0.6.0

OK? Comments?

Cheers.-

-- 

 %gonzalo
Index: Makefile
===
RCS file: /cvs/ports/sysutils/duf/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile2 Dec 2020 08:23:04 -   1.2
+++ Makefile5 Feb 2021 17:33:28 -
@@ -3,10 +3,10 @@
 COMMENT =  disk Usage/free utility
 
 MODGO_MODNAME =github.com/muesli/duf
-MODGO_VERSION =v0.5.0
+MODGO_VERSION =v0.6.0
 
 DISTNAME = duf-${MODGO_VERSION}
-PKGNAME =  duf-0.5.0
+PKGNAME =  duf-0.6.0
 
 CATEGORIES =   sysutils
 
@@ -22,10 +22,11 @@ MODGO_MODULES = \
github.com/jedib0t/go-pretty/v6  v6.0.5 \
github.com/lucasb-eyer/go-colorful   v1.0.3 \
github.com/mattn/go-isatty   v0.0.12 \
-   github.com/mattn/go-runewidthv0.0.9 \
+   github.com/mattn/go-runewidthv0.0.10 \
github.com/muesli/termenvv0.7.4 \
github.com/pkg/profile   v1.2.1 \
github.com/pmezard/go-difflibv1.0.0 \
+   github.com/rivo/uniseg   v0.1.0 \
github.com/stretchr/testify  v1.2.2 \
golang.org/x/crypto  
v0.0.0-20200820211705-5c72a883971a \
golang.org/x/net 
v0.0.0-20190404232315-eb5bcb51f2a3 \
@@ -33,10 +34,11 @@ MODGO_MODULES = \
golang.org/x/textv0.3.0
 
 MODGO_MODFILES =   \
-   golang.org/x/crypto  v0.0.0-20190308221718-c2843e01d9a2 \
-   golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c \
-   golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a \
-   golang.org/x/sys v0.0.0-20190412213103-97732733099d \
-   golang.org/x/sys v0.0.0-20200116001909-b77594299b42
+   github.com/mattn/go-runewidthv0.0.9 \
+   golang.org/x/crypto  v0.0.0-20190308221718-c2843e01d9a2 \
+   golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c \
+   golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a \
+   golang.org/x/sys v0.0.0-20190412213103-97732733099d \
+   golang.org/x/sys v0.0.0-20200116001909-b77594299b42
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/duf/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo2 Dec 2020 08:23:04 -   1.2
+++ distinfo5 Feb 2021 17:33:28 -
@@ -1,4 +1,4 @@
-SHA256 (duf-v0.5.0.zip) = KoYG+wM0nFdOAlTNSk6m0OpHw6wgBnQj8U/N/v5xLCU=
+SHA256 (duf-v0.6.0.zip) = uo+q61d8wUMJ/Vr419BZTq/dSnpGOJoCUppL8e19AJM=
 SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.mod) = 
vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw=
 SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) = 
a0SoQ5UfNxtwEMdU7MPKvv6BXVztHFuUCfstaX6KiQ0=
 SHA256 (go_modules/github.com/jedib0t/go-pretty/v6/@v/v6.0.5.mod) = 
h91BexKLyKmi+zORQ7cJ4XlqPpme33h565513f1P9qI=
@@ -7,14 +7,17 @@ SHA256 (go_modules/github.com/lucasb-eye
 SHA256 (go_modules/github.com/lucasb-eyer/go-colorful/@v/v1.0.3.zip) = 
qobu50Rk+L3FrZp9TqRz5yxl5qPdVpLBBzbQY14+AF8=
 SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.12.mod) = 
GgYuVsAmbQBL6lERWs+MK1l9FAfKVa1WzOAel62j2ks=
 SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.12.zip) = 
B5QdJOCJTCncQrzSnWRIFc17XuhOPBS75tUa0T78vwc=
+SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.10.mod) = 
QTaqoj/LMXaikoIvKoqYzMey/eOKWZIsFSsAb1nVlpU=
+SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.10.zip) = 
Aw3PPqbLObNCafEZ7l/l6dWDTa9Anh8/SMBlpFMm9KY=
 SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.9.mod) = 
h9IheU+rSqxoFLv0KqEKpLdpPIMpT9GCb1gSJCh4Vwk=
-SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.9.zip) = 
DEDRkSVEgwAxiCv1dr1Bo7H/TFwl42Gz6kRAtEu6xfk=
 SHA256 (go_modules/github.com/muesli/termenv/@v/v0.7.4.mod) = 
k5LtH+QufVKNat8nkI6IVSArU8IdC6e/phuvXUb+t4k=
 SHA256 (go_modules/github.com/muesli/termenv/@v/v0.7.4.zip) = 
J8D6fADAFxGt5/9XT4OUbCFpfNz00lh32hPAinJKsD4=
 SHA256 (go_modules/github.com/pkg/profile/@v/v1.2.1.mod) = 
WbNk4Z1GA9v7C9owGpc5j9OxEE1nbWeHaucEwQtiyuQ=
 SHA256 (go_modules/github.com/pkg/profile/@v/v1.2.1.zip) = 
BYT+rR6CAjDAuJEMPOQ2aKGHXILjmPqgRQyecsLSnAo=
 SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.mod) = 
dLLnZushU3eGTVh7rfV+lVIfaS0qeGCzx3WQk/nJvsI=
 SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.zip) = 
3gTOzBpLjVPkNXBRAmeUvLxU8uaiYM+sUIzmnV1kV6A=
+SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.1.0.mod) = 
bHMYonqNVHOo62YedfsAUoF24O/FkxDtJ3yhO9EqU/E=
+SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.1.0.zip) = 
y3Ad+B82rPuyYnp4Zi/cqhUO4awA0Hlqfz6vvbYhgSg=
 SHA256 (go_modules/github.com/stretchr/testify/@v/v1.2.2.mod) = 
SrRj9ow3AEH5UMEMq1EEkD

Re: Replace libfuse from base with libfuse from ports

[Grégoire Jadi]

Helg  writes:

Hi,

> I currently only have a port of the 2.x branch of libfuse (attached) but
> will also port the 3.x libfuse once I have user mounting working. I am
> not aware of any ports other than the latest version of sshfs that
> depends on 3.x. In any case, we will need to support libfuse 2.x for
> some time until all file systems are updated upstream to work with 3.x.   
>

I can't comment for the rest of your work, but borgbackup seems to
prefer libfuse 3.x

https://github.com/borgbackup/borg/blob/master/setup.py#L77
> # note for package maintainers: if you package borgbackup for distribution,
> # please (if available) add pyfuse3 (preferably) or llfuse (not maintained 
> any more)
> # as a *requirement*. "borg mount" needs one of them to work.
> # if neither is available, do not require it, most of borgbackup will
> work.

https://pypi.org/project/pyfuse3/
> pyfuse3 is a set of Python 3 bindings for libfuse 3. It provides an
> asynchronous API compatible with Trio and asyncio, and enables you to
> easily write a full-featured Linux filesystem in Python.

Thanks for your work.
Best,

-- 
gjadi
PGP : AF26 E9C2 A1C8 8D32 A868  4386 1373 5477 2B65 1894

UPDATE: Nextcloud-20.0.7

[Gonzalo L. Rodriguez]

Hello,

Update for Nextcloud to 20.0.7:

https://nextcloud.com/changelog/

OK? comments?

Cheers.-
-- 

 %gonzalo
Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile5 Feb 2021 15:30:41 -   1.63
+++ Makefile5 Feb 2021 18:13:56 -
@@ -2,7 +2,7 @@
 
 COMMENT=   easy and universal access to shared and/or personal 
files
 
-V= 20.0.6
+V= 20.0.7
 DISTNAME=  nextcloud-${V}
 EXTRACT_SUFX=  .tar.bz2
 
Index: distinfo
===
RCS file: /cvs/ports/www/nextcloud/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- distinfo5 Feb 2021 15:30:41 -   1.47
+++ distinfo5 Feb 2021 18:13:56 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloud-20.0.6.tar.bz2) = 
hZFnFwQCuHa27xo3+kqqVhe2v4R7tdUKlPY2uuZaNLk=
-SIZE (nextcloud-20.0.6.tar.bz2) = 105381388
+SHA256 (nextcloud-20.0.7.tar.bz2) = 
jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys=
+SIZE (nextcloud-20.0.7.tar.bz2) = 105883310
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
retrieving revision 1.50
diff -u -p -r1.50 PLIST
--- pkg/PLIST   5 Feb 2021 15:30:41 -   1.50
+++ pkg/PLIST   5 Feb 2021 18:13:57 -
@@ -6491,6 +6491,8 @@ nextcloud/apps/accessibility/l10n/nl.js
 nextcloud/apps/accessibility/l10n/nl.json
 nextcloud/apps/accessibility/l10n/nn_NO.js
 nextcloud/apps/accessibility/l10n/nn_NO.json
+nextcloud/apps/accessibility/l10n/oc.js
+nextcloud/apps/accessibility/l10n/oc.json
 nextcloud/apps/accessibility/l10n/pl.js
 nextcloud/apps/accessibility/l10n/pl.json
 nextcloud/apps/accessibility/l10n/pt_BR.js
@@ -6939,6 +6941,8 @@ nextcloud/apps/admin_audit/l10n/uk.js
 nextcloud/apps/admin_audit/l10n/uk.json
 nextcloud/apps/admin_audit/l10n/zh_CN.js
 nextcloud/apps/admin_audit/l10n/zh_CN.json
+nextcloud/apps/admin_audit/l10n/zh_HK.js
+nextcloud/apps/admin_audit/l10n/zh_HK.json
 nextcloud/apps/admin_audit/l10n/zh_TW.js
 nextcloud/apps/admin_audit/l10n/zh_TW.json
 nextcloud/apps/admin_audit/lib/
@@ -7026,6 +7030,8 @@ nextcloud/apps/cloud_federation_api/l10n
 nextcloud/apps/cloud_federation_api/l10n/tr.json
 nextcloud/apps/cloud_federation_api/l10n/zh_CN.js
 nextcloud/apps/cloud_federation_api/l10n/zh_CN.json
+nextcloud/apps/cloud_federation_api/l10n/zh_HK.js
+nextcloud/apps/cloud_federation_api/l10n/zh_HK.json
 nextcloud/apps/cloud_federation_api/l10n/zh_TW.js
 nextcloud/apps/cloud_federation_api/l10n/zh_TW.json
 nextcloud/apps/cloud_federation_api/lib/
@@ -7355,6 +7361,8 @@ nextcloud/apps/contactsinteraction/l10n/
 nextcloud/apps/contactsinteraction/l10n/tr.json
 nextcloud/apps/contactsinteraction/l10n/zh_CN.js
 nextcloud/apps/contactsinteraction/l10n/zh_CN.json
+nextcloud/apps/contactsinteraction/l10n/zh_HK.js
+nextcloud/apps/contactsinteraction/l10n/zh_HK.json
 nextcloud/apps/contactsinteraction/l10n/zh_TW.js
 nextcloud/apps/contactsinteraction/l10n/zh_TW.json
 nextcloud/apps/contactsinteraction/lib/
@@ -7449,12 +7457,16 @@ nextcloud/apps/dashboard/l10n/hu.js
 nextcloud/apps/dashboard/l10n/hu.json
 nextcloud/apps/dashboard/l10n/it.js
 nextcloud/apps/dashboard/l10n/it.json
+nextcloud/apps/dashboard/l10n/ja.js
+nextcloud/apps/dashboard/l10n/ja.json
 nextcloud/apps/dashboard/l10n/lt_LT.js
 nextcloud/apps/dashboard/l10n/lt_LT.json
 nextcloud/apps/dashboard/l10n/mk.js
 nextcloud/apps/dashboard/l10n/mk.json
 nextcloud/apps/dashboard/l10n/nl.js
 nextcloud/apps/dashboard/l10n/nl.json
+nextcloud/apps/dashboard/l10n/oc.js
+nextcloud/apps/dashboard/l10n/oc.json
 nextcloud/apps/dashboard/l10n/pl.js
 nextcloud/apps/dashboard/l10n/pl.json
 nextcloud/apps/dashboard/l10n/pt_BR.js
@@ -7473,6 +7485,8 @@ nextcloud/apps/dashboard/l10n/tr.js
 nextcloud/apps/dashboard/l10n/tr.json
 nextcloud/apps/dashboard/l10n/zh_CN.js
 nextcloud/apps/dashboard/l10n/zh_CN.json
+nextcloud/apps/dashboard/l10n/zh_HK.js
+nextcloud/apps/dashboard/l10n/zh_HK.json
 nextcloud/apps/dashboard/l10n/zh_TW.js
 nextcloud/apps/dashboard/l10n/zh_TW.json
 nextcloud/apps/dashboard/lib/
@@ -7643,6 +7657,8 @@ nextcloud/apps/dav/l10n/uk.js
 nextcloud/apps/dav/l10n/uk.json
 nextcloud/apps/dav/l10n/zh_CN.js
 nextcloud/apps/dav/l10n/zh_CN.json
+nextcloud/apps/dav/l10n/zh_HK.js
+nextcloud/apps/dav/l10n/zh_HK.json
 nextcloud/apps/dav/l10n/zh_TW.js
 nextcloud/apps/dav/l10n/zh_TW.json
 nextcloud/apps/dav/lib/
@@ -8370,6 +8386,8 @@ nextcloud/apps/federatedfilesharing/l10n
 nextcloud/apps/federatedfilesharing/l10n/uk.json
 nextcloud/apps/federatedfilesharing/l10n/zh_CN.js
 nextcloud/apps/federatedfilesharing/l10n/zh_CN.json
+nextcloud/apps/federatedfilesharing/l10n/zh_HK.js
+nextcloud/apps/federatedfilesharing/l10n/zh_HK.json
 nextcloud/apps/federatedfilesharing/l10n/zh_TW.js
 nextcloud/apps/federatedfilesharing/l10n/zh_TW.json
 nextcl

Re: [UPDATE] sysutils/docker-cli 20.10.1 -> 20.10.3

[Luca De Pandis]

Hi,
could someone commit it, please?

Thanks,
Luca De Pandis


On Thu, Feb 04, 2021 at 10:06:00AM +0100, Muhammad Kaisar Arkhan wrote:
> 
> Luca De Pandis writes:
> 
> > Hi,
> > below the patch to upgrade the sysutils/docker-cli port to 20.10.3.
> > 
> > Passed:
> > - port-lib-depends-check
> > - portcheck
> > 
> > OK? Feedback?
> > 
> > 
> > Best regards,
> > Luca De Pandis
> 
> Tested on my local OpenBSD machine by running a container on a separate
> Linux box and deploying a docker stack, it works fine.
> 
> Happy to see that someone is helping to have this port always
> up-to-date. :)
> 
> OK.
> 
> --
> Muhammad Kaisar Arkhan
> h...@yukiisbo.red - kai...@arkhan.io
> https://yukiisbo.red - https://arkhan.io
> 

Re: [update] games/an 0.95 -> 1.2

[Charlene Wendling]

Ping; with a new diff though, to avoid patches.

On Fri, 25 Dec 2020 03:21:08 +0100
Charlene Wendling  wrote:

> Ping :) 
> 
> On Sat, 10 Oct 2020 14:14:20 +0200
> Charlene Wendling wrote:
> 
> > Hi,
> > 
> > Here is an update for an to 1.2. This is a rewrite with several
> > bugfixes, icu support and less bloat (the library has been
> > removed).
> > 
> > I don't have much to say port-wise, changes are trivial - i took the
> > opportunity to reorder the Makefile per Makefile.template since it
> > doesn't affect much the diff readability. Also, i've zapped some of
> > our hooks since upstream's Makefile has now friendlier targets.
> > 
> > This has been tested on amd64, macppc (with clang and gcc there)
> > successfully.
> > 
> > Comments/feedback are welcome,
> > 
> > Charlène.
> > 

Index: Makefile
===
RCS file: /cvs/ports/games/an/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:46:14 -  1.20
+++ Makefile5 Feb 2021 19:21:06 -
@@ -2,31 +2,36 @@
 
 COMMENT=   fast anagram generator
 
-V= 0.95
+V= 1.2
 DISTNAME=  an_${V}.orig
 PKGNAME=   an-${V}
 CATEGORIES=games
-MASTER_SITES=  ${MASTER_SITE_DEBIAN:=main/a/an/}
 
-# GPL - LGPL
+# GPLv2+
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   c
+HOMEPAGE=  https://salsa.debian.org/pm/an
 
-WRKDIST=   ${WRKDIR}/an-${V}
+WANTLIB=   c icudata icui18n icuuc
+
+MASTER_SITES=  ${MASTER_SITE_DEBIAN:=main/a/an/}
+
+LIB_DEPENDS=   textproc/icu4c,-main
+
+MAKE_FLAGS+=   CC="${CC}" CFLAGS="${CFLAGS}"
+# Overriding DESTDIR is not enough, their Makefile subdirectories
+# don't respect our files hierarchy
+FAKE_FLAGS+=   MANDIR="${FROOT}/man/man6" INSTALLDIR="${FROOT}/bin"
 
 NO_TEST=   Yes
 
+USE_GMAKE= Yes
+
+WRKDIST=   ${WRKDIR}/an-${V}
+FROOT= ${WRKINST}${PREFIX}
+
 pre-configure:
@perl -pi -e 's,/usr/dict/words,/usr/share/dict/words,g' \
${WRKSRC}/an.6
-
-do-build:
-   cd ${WRKBUILD} && \
-   ${CC} ${CFLAGS} an.c gan_qsort.c -o an ${LDFLAGS}
-
-do-install:
-   ${INSTALL_PROGRAM} ${WRKBUILD}/an ${PREFIX}/bin
-   ${INSTALL_MAN} ${WRKBUILD}/an.6 ${PREFIX}/man/man6
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/games/an/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:13:55 -  1.5
+++ distinfo5 Feb 2021 19:21:06 -
@@ -1,2 +1,2 @@
-SHA256 (an_0.95.orig.tar.gz) = ESZt0eNHWU2Y+N/R4UHYtPvgZ3UlQtDpPEIsR4n5KVw=
-SIZE (an_0.95.orig.tar.gz) = 47829
+SHA256 (an_1.2.orig.tar.gz) = uBqNt0zf3znmyn3XUs9HIkNdL7f7OhuXHU9PrlFC2ys=
+SIZE (an_1.2.orig.tar.gz) = 14231
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/an/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   15 Sep 2004 00:46:08 -  1.3
+++ pkg/PLIST   5 Feb 2021 19:21:06 -
@@ -1,3 +1,3 @@
 @comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:08 espie Exp $
-bin/an
+@bin bin/an
 @man man/man6/an.6

Re: [UPDATE] sysutils/kubectl 1.19.2 -> 1.20.2

[Luca De Pandis]

Hi,
could someone commit it, please?


Thank you,
Luca De Pandis


On Thu, Feb 04, 2021 at 10:42:36AM +0100, Muhammad Kaisar Arkhan wrote:
> 
> Luca De Pandis writes:
> 
> > up
> > 
> > Feedback? Ok?
> > 
> > Best regards,
> > Luca De Pandis
> > 
> > 
> > On Mon, Jan 18, 2021 at 11:42:05AM +0100, Luca De Pandis wrote:
> > > Hi,
> > > here's the kubectl port upgraded from 1.19.2 to 1.20.2.
> > > 
> > > Best regards,
> > > Luca De Pandis
> 
> Hi,
> 
> I tested this on my OpenBSD along with a Kubernetes Cluster from Google
> Cloud.
> 
> It works fine.
> 
> OK.
> 
> --
> Muhammad Kaisar Arkhan
> h...@yukiisbo.red - kai...@arkhan.io
> https://yukiisbo.red - https://arkhan.io
> 

Re: [UPDATE] sysutils/kubectl 1.19.2 -> 1.20.2

[Paco Esteban]

On Fri, 05 Feb 2021, Luca De Pandis wrote:

> Hi,
> could someone commit it, please?

Commited.  Thanks.
I sent you an email earlier but I guess outlook ignored it completely ...

> 
> 
> Thank you,
> Luca De Pandis
> 
> 
> On Thu, Feb 04, 2021 at 10:42:36AM +0100, Muhammad Kaisar Arkhan wrote:
> > 
> > Luca De Pandis writes:
> > 
> > > up
> > > 
> > > Feedback? Ok?
> > > 
> > > Best regards,
> > > Luca De Pandis
> > > 
> > > 
> > > On Mon, Jan 18, 2021 at 11:42:05AM +0100, Luca De Pandis wrote:
> > > > Hi,
> > > > here's the kubectl port upgraded from 1.19.2 to 1.20.2.
> > > > 
> > > > Best regards,
> > > > Luca De Pandis
> > 
> > Hi,
> > 
> > I tested this on my OpenBSD along with a Kubernetes Cluster from Google
> > Cloud.
> > 
> > It works fine.
> > 
> > OK.
> > 
> > --
> > Muhammad Kaisar Arkhan
> > h...@yukiisbo.red - kai...@arkhan.io
> > https://yukiisbo.red - https://arkhan.io
> > 
> 

-- 
Paco Esteban.
0x5818130B8A6DBC03

Re: [UPDATE] sysutils/docker-cli 20.10.1 -> 20.10.3

[Paco Esteban]

On Fri, 05 Feb 2021, Luca De Pandis wrote:

> Hi,
> could someone commit it, please?

commited.  Thanks.

> 
> Thanks,
> Luca De Pandis
> 
> 
> On Thu, Feb 04, 2021 at 10:06:00AM +0100, Muhammad Kaisar Arkhan wrote:
> > 
> > Luca De Pandis writes:
> > 
> > > Hi,
> > > below the patch to upgrade the sysutils/docker-cli port to 20.10.3.
> > > 
> > > Passed:
> > > - port-lib-depends-check
> > > - portcheck
> > > 
> > > OK? Feedback?
> > > 
> > > 
> > > Best regards,
> > > Luca De Pandis
> > 
> > Tested on my local OpenBSD machine by running a container on a separate
> > Linux box and deploying a docker stack, it works fine.
> > 
> > Happy to see that someone is helping to have this port always
> > up-to-date. :)
> > 
> > OK.
> > 
> > --
> > Muhammad Kaisar Arkhan
> > h...@yukiisbo.red - kai...@arkhan.io
> > https://yukiisbo.red - https://arkhan.io
> > 
> 

-- 
Paco Esteban.
0x5818130B8A6DBC03

Re: [UPDATE] sysutils/kubectl 1.19.2 -> 1.20.2

[Luca De Pandis]

Hi Paco,
I'm sorry but your previous email was in Junk folder and I didn't notice it. :(

Also, I don't know why but I can't find it in this thread via marc_info web 
portal.
I can only find this one.

Thank you very much for committing it!


Best regards,
Luca De Pandis


On Fri, Feb 05, 2021 at 08:57:06PM +0100, Paco Esteban wrote:
> On Fri, 05 Feb 2021, Luca De Pandis wrote:
> 
> > Hi,
> > could someone commit it, please?
> 
> Commited.  Thanks.
> I sent you an email earlier but I guess outlook ignored it completely ...
> 
> > 
> > 
> > Thank you,
> > Luca De Pandis
> > 
> > 
> > On Thu, Feb 04, 2021 at 10:42:36AM +0100, Muhammad Kaisar Arkhan wrote:
> > > 
> > > Luca De Pandis writes:
> > > 
> > > > up
> > > > 
> > > > Feedback? Ok?
> > > > 
> > > > Best regards,
> > > > Luca De Pandis
> > > > 
> > > > 
> > > > On Mon, Jan 18, 2021 at 11:42:05AM +0100, Luca De Pandis wrote:
> > > > > Hi,
> > > > > here's the kubectl port upgraded from 1.19.2 to 1.20.2.
> > > > > 
> > > > > Best regards,
> > > > > Luca De Pandis
> > > 
> > > Hi,
> > > 
> > > I tested this on my OpenBSD along with a Kubernetes Cluster from Google
> > > Cloud.
> > > 
> > > It works fine.
> > > 
> > > OK.
> > > 
> > > --
> > > Muhammad Kaisar Arkhan
> > > h...@yukiisbo.red - kai...@arkhan.io
> > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fyukiisbo.red%2F&data=04%7C01%7C%7C94996a3b3fed46fdb40b08d8ca107208%7C84df9e7fe9f640afb435%7C1%7C0%7C637481519263253650%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=tK0UjXyEC9iDoLA36b2lrS94YCoupyw3ImRDbbtIpkM%3D&reserved=0
> > >  - 
> > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Farkhan.io%2F&data=04%7C01%7C%7C94996a3b3fed46fdb40b08d8ca107208%7C84df9e7fe9f640afb435%7C1%7C0%7C637481519263253650%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=vARIYYFFMtHEwXvcWgSNKNAOnHjmnUQydO%2BTweHMW7A%3D&reserved=0
> > > 
> > 
> 
> -- 
> Paco Esteban.
> 0x5818130B8A6DBC03
> 

[Update] net/thingsd 4.0.0

[Tracey Emery]

Hello ports,

Small update to net/thingsd port, bumping to 4.0.0.

Change log:

* Refactor code to make more sense about what code is doing what, events-wise
* Fix improper assumptions about how to move sockets to children processes
* Remove default shared port design
* Require UDP bind interface
* Require individual listen ports per thing. Note, the last two update
* change the config grammar.
* Remove multiple subscriptions for clients across things
* Fix so all interfaces are bound to a socket when requested
* Update example config with those changes
* Fix thingsctl and tls to work with the new changes

Ok?
-- 

Tracey Emery

Index: Makefile
===
RCS file: /cvs/ports/net/thingsd/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- Makefile29 Jan 2021 19:33:43 -  1.7
+++ Makefile5 Feb 2021 20:51:11 -
@@ -5,7 +5,7 @@ CATEGORIES =net
 
 GH_ACCOUNT =   basepr1me
 GH_PROJECT =   thingsd
-GH_TAGNAME =   3.0.4
+GH_TAGNAME =   4.0.0
 
 MAINTAINER =   Tracey Emery 
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =  Yes
 
 # uses pledge()
 # uses unveil()
-WANTLIB += c crypto event pthread ssl tls util
+WANTLIB += c crypto event ssl tls util
 
 MAKE_FLAGS =   CC="${CC}"
 
Index: distinfo
===
RCS file: /cvs/ports/net/thingsd/distinfo,v
retrieving revision 1.6
diff -u -p -u -r1.6 distinfo
--- distinfo29 Jan 2021 19:33:43 -  1.6
+++ distinfo5 Feb 2021 20:51:11 -
@@ -1,2 +1,2 @@
-SHA256 (thingsd-3.0.4.tar.gz) = A57/8Ed7Y8Ww6KIG0JCCOwDqdmmPhDtjGEiF2pcw6x8=
-SIZE (thingsd-3.0.4.tar.gz) = 47111
+SHA256 (thingsd-4.0.0.tar.gz) = sAqPeWyl9kXAMEs8chQVdOA3eohLDgQZEHHa+6dQekc=
+SIZE (thingsd-4.0.0.tar.gz) = 53679

[update] x11/oroborus 2.0.12 -> 2.0.20 (-fno-common fix)

[Charlene Wendling]

The below diff updates oroborus to 2.0.20. While HOMEPAGE is dead
(redirects to some VR stuff), Debian takes care of this WM, so 
it's not totally dead. There are some window focus fixes and more
themes have been added, except from that, it's mostly maintenance stuff.

Port wise: 

- Update license marker
- Take Gentoo's -fno-common fix [0]
- Fix a missing include
- Make spacing a bit more consistent. Given that at that point,
  most of the Makefile was rewritten, i ordered things according
  to Makefile.template.
- Also, while the distfile uses '_' as version separator, the
  extracted root folder has '-' instead, so i had to use WRKDIST.

It builds fine and has been lightly tested on amd64 and macppc.

Comments and feedback are welcome,

Charlène.


[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch


Index: Makefile
===
RCS file: /cvs/ports/x11/oroborus/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:51:18 -  1.10
+++ Makefile5 Feb 2021 23:01:27 -
@@ -1,21 +1,26 @@
 # $OpenBSD: Makefile,v 1.10 2019/07/12 20:51:18 sthen Exp $
 
-COMMENT=   minimalistic X11 window manager
+COMMENT =  minimalistic X11 window manager
 
-CATEGORIES=x11
-DISTNAME=  oroborus-2.0.12
-DISTFILES= oroborus_2.0.12-1.tar.gz
-REVISION=  0
-MASTER_SITES=  http://www.mguillaud.net/ports/oroborus/ \
-   http://matt.peterson.org/FreeBSD/ports/
-HOMEPAGE=  http://www.oroborus.org/
-
-# GPL
-PERMIT_PACKAGE=Yes
-WANTLIB=   ICE SM X11 Xext Xpm c 
-
-CONFIGURE_STYLE=gnu
-USE_GMAKE= Yes
-SEPARATE_BUILD= Yes
+DISTNAME = oroborus_2.0.20
+PKGNAME =  ${DISTNAME:S/_/-/}
+
+CATEGORIES =   x11
+
+# GPLv2
+PERMIT_PACKAGE =   Yes
+
+WANTLIB += ICE SM X11 Xext Xpm c
+
+MASTER_SITES = ${MASTER_SITE_DEBIAN:=main/o/oroborus/} \
+   https://distfiles.gentoo.org/distfiles/
+
+SEPARATE_BUILD =   Yes
+
+USE_GMAKE =Yes
+
+CONFIGURE_STYLE =  gnu
+
+WRKDIST =  ${WRKDIR}/${PKGNAME}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/oroborus/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:15:59 -  1.4
+++ distinfo5 Feb 2021 23:01:27 -
@@ -1,2 +1,2 @@
-SHA256 (oroborus_2.0.12-1.tar.gz) = 
da6P0CzvF4e5o0iPudlw/iAyjbpb6pvLBy1ZgmRe8LE=
-SIZE (oroborus_2.0.12-1.tar.gz) = 236581
+SHA256 (oroborus_2.0.20.tar.gz) = UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=
+SIZE (oroborus_2.0.20.tar.gz) = 335099
Index: patches/patch-src_hints_c
===
RCS file: patches/patch-src_hints_c
diff -N patches/patch-src_hints_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_hints_c   5 Feb 2021 23:01:27 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/hints.c
+--- src/hints.c.orig
 src/hints.c
+@@ -43,7 +43,7 @@ Atom win_hints, win_state, win_client_list, win_layer,
+   win_workspace_count, win_desktop_button_proxy, win_supporting_wm_check,
+   gnome_panel_desktop_area;
+ Atom net_atoms[NET_ATOM_COUNT];
+-Display *dpy;
++extern Display *dpy;
+ 
+ void
+ initHints (Display * d)
Index: patches/patch-src_keyboard_c
===
RCS file: patches/patch-src_keyboard_c
diff -N patches/patch-src_keyboard_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_keyboard_c5 Feb 2021 23:01:27 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/keyboard.c
+--- src/keyboard.c.orig
 src/keyboard.c
+@@ -35,6 +35,8 @@
+ #include 
+ #endif
+ 
++int NumLockMask, CapsLockMask, ScrollLockMask;
++
+ void
+ parseKeyString (Display * dpy, MyKey * key, char *str)
+ {
Index: patches/patch-src_keyboard_h
===
RCS file: patches/patch-src_keyboard_h
diff -N patches/patch-src_keyboard_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_keyboard_h5 Feb 2021 23:01:27 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/keyboard.h
+--- src/keyboard.h.orig
 src/keyboard.h
+@@ -90,7 +90,7 @@ void grabKey (Display *, MyKey *, Window);
+ void ungrabKeys (Display *, Window);
+ void init_keyboard (Display * dpy);
+ 
+-int NumLockMask, CapsLockMask, ScrollLockMask;
++extern int NumLockMask, CapsLockMask, ScrollLockMask;
+ 
+ #endif /* __KEYBOARD_H */
+ 
Index: patches/patch-src_oroborus_c
===
RCS file: patches/patch-src_oroborus_c
diff -N patches/patch-src_oroborus_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_oroborus_c5 Feb 2021 23:01:27 -
@@ -0,0 +1

Re: Comms/minicom -fno-common

[Jonathan Gray]

On Fri, Feb 05, 2021 at 08:45:59PM +0100, Thaison Nguyen wrote:
> This should fix -fno-common with minicom.
> Taken the diff from the FreeBSD people.
> 
> Tested on amd64 with a ftdi usb to serial thingy.
> 
> OK?
> 

While not in the same place as the 2.7.1 distfile there is a 2.8 release
which includes some -fno-common changes

does it still work with this?

Index: Makefile
===
RCS file: /cvs/ports/comms/minicom/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile20 Mar 2020 16:44:21 -  1.67
+++ Makefile6 Feb 2021 00:04:20 -
@@ -2,10 +2,9 @@
 
 COMMENT=   MS-DOS Telix-like serial communication program
 
-DISTNAME=  minicom-2.7.1
-REVISION=  3
+DISTNAME=  minicom-2.8
 CATEGORIES=comms
-MASTER_SITES=  https://alioth-archive.debian.org/releases/minicom/Source/2.7.1/
+MASTER_SITES=  https://salsa.debian.org/minicom-team/minicom/-/archive/2.8/
 
 HOMEPAGE=  https://salsa.debian.org/minicom-team/minicom
 
Index: distinfo
===
RCS file: /cvs/ports/comms/minicom/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo18 Apr 2017 21:05:09 -  1.10
+++ distinfo6 Feb 2021 00:04:20 -
@@ -1,2 +1,2 @@
-SHA256 (minicom-2.7.1.tar.gz) = Uy+Da3pnfrDLHcqNcDArc3KcPTDfJtWDaNcS5cygQfE=
-SIZE (minicom-2.7.1.tar.gz) = 875939
+SHA256 (minicom-2.8.tar.gz) = no3ujn4fbWEV0OGVXaW4AeRLkSifaz4yCEKUlIjUsi8=
+SIZE (minicom-2.8.tar.gz) = 948015
Index: patches/patch-man_minicom_1
===
RCS file: /cvs/ports/comms/minicom/patches/patch-man_minicom_1,v
retrieving revision 1.6
diff -u -p -r1.6 patch-man_minicom_1
--- patches/patch-man_minicom_1 6 May 2017 21:57:27 -   1.6
+++ patches/patch-man_minicom_1 6 Feb 2021 00:04:20 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-man_minicom_1,v 1.6 2017
 Index: man/minicom.1
 --- man/minicom.1.orig
 +++ man/minicom.1
-@@ -842,7 +842,8 @@ $HOME/minicom.log
+@@ -862,7 +862,8 @@ $HOME/minicom.log
  /usr/share/locale/*/LC_MESSAGES/minicom.mo
  .fi
  .SH SEE ALSO
Index: patches/patch-src_main_c
===
RCS file: /cvs/ports/comms/minicom/patches/patch-src_main_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_main_c
--- patches/patch-src_main_c6 May 2017 22:00:53 -   1.7
+++ patches/patch-src_main_c6 Feb 2021 00:04:20 -
@@ -13,7 +13,7 @@ Index: src/main.c
  #include "port.h"
  #include "minicom.h"
  #include "intl.h"
-@@ -333,6 +336,17 @@ nolock:
+@@ -416,6 +419,17 @@ nolock:
/* Set CLOCAL mode */
m_nohang(portfd);
  
@@ -31,7 +31,7 @@ Index: src/main.c
/* Set Hangup on Close if program crashes. (Hehe) */
m_hupcl(portfd, 1);
if (doinit > 0)
-@@ -553,9 +567,10 @@ static void show_status_fmt(const char *fmt)
+@@ -641,9 +655,10 @@ static void show_status_fmt(const char *fmt)
  bufi += snprintf(buf + bufi, COLS - bufi, "%s",
   P_HASDCD[0] == 'Y' ? _("Offline") : 
_("OFFLINE"));
else
Index: patches/patch-src_minicom_c
===
RCS file: patches/patch-src_minicom_c
diff -N patches/patch-src_minicom_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_minicom_c 6 Feb 2021 00:04:20 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Index: src/minicom.c
+--- src/minicom.c.orig
 src/minicom.c
+@@ -1107,6 +1107,7 @@ int main(int argc, char **argv)
+   char *remote_charset = NULL;  /* Remote charset given on the command line 
via -R */
+   char pseudo[64];
+   /* char* console_encoding = getenv ("LC_CTYPE"); */
++  sigset_t set;
+ 
+   enum {
+ OPT_CAP_BUF_MODE = 256,
+@@ -1544,7 +1545,9 @@ int main(int argc, char **argv)
+ #endif
+ 
+   /* On some Linux systems SIGALRM is masked by default. Unmask it */  
+-  sigrelse(SIGALRM);
++  if (sigemptyset(&set) != -1 &&
++  sigaddset(&set, SIGALRM) != -1)
++sigprocmask(SIG_UNBLOCK, &set, NULL);
+ 
+   keyboard(KINSTALL, 0);
+ 
Index: patches/patch-src_script_c
===
RCS file: /cvs/ports/comms/minicom/patches/patch-src_script_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_script_c
--- patches/patch-src_script_c  6 May 2017 21:57:27 -   1.2
+++ patches/patch-src_script_c  6 Feb 2021 00:04:20 -
@@ -1,16 +1,21 @@
-$OpenBSD: patch-src_script_c,v 1.2 2017/05/06 21:57:27 sthen Exp $
+$OpenBSD$
 
 Index: src/script.c
 --- src/script.c.orig
 +++ src/script.c
-@@ -32,6 +32,10 @@
- #include 
+@@ -1089,11 +1089,14 @@ void do_args(int argc, char **argv)
+ int main(int argc, char **argv)
+ {
+   char *s;
++  sigset_t set;
+ #if 0 /* Shouldn't need this.. */
+   signal(SIGHUP, SIG_IGN);
  #endif
+   /* On some Linux systems SIGALRM is masked by default. Unmask it */  
+-  sigrelse(SIG

Comms/minicom -fno-common

[Thaison Nguyen]

This should fix -fno-common with minicom.
Taken the diff from the FreeBSD people.

Tested on amd64 with a ftdi usb to serial thingy.

OK?



minicom.diff
Description: Binary data

Re: Replace libfuse from base with libfuse from ports

[Helg]

On Fri, Feb 05, 2021 at 07:17:09PM +0100, Gr??goire Jadi wrote:
> Helg  writes:
> 
> Hi,
> 
> > I currently only have a port of the 2.x branch of libfuse (attached) but
> > will also port the 3.x libfuse once I have user mounting working. I am
> > not aware of any ports other than the latest version of sshfs that
> > depends on 3.x. In any case, we will need to support libfuse 2.x for
> > some time until all file systems are updated upstream to work with 3.x. 
> >  
> 
> I can't comment for the rest of your work, but borgbackup seems to
> prefer libfuse 3.x

Thanks for letting me know. borgbackup is an example of a port that will
benefit from this work. Are you suggesting that I should not commit
until libfuse3 has also been ported? Even thought it's not actively
maintained, llfuse could be ported in the meantime to enable FUSE
functionality in borgbackup..

> https://github.com/borgbackup/borg/blob/master/setup.py#L77
> > # note for package maintainers: if you package borgbackup for distribution,
> > # please (if available) add pyfuse3 (preferably) or llfuse (not maintained 
> > any more)
> > # as a *requirement*. "borg mount" needs one of them to work.
> > # if neither is available, do not require it, most of borgbackup will
> > work.
> 
> https://pypi.org/project/pyfuse3/
> > pyfuse3 is a set of Python 3 bindings for libfuse 3. It provides an
> > asynchronous API compatible with Trio and asyncio, and enables you to
> > easily write a full-featured Linux filesystem in Python.
> 
> Thanks for your work.
> Best,
> 
> -- 
> gjadi
> PGP : AF26 E9C2 A1C8 8D32 A868  4386 1373 5477 2B65 1894

Fix: devel/libowfat -fno-common

[Jan Klemkow]

Hi,

The following patches fix the build of the ports with -fno-common.
In parallel I try to bring this upstream.

ok?

bye,
Jan

Index: patches/patch-buffer_buffer_0_c
===
RCS file: patches/patch-buffer_buffer_0_c
diff -N patches/patch-buffer_buffer_0_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-buffer_buffer_0_c 5 Feb 2021 21:36:59 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: buffer/buffer_0.c
+--- buffer/buffer_0.c.orig
 buffer/buffer_0.c
+@@ -6,7 +6,7 @@ static ssize_t b0read(int fd,char* buf, size_t len) {
+   return read(fd,buf,len);
+ }
+ 
+-char buffer_0_space[BUFFER_INSIZE];
++static char buffer_0_space[BUFFER_INSIZE];
+ static buffer it = BUFFER_INIT_READ(b0read,0,buffer_0_space,sizeof 
buffer_0_space);
+ buffer *buffer_0 = ⁢
+ 
Index: patches/patch-buffer_buffer_0small_c
===
RCS file: patches/patch-buffer_buffer_0small_c
diff -N patches/patch-buffer_buffer_0small_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-buffer_buffer_0small_c5 Feb 2021 21:36:59 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: buffer/buffer_0small.c
+--- buffer/buffer_0small.c.orig
 buffer/buffer_0small.c
+@@ -6,7 +6,7 @@ static ssize_t b0read(int fd,char* buf, size_t len) {
+   return read(fd,buf,len);
+ }
+ 
+-char buffer_0_space[128];
++static char buffer_0_space[128];
+ static buffer it = BUFFER_INIT_READ(b0read,0,buffer_0_space,sizeof 
buffer_0_space);
+ buffer *buffer_0small = ⁢
+ 
Index: patches/patch-buffer_buffer_1_c
===
RCS file: patches/patch-buffer_buffer_1_c
diff -N patches/patch-buffer_buffer_1_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-buffer_buffer_1_c 5 Feb 2021 21:36:59 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: buffer/buffer_1.c
+--- buffer/buffer_1.c.orig
 buffer/buffer_1.c
+@@ -4,7 +4,7 @@
+ #include 
+ #endif
+ 
+-char buffer_1_space[BUFFER_INSIZE];
++static char buffer_1_space[BUFFER_INSIZE];
+ static buffer it = BUFFER_INIT(write,1,buffer_1_space,sizeof buffer_1_space);
+ buffer *buffer_1 = ⁢
+ 
Index: patches/patch-buffer_buffer_1small_c
===
RCS file: patches/patch-buffer_buffer_1small_c
diff -N patches/patch-buffer_buffer_1small_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-buffer_buffer_1small_c5 Feb 2021 21:36:59 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: buffer/buffer_1small.c
+--- buffer/buffer_1small.c.orig
 buffer/buffer_1small.c
+@@ -1,7 +1,7 @@
+ #include 
+ #include "buffer.h"
+ 
+-char buffer_1_space[128];
++static char buffer_1_space[128];
+ static buffer it = BUFFER_INIT(write,1,buffer_1_space,sizeof buffer_1_space);
+ buffer *buffer_1small = ⁢
+ 
Index: patches/patch-io_internal_h
===
RCS file: patches/patch-io_internal_h
diff -N patches/patch-io_internal_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-io_internal_h 5 Feb 2021 21:38:00 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: io_internal.h
+--- io_internal.h.orig
 io_internal.h
+@@ -83,7 +83,7 @@ my_extern array io_pollfds;
+ my_extern long first_readable;
+ my_extern long first_writeable;
+ 
+-my_extern long first_deferred;
++extern long first_deferred;
+ 
+ my_extern enum __io_waitmode {
+   UNDECIDED,

UPDATE: libheif 1.11.0

[Brad Smith]

Here is an update to libheif 1.11.0.

macOS compatibility fixes
- fix writing ispe box in HEIFs
- nclx output profile encoding parameters
- change the way nclx profiles is written so that macOS can read them
- API for listing file brands and checking file type
- fix heif_image_handle_get_depth_image_representation_info()


Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/libheif/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile21 Dec 2020 06:21:35 -  1.4
+++ Makefile5 Feb 2021 21:40:04 -
@@ -2,10 +2,10 @@
 
 COMMENT=   HEIF and AVIF file format decoder and encoder
 
-V= 1.10.0
+V= 1.11.0
 DISTNAME=  libheif-$V
 
-SHARED_LIBS +=  heif  1.0 # 9.0
+SHARED_LIBS +=  heif  1.1 # 9.0
 
 CATEGORIES=multimedia graphics
 
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/libheif/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo21 Dec 2020 06:21:35 -  1.2
+++ distinfo5 Feb 2021 21:34:31 -
@@ -1,2 +1,2 @@
-SHA256 (libheif-1.10.0.tar.gz) = rVrxJ280EnfcU3sNGaQZPggzwkeyqsuTbgxUlBQVM64=
-SIZE (libheif-1.10.0.tar.gz) = 1681115
+SHA256 (libheif-1.11.0.tar.gz) = xVCTj1b/bayDcCJRoUP4fLOmxxpQ2HI5VSkIMtmWCRM=
+SIZE (libheif-1.11.0.tar.gz) = 1680855

sparc64 bulk build report

[kmos]

Bulk build on sparc64-0a.ports.openbsd.org

Started : Wed Feb  3 10:37:14 MST 2021
Finished: Fri Feb  5 21:04:45 MST 2021
Duration: 2 Days 10 hours 28 minutes

Built using OpenBSD 6.8-current (GENERIC.MP) #668: Tue Feb  2 12:51:08 MST 2021

Built 9389 packages

Number of packages built each day:
Feb 3: 7244
Feb 4: 1244
Feb 5: 901


Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2021-02-03/summary.log

Build failures: 23
http://build-failures.rhaalovely.net/sparc64/2021-02-03/comms/syncterm.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/devel/dtc.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/devel/glog.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/devel/keystone/python,python3.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/devel/spidermonkey78.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/emulators/emulationstation.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/games/frotz.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/games/odamex.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/games/openxcom.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/geo/spatialite/gui.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/graphics/exiv2.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/graphics/inkscape.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/math/mlpack,-main.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/math/py-scipy,python3.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/multimedia/gstreamer-0.10/plugins-bad,-main.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/net/barrier.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/net/libsignal-protocol-c.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/print/gutenprint.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/sysutils/libvirt.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/x11/grantlee-qt5.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/x11/i3-mousedrag.log
http://build-failures.rhaalovely.net/sparc64/2021-02-03/x11/roxterm.log

Recurrent failures:
 failures/comms/syncterm.log
 failures/devel/glog.log
 failures/devel/keystone/python,python3.log
 failures/devel/spidermonkey78.log
 failures/games/frotz.log
 failures/games/odamex.log
 failures/games/openxcom.log
 failures/graphics/exiv2.log
 failures/graphics/inkscape.log
 failures/math/mlpack,-main.log
 failures/multimedia/gstreamer-0.10/plugins-bad,-main.log
 failures/net/barrier.log
 failures/print/gutenprint.log
 failures/productivity/gnucash.log
 failures/sysutils/libvirt.log
 failures/x11/grantlee-qt5.log
 failures/x11/roxterm.log

New failures:
+failures/devel/dtc.log
+failures/emulators/emulationstation.log
+failures/math/py-scipy,python3.log
+failures/net/libsignal-protocol-c.log
+failures/x11/i3-mousedrag.log

Resolved failures:
-failures/audio/libgpod.log
-failures/multimedia/mpv.log

Packages newly built:
+audio/curseradio
+audio/gtkpod
+audio/libgpod
+audio/ruby-taglib,ruby30
+audio/ruby-vorbis_comment,ruby30
+databases/ruby-amalgalite,ruby30
+databases/ruby-ldap,ruby30
+databases/ruby-mysql,ruby30
+databases/ruby-mysql2,ruby30
+databases/ruby-pg,ruby30
+databases/ruby-sequel,ruby30
+databases/ruby-sequel_pg,ruby30
+databases/ruby-sqlite3,ruby30
+databases/ruby-tiny_tds,ruby30
+devel/ruby-arrayfields,ruby30
+devel/ruby-cicphash,ruby30
+devel/ruby-daemons,ruby30
+devel/ruby-ffi,ruby30
+devel/ruby-ffi-compiler
+devel/ruby-ffi-compiler,ruby26
+devel/ruby-ffi-compiler,ruby27
+devel/ruby-ffi-compiler,ruby30
+devel/ruby-kgio,ruby30
+devel/ruby-narray,ruby30
+devel/ruby-ncurses,ruby30
+devel/ruby-nio4r,ruby30
+devel/ruby-prof,ruby30
+devel/ruby-racc,ruby30
+devel/ruby-rb-gsl,ruby30
+devel/ruby-ref,ruby30
+devel/ruby-regexp_parser,ruby30
+devel/ruby-subset_sum,ruby30
+devel/ruby-yajl,ruby30
+graphics/libspiro
+graphics/ruby-rmagick,ruby30
+mail/ruby-mini_mime,ruby30
+multimedia/mpv
+net/ruby-cbor,ruby30
+net/ruby-eventmachine,ruby30
+net/ruby-msgpack,ruby30
+net/ruby-public_suffix,ruby30
+security/ruby-argon2,ruby26
+security/ruby-argon2,ruby27
+security/ruby-argon2,ruby30
+security/ruby-bcrypt,ruby30
+security/ruby-gpgme,ruby30
+security/ruby-pledge,ruby30
+security/stegseek
+sysutils/ruby-augeas,ruby30
+sysutils/ruby-posix-spawn,ruby30
+sysutils/ruby-shadow,ruby30
+textproc/ruby-fast-stemmer,ruby30
+textproc/ruby-fast_xs,ruby30
+textproc/ruby-hpricot,ruby30
+textproc/ruby-hyperestraier,ruby30
+textproc/ruby-nokogiri,ruby30
+textproc/ruby-rdiscount,ruby30
+textproc/ruby-redcarpet,ruby30
+textproc/ruby-redcloth,ruby30
+www/minitube
+www/ruby-addressable,ruby30
+www/ruby-capybara,ruby30
+www/ruby-capybara-webkit,ruby30
+www/ruby-fcgi,ruby30
+www/ruby-ntlm,ruby30
+www/ruby-puma,ruby30
+www/ruby-rack,ruby30
+www/ruby-rack-test,ruby30
+www/ruby-raindrops,ruby30
+www/r

Re: sparc64 bulk build report

[Jonathan Gray]

On Fri, Feb 05, 2021 at 09:05:00PM -0700, k...@openbsd.org wrote:
> Bulk build on sparc64-0a.ports.openbsd.org
> 
> Started : Wed Feb  3 10:37:14 MST 2021
> Finished: Fri Feb  5 21:04:45 MST 2021
> Duration: 2 Days 10 hours 28 minutes
> 
> Built using OpenBSD 6.8-current (GENERIC.MP) #668: Tue Feb  2 12:51:08 MST 
> 2021
> 
> Built 9389 packages
> 
> Number of packages built each day:
> Feb 3: 7244
> Feb 4: 1244
> Feb 5: 901
> 
> 
> Critical path missing pkgs:
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/summary.log
> 
> Build failures: 23
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/comms/syncterm.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/devel/dtc.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/devel/glog.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/devel/keystone/python,python3.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/devel/spidermonkey78.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/emulators/emulationstation.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/games/frotz.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/games/odamex.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/games/openxcom.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/geo/spatialite/gui.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/graphics/exiv2.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/graphics/inkscape.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/math/mlpack,-main.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/math/py-scipy,python3.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/multimedia/gstreamer-0.10/plugins-bad,-main.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/net/barrier.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/net/libsignal-protocol-c.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/print/gutenprint.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/productivity/gnucash.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/sysutils/libvirt.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/x11/grantlee-qt5.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/x11/i3-mousedrag.log
> http://build-failures.rhaalovely.net/sparc64/2021-02-03/x11/roxterm.log
> 
> Recurrent failures:
>  failures/comms/syncterm.log
>  failures/devel/glog.log
>  failures/devel/keystone/python,python3.log
>  failures/devel/spidermonkey78.log
>  failures/games/frotz.log
>  failures/games/odamex.log
>  failures/games/openxcom.log
>  failures/graphics/exiv2.log
>  failures/graphics/inkscape.log
>  failures/math/mlpack,-main.log
>  failures/multimedia/gstreamer-0.10/plugins-bad,-main.log
>  failures/net/barrier.log
>  failures/print/gutenprint.log
>  failures/productivity/gnucash.log
>  failures/sysutils/libvirt.log
>  failures/x11/grantlee-qt5.log
>  failures/x11/roxterm.log
> 
> New failures:
> +failures/devel/dtc.log

gnu_printf requires gcc >= 4.4.0
https://gcc.gnu.org/legacy-ml/gcc-help/2012-02/msg00225.html

Index: patches/patch-util_h
===
RCS file: patches/patch-util_h
diff -N patches/patch-util_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-util_h6 Feb 2021 04:32:40 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+gnu_printf requires gcc >= 4.4.0
+
+Index: util.h
+--- util.h.orig
 util.h
+@@ -12,10 +12,10 @@
+  */
+ 
+ #ifdef __GNUC__
+-#ifdef __clang__
+-#define PRINTF(i, j)  __attribute__((format (printf, i, j)))
+-#else
++#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+ #define PRINTF(i, j)  __attribute__((format (gnu_printf, i, j)))
++#else
++#define PRINTF(i, j)  __attribute__((format (printf, i, j)))
+ #endif
+ #define NORETURN  __attribute__((noreturn))
+ #else

Re: Question about lang/ghc module (trying to port git-annex)

[Greg Steuck]

James Cook  writes:

>> Would you like to try your hand in extending post-install target with
>> some man formatting magic like we have in other ports?
>
> Done (commit a1c5aec8) in my "git-annex" branch:
>
> https://github.com/falsifian/ports/commits/git-annex

Very nice!

> It's not pretty. I replicated some logic from Build/Man.hs, which is
> called from Setup.hs.

Some quick observations. Makefile allows line-continuation with \ and
this is how people write long command lines. The for loop would be more
readable if it were split like that. I also don't see a lot of places in
ports make files with quotes around variables. I suspect we just expect
people to not go nuts with spaces in directory names when building
ports.

> Normally cabal v2-install would do that work for
> us (putting the result in .cabal/store/ghc-XXX/git-annex-XXX) but I
> don't know if it's worth getting that working.
>
> Caveat: I took a shortcut when testing this: instead of re-running
> "make build" I just made the post-build target after adding this in.
> I'll try building from scratch later if you don't beat me to it.

I believe `make rebuild` should reuse the cabal built pieces. post-build
seems like a reasonable place for this kind of work. Alternatively
sticking those man-formatting commands into post-install also seems
acceptable to me.

> On that branch I also removed the runtime dep on devel/git-lfs (it's
> just one of a large number of optional backends).

Good call.

>> From what I gathered the v2-install target is largely unusable for
>> installing packages outside of .cabal tree. At least neither I nor
>> FreeBSD maintainer found a way to leverage that. Hence the manual
>> install flow.
>
> I probably don't know all the subtleties, but when I run
> "cabal v2-install", I get a nice set of files under
> ~/.cabal/ghc-XXX/git-annex-XXX, including the man pages and all three
> needed binaries. I would guess that just copying those files to the
> destination would do the trick for most cabal executable packages, but
> I haven't actually tried it. Maybe it's better to be cautious.

I'll dig into this a bit. I simply didn't need to worry about this up
until now as all the other ports don't do much custom Setup.hs work.

Thanks
Greg

Re: Fix: devel/libowfat -fno-common

[Greg Steuck]

Jan Klemkow  writes:

> Hi,
>
> The following patches fix the build of the ports with -fno-common.
> In parallel I try to bring this upstream.
>
> ok?

OK gnezdo

>
> bye,
> Jan
>
> Index: patches/patch-buffer_buffer_0_c
> ===
> RCS file: patches/patch-buffer_buffer_0_c
> diff -N patches/patch-buffer_buffer_0_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-buffer_buffer_0_c   5 Feb 2021 21:36:59 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: buffer/buffer_0.c
> +--- buffer/buffer_0.c.orig
>  buffer/buffer_0.c
> +@@ -6,7 +6,7 @@ static ssize_t b0read(int fd,char* buf, size_t len) {
> +   return read(fd,buf,len);
> + }
> + 
> +-char buffer_0_space[BUFFER_INSIZE];
> ++static char buffer_0_space[BUFFER_INSIZE];
> + static buffer it = BUFFER_INIT_READ(b0read,0,buffer_0_space,sizeof 
> buffer_0_space);
> + buffer *buffer_0 = ⁢
> + 
> Index: patches/patch-buffer_buffer_0small_c
> ===
> RCS file: patches/patch-buffer_buffer_0small_c
> diff -N patches/patch-buffer_buffer_0small_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-buffer_buffer_0small_c  5 Feb 2021 21:36:59 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: buffer/buffer_0small.c
> +--- buffer/buffer_0small.c.orig
>  buffer/buffer_0small.c
> +@@ -6,7 +6,7 @@ static ssize_t b0read(int fd,char* buf, size_t len) {
> +   return read(fd,buf,len);
> + }
> + 
> +-char buffer_0_space[128];
> ++static char buffer_0_space[128];
> + static buffer it = BUFFER_INIT_READ(b0read,0,buffer_0_space,sizeof 
> buffer_0_space);
> + buffer *buffer_0small = ⁢
> + 
> Index: patches/patch-buffer_buffer_1_c
> ===
> RCS file: patches/patch-buffer_buffer_1_c
> diff -N patches/patch-buffer_buffer_1_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-buffer_buffer_1_c   5 Feb 2021 21:36:59 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: buffer/buffer_1.c
> +--- buffer/buffer_1.c.orig
>  buffer/buffer_1.c
> +@@ -4,7 +4,7 @@
> + #include 
> + #endif
> + 
> +-char buffer_1_space[BUFFER_INSIZE];
> ++static char buffer_1_space[BUFFER_INSIZE];
> + static buffer it = BUFFER_INIT(write,1,buffer_1_space,sizeof 
> buffer_1_space);
> + buffer *buffer_1 = ⁢
> + 
> Index: patches/patch-buffer_buffer_1small_c
> ===
> RCS file: patches/patch-buffer_buffer_1small_c
> diff -N patches/patch-buffer_buffer_1small_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-buffer_buffer_1small_c  5 Feb 2021 21:36:59 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: buffer/buffer_1small.c
> +--- buffer/buffer_1small.c.orig
>  buffer/buffer_1small.c
> +@@ -1,7 +1,7 @@
> + #include 
> + #include "buffer.h"
> + 
> +-char buffer_1_space[128];
> ++static char buffer_1_space[128];
> + static buffer it = BUFFER_INIT(write,1,buffer_1_space,sizeof 
> buffer_1_space);
> + buffer *buffer_1small = ⁢
> + 
> Index: patches/patch-io_internal_h
> ===
> RCS file: patches/patch-io_internal_h
> diff -N patches/patch-io_internal_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-io_internal_h   5 Feb 2021 21:38:00 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: io_internal.h
> +--- io_internal.h.orig
>  io_internal.h
> +@@ -83,7 +83,7 @@ my_extern array io_pollfds;
> + my_extern long first_readable;
> + my_extern long first_writeable;
> + 
> +-my_extern long first_deferred;
> ++extern long first_deferred;
> + 
> + my_extern enum __io_waitmode {
> +   UNDECIDED,

Re: update net/libtorrent-rasterbar 1.2.11

[Elias M. Mariani]

Tested the diff for 1.2.12 from Nam.
Working OK with qbittorrent 4.3.3.

portcheck complains about a "1 line(s) longer than 80 chars in
Makefile" but is just the MASTER_SITES one.
make port-lib-depends-check is OK

OK mariani@

No opinions about setup.py. I don't have the knowledge to take a stand.

Cheers.
Elias.

On Tue, Jan 19, 2021 at 1:01 AM Nam Nguyen  wrote:
>
> Rafael Sadowski writes:
>
> > On Mon Dec 28, 2020 at 04:04:42AM -0800, Nam Nguyen wrote:
> >> Here is a diff to update libtorrent-rasterbar to 1.2.11, released on
> >> Nov. 15, 2020.
>
> Here is a diff for 1.2.12 which was released on Jan. 5, 2021. I have not
> yet committed 1.2.11 which was OK rsadowski@, so I'm proposing this
> newer update instead.
>
> changelog: https://github.com/arvidn/libtorrent/releases/tag/v1.2.12
>
> This diff additionally:
> - uses a local copy of 1.2.11's ${WRKSRC}/bindings/setup.py because
>   1.2.12 relies on boost-build, which has been removed from devel/boost
>
> For now, I propose carrying a copy of 1.2.11's
> ${WRKSRC}/bindings/python/setup.py until boost-build is built
> again. ${FILESDIR}/setup.py needs to be updated manually with each
> update (e.g., 1.2.12).
>
> Questions:
> 1. Is carrying an old setup.py worth the maintenance burden?
> 2. Will boost-build return in the future once python 3 support becomes
>better? It may not be worth it just for this port.
>
> Testing
> ---
> I tested consumers in net/deluge and net/qbittorrent. A new unit test is
> skipped for test_pex, which used to pass. It has been resolved upstream:
> https://github.com/arvidn/libtorrent/issues/5863
>
> >>
> >> changelog: https://github.com/arvidn/libtorrent/releases/tag/v1.2.11
> >>
> >> This diff:
> >> - bumps library major due to symbol deprecation
> >> - changes MASTER_SITES to properly download the new release
> >>
> >> I tested with qbittorrent and deluge. `make test' skips the same tests
> >> as the previous release (test_lsd and test_primitives).
> >>
> >> OK?
> >
> > It has built cleanly and port-wise it looks fine. OK rsadowski@
> >
> [snip]
>
> Brad Smith writes:
>
> > Well the only question I have is if we remove this does anything in
> > the ports tree
> > depend it for building anything? If not, then I'd say go with removing
> > it all together
> > for the time being until it is updated to be compatible with Python
> > 3. If the answer
> > is yes then how many ports?
>
> I see from revision 1.103 of devel/boost/Makefile, "boost-build also
> leaves as collateral damage, its python files aren't ready for python3
> and it's not clear how useful they are."
>
> FreeBSD also reports rare usage of boost-build: "Not one other port out
> of 30,000 uses boost-build, so it is likely untested."
>
> https://github.com/arvidn/libtorrent/issues/5797
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/libtorrent-rasterbar/Makefile,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 Makefile
> --- Makefile4 Jan 2021 14:06:35 -   1.14
> +++ Makefile19 Jan 2021 03:36:35 -
> @@ -2,11 +2,11 @@
>
>  COMMENT =  C++ library implementing a BitTorrent client
>
> -MODPY_EGG_VERSION =1.2.10
> +# remember to update version number in ${FILESDIR}/setup.py
> +MODPY_EGG_VERSION =1.2.12
>  DISTNAME = libtorrent-rasterbar-${MODPY_EGG_VERSION}
> -REVISION = 0
>
> -SHARED_LIBS += torrent-rasterbar 3.0   # 10.0.0
> +SHARED_LIBS += torrent-rasterbar 4.0   # 10.0.0
>
>  CATEGORIES =   net devel
>
> @@ -18,7 +18,7 @@ PERMIT_PACKAGE =  Yes
>  WANTLIB += ${COMPILER_LIBCXX} boost_python${MODPY_VERSION:C/\.//g}-mt
>  WANTLIB += boost_system-mt crypto iconv m ssl
>
> -MASTER_SITES = 
> https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MODPY_EGG_VERSION}/
> +MASTER_SITES = 
> https://github.com/arvidn/libtorrent/releases/download/v${MODPY_EGG_VERSION}/
>
>  MODULES =  lang/python
>  MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
> @@ -54,6 +54,8 @@ CONFIGURE_ARGS += --enable-debug
>
>  pre-configure:
> sed -i 's,-Os,,g' ${WRKSRC}/configure
> +# use setup.py from 1.2.11 because >=1.2.12 introduced dependency on 
> boost-build
> +   @cp ${FILESDIR}/setup.py ${WRKSRC}/bindings/python
>
>  pre-test:
> ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/libtorrent-rasterbar/distinfo,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 distinfo
> --- distinfo7 Sep 2020 04:24:17 -   1.8
> +++ distinfo19 Jan 2021 03:36:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (libtorrent-rasterbar-1.2.10.tar.gz) = 
> 0N0wvcOSZYfEJB9AaNjjliimwfn2z1MZXw6byQAXvvs=
> -SIZE (libtorrent-rasterbar-1.2.10.tar.gz) = 4128498
> +SHA256 (libtorrent-rasterbar-1.2.12.tar.gz) = 
> w3RKyfpB9ubr95U4oupnjfdqLLuvOsauLAVFUxTlzOg=
> +SIZE (libtorrent