CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2021/08/16 22:09:27 Modified files: graphics/py-seaborn: Makefile distinfo Log message: Update to py-seaborn Changes: https://github.com/mwaskom/seaborn/blob/v0.11.2/doc/releases/v0.11.2.txt >From wen heping .
Re: UPDATE: Boost 1.77
On 8/16/2021 1:41 AM, Rafael Sadowski wrote: On Fri Aug 13, 2021 at 03:31:41PM -0400, Brad Smith wrote: Here is an update to Boost 1.77. https://www.boost.org/users/history/version_1_77_0.html Further review and testing is welcome. The bulk build of beta1 showed the three following ports that still need fixing. Any help there would be appreicated. net/bitcoin net/litecoin Fixes committed and pushed to upstream. net/qbittorrent/qbittorrent I see no issues here. It looks like the issue that I had suspected *might* be a Boost issue has gone away between beta1 and the release.
Re: teach PortGen to not use MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
On Sat, Aug 14, 2021 at 02:11:13PM +0100, Stuart Henderson wrote: > PS non-obvious piece of information that you might not have discovered > yet and which IIRC is needed when changing this: portgen uses > ports/infrastructure/templates/Makefile.template to fill things in It uses that file to determine the order where it puts things. Anything it adds that isn't at that file goes to the bottom of the generated port. Before I added several Python-specific entries, I always had to move a bunch of stuff around in a generated Makefile. --Kurt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/08/16 16:06:13 Modified files: security/vault : Makefile Log message: security/vault: complete the move from MASTER_SITES0 to MASTER_SITES
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/08/16 15:23:18 Modified files: lang/ghc : Makefile distinfo lang/ghc/pkg : PFRAG.no_i386 Removed files: lang/ghc/patches: patch-docs_users_guide_conf_py patch-libraries_process_include_runProcess_h Log message: Update lang/ghc to 8.10.6 A couple of patches are obsolete now. OK kili
Re: [update] net/synapse -> 1.40.0
With the actual patch, it makes more sense.
On 8/16/21 2:29 PM, Renaud Allard wrote:
Hello,
Here is a diff for net/synapse to upgrade to 1.40.0. This needs
textproc/py-ijson to be imported first.
Works for me on amd64
Best Regards
? patches
Index: Makefile
===
RCS file: /cvs/ports/net/synapse/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 2 Apr 2021 07:35:56 - 1.20
+++ Makefile 16 Aug 2021 12:26:50 -
@@ -2,7 +2,7 @@
COMMENT = open network for secure, decentralized communication
-MODPY_EGG_VERSION = 1.30.0
+MODPY_EGG_VERSION = 1.40.0
GH_ACCOUNT = matrix-org
GH_PROJECT = synapse
@@ -27,6 +27,7 @@ RUN_DEPENDS = textproc/py-lxml${MODPY_FL
textproc/py-unpaddedbase64${MODPY_FLAVOR} \
textproc/py-signedjson${MODPY_FLAVOR} \
textproc/py-canonicaljson${MODPY_FLAVOR} \
+ textproc/py-ijson${MODPY_FLAVOR} \
devel/py-asn1${MODPY_FLAVOR} \
devel/py-blist${MODPY_FLAVOR} \
devel/py-jsonschema${MODPY_FLAVOR} \
Index: distinfo
===
RCS file: /cvs/ports/net/synapse/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 2 Apr 2021 07:35:56 - 1.17
+++ distinfo 16 Aug 2021 12:26:50 -
@@ -1,2 +1,2 @@
-SHA256 (synapse-1.30.0.tar.gz) = K+tXUxgYTIuWxnMKula39tMN6jjK5fxRCiwioXCvlmU=
-SIZE (synapse-1.30.0.tar.gz) = 7213532
+SHA256 (synapse-1.40.0.tar.gz) = D708mem1tKNP87xW3bdUPe4DayLaRkMDzGun75FgCBg=
+SIZE (synapse-1.40.0.tar.gz) = 7409547
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/synapse/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST 2 Apr 2021 07:35:56 - 1.16
+++ pkg/PLIST 16 Aug 2021 12:26:50 -
@@ -16,7 +16,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/${MODPY_PYCACHE}event_auth.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/${MODPY_PYCACHE}notifier.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/${MODPY_PYCACHE}python_dependencies.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/${MODPY_PYCACHE}secrets.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/${MODPY_PYCACHE}visibility.${MODPY_PYC_MAGIC_TAG}pyc
@@ -25,7 +24,9 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/_scripts/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/synapse/_scripts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/_scripts/${MODPY_PYCACHE}register_new_matrix_user.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/_scripts/${MODPY_PYCACHE}review_recent_signups.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/_scripts/register_new_matrix_user.py
+lib/python${MODPY_VERSION}/site-packages/synapse/_scripts/review_recent_signups.py
lib/python${MODPY_VERSION}/site-packages/synapse/api/
lib/python${MODPY_VERSION}/site-packages/synapse/api/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/api/${MODPY_PYCACHE}/
@@ -98,24 +99,26 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}account_validity.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}appservice.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}captcha.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}cas.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}consent_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}consent.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}database.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/08/16 14:20:02 Modified files: math : Makefile Log message: +lean
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/08/16 14:19:24 Log message: import math/lean, ok sthen Lean is an open source theorem prover and programming language. It aims to bridge the gap between interactive and automated theorem proving, by situating automated tools and methods in a framework that supports user interaction and the construction of fully specified axiomatic proofs. Status: Vendor Tag: tb Release Tags: tb_20210816 N ports/math/lean/Makefile N ports/math/lean/distinfo N ports/math/lean/patches/patch-src_CMakeLists_txt N ports/math/lean/patches/patch-src_util_lean_path_cpp N ports/math/lean/patches/patch-bin_leanpkg N ports/math/lean/patches/patch-tests_lean_test_single_sh N ports/math/lean/pkg/DESCR N ports/math/lean/pkg/PLIST No conflicts created by this import
[new] math/lean 3.32.1
This is a port of the community fork of Lean 3. This is what the current mathlib runs on while the lean maintainers are busy developing Lean 4. I have used various versions of this since October 2019 although I had to resort to a number of hacks such as compiling with gcc or disabling multithreading support due to crashes that went away with the futex fixes from earlier in this cycle. cmake installs a number of headers. These are currently unused, since no corresponding library is installed, but it is conceivable that the shared library will come back in future versions, so I did not try to avoid installing them. All tests pass on amd64 and sparc64. Information for inst:lean-3.32.1 Comment: interactive and automated theorem prover Description: Lean is an open source theorem prover and programming language. It aims to bridge the gap between interactive and automated theorem proving, by situating automated tools and methods in a framework that supports user interaction and the construction of fully specified axiomatic proofs. Maintainer: Theo Buehler WWW: https://leanprover-community.github.io lean.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/16 11:53:24 Modified files: multimedia/aom : Makefile distinfo Log message: update to aom-3.1.2, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/16 11:49:56 Modified files: databases/mariadb: Makefile mariadb.port.mk databases/mariadb/pkg: README-server Log message: use the mariadb-prefixed version of binary names, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/16 11:48:32 Modified files: multimedia/dav1d: Makefile distinfo Log message: update to dav1d-0.9.1, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/16 11:43:21 Modified files: mail/dovecot : Makefile Added files: mail/dovecot/patches: patch-src_indexer_indexer-client_c patch-src_lib-compression_istream-lz4_c Log message: backport a couple of upstream Dovecot commits, ok Brad - indexer crash if the client disconnects while waiting for command reply (most likely if an IMAP search triggered slow fts indexing) - "(i_stream_read_memarea): assertion failed: (!stream->blocking)" when reading with lz4 compression if the header was read only partially.
Re: [update] net/synapse -> 1.40.0
Renaud Allard writes: > [[S/MIME Signed Part:Undecided]] > With the actual patch, it makes more sense. > > On 8/16/21 2:29 PM, Renaud Allard wrote: >> Hello, >> Here is a diff for net/synapse to upgrade to 1.40.0. This needs >> textproc/py-ijson to be imported first. >> Works for me on amd64 >> Best Regards >> > > [2. text/x-patch; synapse-1.40.0.diff]... > > [[End of S/MIME Signed Part]] It seems this patch was generated off an older tree? Here is a version against what's in -current: https://deftly.net/patches/synapse-1.40.0.diff
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2021/08/16 11:24:52 Modified files: security/vault : Makefile distinfo security/vault/pkg: README Log message: Update vault 1.7.3 -> 1.8.1 Changelog: https://github.com/hashicorp/vault/blob/main/CHANGELOG.md#181 Port switched to custom distfile after vendored modules were excluded from source ok ajacoutot@
Re: UPDATE: graphics/scrot
On 2021/08/15 18:13, Rafael Sadowski wrote:
> Looks like scrot has found a new home, so please find below a simple
> update diff. Used on amd64 for a while.
>
> Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/scrot/Makefile,v
> retrieving revision 1.17
> diff -u -p -u -p -r1.17 Makefile
> --- Makefile 12 Jul 2019 20:47:10 - 1.17
> +++ Makefile 15 Aug 2021 16:10:59 -
> @@ -2,22 +2,19 @@
>
> COMMENT= commandline screen capture util
>
> -DISTNAME=scrot-0.8
> -REVISION = 4
> +V= 1.6
> +DISTNAME=scrot-${V}
> +
> CATEGORIES= graphics
>
> -HOMEPAGE=http://www.linuxbrit.co.uk/scrot/
> +WANTLIB += Imlib2 X11 Xcomposite Xext Xfixes c
Can you move WANTLIB below PERMIT_PACKAGE please.
OK.
If there's anything else on top it can be added separately.
> # BSD
> PERMIT_PACKAGE= Yes
>
> -WANTLIB= X11 Xext c freetype m z \
> - giblib>=1 Imlib2>=1
> -
> -MASTER_SITES=http://www.linuxbrit.co.uk/downloads/
> +MASTER_SITES=
> https://github.com/resurrecting-open-source-projects/scrot/releases/download/${V}/
>
> -LIB_DEPENDS=devel/giblib \
> - graphics/imlib2
> +LIB_DEPENDS= graphics/imlib2
>
> CONFIGURE_STYLE= gnu
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/scrot/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- distinfo 18 Jan 2015 03:14:14 - 1.4
> +++ distinfo 15 Aug 2021 16:10:59 -
> @@ -1,2 +1,2 @@
> -SHA256 (scrot-0.8.tar.gz) = YT0c9STCtizjxl8SMupPBcfa8kjV6C/ypoksmAk5lPI=
> -SIZE (scrot-0.8.tar.gz) = 74324
> +SHA256 (scrot-1.6.tar.gz) = QvZNOPBOxTDItOva4EzOi2iTsvjTBic5HTkO3LqRcJA=
> +SIZE (scrot-1.6.tar.gz) = 182032
> Index: patches/patch-src_Makefile_in
> ===
> RCS file: patches/patch-src_Makefile_in
> diff -N patches/patch-src_Makefile_in
> --- patches/patch-src_Makefile_in 8 Jul 2011 11:25:47 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,44 +0,0 @@
> -$OpenBSD: patch-src_Makefile_in,v 1.2 2011/07/08 11:25:47 jasper Exp $
> src/Makefile.in.orig Mon Jun 23 14:13:34 2003
> -+++ src/Makefile.in Fri Jul 8 13:22:30 2011
> -@@ -73,13 +73,13 @@ VERSION = @VERSION@
> -
> - MAINTAINERCLEANFILES = Makefile.in
> -
> --LDFLAGS = -L/usr/X11R6/lib
> --INCLUDES = -g -O3 -Wall -I/usr/X11R6/include $(X_CFLAGS)
> -I$(prefix)/include -I$(includedir) -I. -DPREFIX=\""$(prefix)"\"
> @GIBLIB_CFLAGS@
> -+LDFLAGS = -L${X11BASE}/lib
> -+INCLUDES = -Wall -I${X11BASE}/include $(X_CFLAGS) -I$(prefix)/include
> -I$(includedir) -I. -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@
> -
> - LIBOBJS = @LIBOBJS@
> -
> - bin_PROGRAMS = scrot
> --scrot_SOURCES = main.c getopt.c getopt1.c getopt.h scrot.h options.c
> options.h debug.h imlib.c structs.h
> -+scrot_SOURCES = main.c scrot.h options.c options.h debug.h imlib.c structs.h
> -
> - scrot_LDADD = -lX11 @GIBLIB_LIBS@
> - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
> -@@ -91,7 +91,7 @@ PROGRAMS = $(bin_PROGRAMS)
> - DEFS = @DEFS@ -I. -I$(srcdir) -I.
> - CPPFLAGS = @CPPFLAGS@
> - LIBS = @LIBS@
> --scrot_OBJECTS = main.o getopt.o getopt1.o options.o imlib.o
> -+scrot_OBJECTS = main.o options.o imlib.o
> - scrot_DEPENDENCIES =
> - scrot_LDFLAGS =
> - CFLAGS = @CFLAGS@
> -@@ -239,11 +239,9 @@ distdir: $(DISTFILES)
> - || cp -p $$d/$$file $(distdir)/$$file || :; \
> - fi; \
> - done
> --getopt.o: getopt.c config.h
> --getopt1.o: getopt1.c config.h getopt.h
> --imlib.o: imlib.c scrot.h getopt.h config.h structs.h debug.h options.h
> --main.o: main.c scrot.h getopt.h config.h structs.h debug.h options.h
> --options.o: options.c scrot.h getopt.h config.h structs.h debug.h \
> -+imlib.o: imlib.c scrot.h config.h structs.h debug.h options.h
> -+main.o: main.c scrot.h config.h structs.h debug.h options.h
> -+options.o: options.c scrot.h config.h structs.h debug.h \
> - options.h
> -
> - info-am:
> Index: patches/patch-src_main_c
> ===
> RCS file: patches/patch-src_main_c
> diff -N patches/patch-src_main_c
> --- patches/patch-src_main_c 8 Jul 2011 11:25:47 - 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,75 +0,0 @@
> -$OpenBSD: patch-src_main_c,v 1.2 2011/07/08 11:25:47 jasper Exp $
> src/main.c.orig Mon Jun 23 14:05:48 2003
> -+++ src/main.c Fri Jul 8 13:22:30 2011
> -@@ -426,28 +426,28 @@ im_printf(char *str, struct tm *tm,
> - switch (*c) {
> - case 'f':
> - if (filename_im)
> --strcat(ret, filename_im);
> -+strlcat(ret, filename_im, sizeof(ret));
> - break;
> -
Re: UPDATE: graphics/scrot
Stuart Henderson wrote: > giblib has been removed from WANTLIB but not from LIB_DEPENDS. > There would have been a warning during "make package". > > The autoconf-archive dep shouldn't be needed if using the supplied > configure script. Oh, I didn't see that there are more replies in this thread. I'll fix the remaining stuff the next days. Or we just take Theos initial diff and discuss about the other stuff later (if at all). Reg. the memset. I changed strcat to strlcat and couldn't see where new_title is null terminated, so I added the memset to safeguard this assumption. If we don't take the above and won't add pledge as well, then we're back at Theos initial diff. Best Regards, Stefan
[update] net/synapse -> 1.40.0
Hello, Here is a diff for net/synapse to upgrade to 1.40.0. This needs textproc/py-ijson to be imported first. Works for me on amd64 Best Regards smime.p7s Description: S/MIME Cryptographic Signature
Re: [new dependency] textproc/py-ijson 3.1.4
On 8/16/21 12:54 PM, Stuart Henderson wrote: On 2021/08/16 12:47, Renaud Allard wrote: On 8/16/21 12:23 PM, Stuart Henderson wrote: standard way of testing if the library is there. It probably just needs the include path setting. Here is a better version which doesn't give the error. py-ijson.tar.gz Description: application/gzip smime.p7s Description: S/MIME Cryptographic Signature
Re: UPDATE: graphics/scrot
Theo Buehler wrote:
> rsadowski, I think the X11BASE patch is worth considering.
>
> > I see that upstream now provides release tarballs which is much better.
> > So it's good to ditch the autoconf stuff and use MASTER_SITES.
>
> Probably some confusion in terminology, but what does autoconf have to
> do with release tarballs?
Nothing in general. But scrot in the tarball comes with a configure
file. Scrot in the github archive does not and you need to generate it
with autoconf.
> > +GH_ACCOUNT = resurrecting-open-source-projects
> > +GH_PROJECT = scrot
> > +GH_TAGNAME = 1.6
>
> From Makefile.template:
>
> # /releases/ -> preferred. ignore GH_*, just use MASTER_SITES and DISTNAME.
TIL.
> > ++ if(opt.exec) {
> > ++if (pledge("cpath exec prot_exec rpath stdio wpath proc", NULL) ==
> > -1) {
>
> This update should remain decoupled from adding pledge, IMO.
>
> I'm generally skeptical of ports pledges that add prot_exec (except for
> the monsters where it's unavoidable). Can this be reduced to something
> sane by hoisting whatever needs it? Also, please sort the promises to
> canonical order (roughly the order in the manual, look at what is done
> in base).
I took this over from an update solene@ made even earlier. I liked the
idea and pulled it in.
Unfortunately prot_exec is needed. Scrot immediately aborts without it.
I think adding pledge in ports is fine as long as it is simple enough to
maintain. But I'm fine with leaving it out as well.
> > -@@ -148,11 +149,11 @@ name_thumbnail(char *name)
> > +new_title = malloc(length);
> > ++ memset(new_title, 2, length);
>
> This doesn't look right at all.
Huh? The original patch sais:
+ memset(new_title, 0, length);
I had to bring it over manually to scrot 1.6... must have misstyped somehow.
Thanks for spotting it!
My version is evolving into your version with patches ;-)
Index: graphics/scrot/Makefile
===
RCS file: /cvs/ports/graphics/scrot/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- graphics/scrot/Makefile 12 Jul 2019 20:47:10 - 1.17
+++ graphics/scrot/Makefile 16 Aug 2021 16:18:15 -
@@ -2,25 +2,25 @@
COMMENT= commandline screen capture util
-DISTNAME= scrot-0.8
-REVISION = 4
-CATEGORIES=graphics
+V =1.6
+DISTNAME = scrot-${V}
-HOMEPAGE= http://www.linuxbrit.co.uk/scrot/
+CATEGORIES = graphics
-# BSD
-PERMIT_PACKAGE=Yes
+HOMEPAGE =
https://github.com/resurrecting-open-source-projects/scrot
+
+MASTER_SITES =
https://github.com/resurrecting-open-source-projects/scrot/releases/download/${DISTNAME}/
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
-WANTLIB= X11 Xext c freetype m z \
- giblib>=1 Imlib2>=1
+# BSD
+PERMIT_PACKAGE=Yes
-MASTER_SITES= http://www.linuxbrit.co.uk/downloads/
+# pledge
+WANTLIB = c Imlib2 X11 Xcomposite Xext Xfixes
-LIB_DEPENDS=devel/giblib \
+LIB_DEPENDS = devel/giblib \
graphics/imlib2
CONFIGURE_STYLE= gnu
-
-FAKE_FLAGS+= docsdir=${PREFIX}/share/doc/scrot/
.include
Index: graphics/scrot/distinfo
===
RCS file: /cvs/ports/graphics/scrot/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- graphics/scrot/distinfo 18 Jan 2015 03:14:14 - 1.4
+++ graphics/scrot/distinfo 16 Aug 2021 16:18:15 -
@@ -1,2 +1,2 @@
-SHA256 (scrot-0.8.tar.gz) = YT0c9STCtizjxl8SMupPBcfa8kjV6C/ypoksmAk5lPI=
-SIZE (scrot-0.8.tar.gz) = 74324
+SHA256 (scrot-1.6.tar.gz) = QvZNOPBOxTDItOva4EzOi2iTsvjTBic5HTkO3LqRcJA=
+SIZE (scrot-1.6.tar.gz) = 182032
Index: graphics/scrot/patches/patch-Makefile_am
===
RCS file: graphics/scrot/patches/patch-Makefile_am
diff -N graphics/scrot/patches/patch-Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -
+++ graphics/scrot/patches/patch-Makefile_am16 Aug 2021 16:18:15 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: Makefile.am
+--- Makefile.am.orig
Makefile.am
+@@ -31,8 +31,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign
+ # A list of all the files in the current directory which can be regenerated
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_LDFLAGS= -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
+-AM_CPPFLAGS = -I/usr/X11R6/include \
++AM_LDFLAGS= -L${X11BASE}/lib -L/usr/lib -L/usr/local/lib
++AM_CPPFLAGS = -I${X11BASE}/include \
+ $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I.
+
+ man_MANS = man/scrot.1
Index: graphics/scrot/patches/patch-src_Makefile_in
===
RCS file: graphics/scrot/patches/patch-src_Makefile_in
Re: UPDATE: graphics/scrot
giblib has been removed from WANTLIB but not from LIB_DEPENDS. There would have been a warning during "make package". The autoconf-archive dep shouldn't be needed if using the supplied configure script.
Re: UPDATE: graphics/scrot
On 2021/08/16 16:59, Theo Buehler wrote:
> rsadowski, I think the X11BASE patch is worth considering.
>
> > I see that upstream now provides release tarballs which is much better.
> > So it's good to ditch the autoconf stuff and use MASTER_SITES.
>
> Probably some confusion in terminology, but what does autoconf have to
> do with release tarballs?
Release tarballs normally have autoconf files generated (so use
CONFIGURE_STYLE=gnu rather than CONFIGURE_STYLE=autoconf or autoreconf
unless the input files need patching), whereas "tarball autogenerated from
git" usually don't. (Except sometimes they do!)
> > +GH_ACCOUNT = resurrecting-open-source-projects
> > +GH_PROJECT = scrot
> > +GH_TAGNAME = 1.6
>
> From Makefile.template:
>
> # /releases/ -> preferred. ignore GH_*, just use MASTER_SITES and DISTNAME.
Yes. Don't set GH_*, don't set DISTFILES, do set MASTER_SITES and DISTNAME.
If GH_* are set, MASTER_SITES should not be set. (Sometimes MASTER_SITES0 etc
might be set if multiple files are needed, but not in this case).
> > ++ if(opt.exec) {
> > ++if (pledge("cpath exec prot_exec rpath stdio wpath proc", NULL) ==
> > -1) {
>
> This update should remain decoupled from adding pledge, IMO.
Agreed.
> I'm generally skeptical of ports pledges that add prot_exec (except for
> the monsters where it's unavoidable). Can this be reduced to something
> sane by hoisting whatever needs it? Also, please sort the promises to
> canonical order (roughly the order in the manual, look at what is done
> in base).
Also agreed (and I'd really like to see an analysis of functions in the
code and in libraries called by the code to explain why the pledge is
correct... remember the pledge here doesn't just deal with scrot code,
it also deals with code in the libraries, e.g. c Imlib2 X11 Xcomposite
Xext Xfixes).
> > -@@ -148,11 +149,11 @@ name_thumbnail(char *name)
> > +new_title = malloc(length);
> > ++ memset(new_title, 2, length);
>
> This doesn't look right at all.
I think more bugs have been introduced than fixed by adding string handling
patches to ports..
Re: UPDATE: graphics/scrot
On Sun, Aug 15, 2021 at 06:13:39PM +0200, Rafael Sadowski wrote: > Looks like scrot has found a new home, so please find below a simple > update diff. Used on amd64 for a while. Works for me; I'm unsure if we really want to drop the strlcpy/strlcat patches. The code is rather scary with or without them, so they're probably more pain than what they're worth... > Index: patches/patch-src_options_c > === > RCS file: patches/patch-src_options_c > diff -N patches/patch-src_options_c > --- patches/patch-src_options_c 8 Jul 2011 11:25:47 - 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,26 +0,0 @@ > -$OpenBSD: patch-src_options_c,v 1.2 2011/07/08 11:25:47 jasper Exp $ > src/options.c.orig Mon Jun 23 14:09:08 2003 > -+++ src/options.cFri Jul 8 13:22:30 2011 > -@@ -141,6 +141,7 @@ name_thumbnail(char *name) > - > -length = strlen(name) + 7; > -new_title = gib_emalloc(length); > -+ memset(new_title, 0, sizeof(new_title)); This hunk didn't apply since gib_emalloc() was replaced with malloc(). I'm unsure what the patch actually fixed. Should this be changed to use calloc()? either way, ok
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2021/08/16 09:17:06 Modified files: lang/vala : Makefile distinfo Log message: update to vala-0.52.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/08/16 09:11:07 Modified files: textproc : Makefile Log message: +py-ijson,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/08/16 09:10:21 Log message: import textproc/py-ijson 3.1.4, from maintainer Renaud Allard Ijson is an iterative JSON parser with standard Python iterator interfaces. High level interfaces are provided to have ijson yield native Python objects out of a JSON stream located under a prefix and to iterate over object members. Some lower level interfaces are also available. C and pure-Python backends are available. dependency for an upcoming net/synapse update. ok sthen@ Status: Vendor Tag: rallard Release Tags: landry_20210816 N ports/textproc/py-ijson/Makefile N ports/textproc/py-ijson/distinfo N ports/textproc/py-ijson/pkg/DESCR N ports/textproc/py-ijson/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2021/08/16 09:07:09 Modified files: x11/gnome/eog : Makefile distinfo Log message: update to eog-40.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/08/16 09:00:15 Modified files: www/nextcloud_notify_push: Makefile crates.inc distinfo Log message: www/nextcloud_notify_push: update to 0.2.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2021/08/16 09:00:03 Modified files: x11/gnome/gjs : Makefile distinfo Log message: update to gjs-1.68.3
Re: UPDATE: graphics/scrot
rsadowski, I think the X11BASE patch is worth considering.
> I see that upstream now provides release tarballs which is much better.
> So it's good to ditch the autoconf stuff and use MASTER_SITES.
Probably some confusion in terminology, but what does autoconf have to
do with release tarballs?
> +GH_ACCOUNT = resurrecting-open-source-projects
> +GH_PROJECT = scrot
> +GH_TAGNAME = 1.6
>From Makefile.template:
# /releases/ -> preferred. ignore GH_*, just use MASTER_SITES and DISTNAME.
> ++ if(opt.exec) {
> ++if (pledge("cpath exec prot_exec rpath stdio wpath proc", NULL) == -1) {
This update should remain decoupled from adding pledge, IMO.
I'm generally skeptical of ports pledges that add prot_exec (except for
the monsters where it's unavoidable). Can this be reduced to something
sane by hoisting whatever needs it? Also, please sort the promises to
canonical order (roughly the order in the manual, look at what is done
in base).
> -@@ -148,11 +149,11 @@ name_thumbnail(char *name)
> +new_title = malloc(length);
> ++ memset(new_title, 2, length);
This doesn't look right at all.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/08/16 08:57:48 Modified files: security/py-tlsfuzzer: Makefile distinfo Log message: Update to tlsfuzzer 20210815
Re: [new dependency] textproc/py-ijson 3.1.4
On 8/16/21 12:23 PM, Stuart Henderson wrote: On 2021/08/16 11:19, Stuart Henderson wrote: On 2021/08/16 12:10, Renaud Allard wrote: Hello, Here is a port of python ijson library will be needed in future versions of net/synapse. Best Regards COMMENT needs expanding, please don't include CVS dirs ... gets some of these during build (though build does finish) /tmp/yajl_versionj7af_s6f.c:2:22: fatal error: 'yajl/yajl_version.h' file not found #include ^ 1 error generated. ... couple of errors in tests as-is, but adding MODPY_PYTEST=Yes gets them to work. ... possibly missing a dependency of some sort on libyajl? I tried with libyajl and with py-yajl (freshly ported) and I still get that error. When looking at ijson-3.1.4/setup.py, it seems they use a non standard way of testing if the library is there. BTW, synapse works fine even with the error. smime.p7s Description: S/MIME Cryptographic Signature
Re: [new dependency] textproc/py-ijson 3.1.4
On 2021/08/16 14:25, Renaud Allard wrote: > > > On 8/16/21 12:54 PM, Stuart Henderson wrote: > > On 2021/08/16 12:47, Renaud Allard wrote: > > > > > > > > > On 8/16/21 12:23 PM, Stuart Henderson wrote: > > > standard way of testing if the library is there. > > > > It probably just needs the include path setting. > > > > Here is a better version which doesn't give the error. Tweaked. This one is ok sthen@ to import py-ijson.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/08/16 08:29:11 Modified files: math/bc-gh : Makefile distinfo Log message: Update to bc-gh-5.0.1 Changelog: https://github.com/gavinhoward/bc/releases
[new dependency] textproc/py-ijson 3.1.4
Hello, Here is a port of python ijson library will be needed in future versions of net/synapse. Best Regards py-ijson.tar.gz Description: application/gzip smime.p7s Description: S/MIME Cryptographic Signature
Re: UPDATE: games/odamex to 0.9.3
On Fri, Aug 06, 2021 at 10:52:51AM +0100, Edd Barrett wrote: > Comments? OK? Any comments before I commit this? Thanks. -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
[update] geo/traccar -> 4.14
Hello,
Here is a quick diff for traccar 4.14.
One of the most important changes in this release is migration to local
dependencies for the original web app. It means that Traccar web app
doesn't require access to CDN. This should bring a small security
improvement and also explains the size of the diff.
Best Regards
Index: Makefile
===
RCS file: /cvs/ports/geo/traccar/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 5 Jun 2021 18:35:51 - 1.16
+++ Makefile 16 Aug 2021 08:40:27 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.16 2021/06/05 18:35:51 sthen Exp $
COMMENT = modern GPS tracking platform
-V = 4.13
+V = 4.14
PKGNAME = traccar-${V}
DISTNAME = traccar-other-${V}
EXTRACT_SUFX = .zip
Index: distinfo
===
RCS file: /cvs/ports/geo/traccar/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 5 Jun 2021 18:35:51 - 1.10
+++ distinfo 16 Aug 2021 08:40:27 -
@@ -1,2 +1,2 @@
-SHA256 (traccar-other-4.13.zip) = +6ctOhquILMvzMwV7GRXNwLqCj5PEvolTwDjjPgAMNM=
-SIZE (traccar-other-4.13.zip) = 74110664
+SHA256 (traccar-other-4.14.zip) = dBqftyCGpjXbbLX4hdxvmO1Sqev1MH1QhvN7GhCbCrM=
+SIZE (traccar-other-4.14.zip) = 79240444
Index: pkg/PLIST
===
RCS file: /cvs/ports/geo/traccar/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 5 Jun 2021 18:35:51 - 1.11
+++ pkg/PLIST 16 Aug 2021 08:40:27 -
@@ -26,7 +26,7 @@ share/traccar/conf/traccar.xml
@owner
@group
share/traccar/lib/
-share/traccar/lib/HikariCP-4.0.3.jar
+share/traccar/lib/HikariCP-5.0.0.jar
share/traccar/lib/activation-1.1.1.jar
share/traccar/lib/antlr-2.7.2.jar
share/traccar/lib/aopalliance-1.0.jar
@@ -36,9 +36,9 @@ share/traccar/lib/asm-analysis-9.1.jar
share/traccar/lib/asm-commons-9.1.jar
share/traccar/lib/asm-tree-9.1.jar
share/traccar/lib/asm-util-9.1.jar
-share/traccar/lib/aws-java-sdk-core-1.11.1030.jar
-share/traccar/lib/aws-java-sdk-sns-1.11.1030.jar
-share/traccar/lib/aws-java-sdk-sqs-1.11.1030.jar
+share/traccar/lib/aws-java-sdk-core-1.12.47.jar
+share/traccar/lib/aws-java-sdk-sns-1.12.47.jar
+share/traccar/lib/aws-java-sdk-sqs-1.12.47.jar
share/traccar/lib/cache-api-1.1.1.jar
share/traccar/lib/checker-qual-3.5.0.jar
share/traccar/lib/commons-beanutils-1.9.2.jar
@@ -69,25 +69,25 @@ share/traccar/lib/hk2-locator-2.6.1.jar
share/traccar/lib/hk2-utils-2.6.1.jar
share/traccar/lib/httpclient-4.5.13.jar
share/traccar/lib/httpcore-4.4.13.jar
-share/traccar/lib/ical4j-3.0.25.jar
+share/traccar/lib/ical4j-3.0.29.jar
share/traccar/lib/ion-java-1.0.2.jar
share/traccar/lib/j2objc-annotations-1.3.jar
-share/traccar/lib/jackson-annotations-2.12.2.jar
-share/traccar/lib/jackson-core-2.12.2.jar
-share/traccar/lib/jackson-databind-2.12.2.jar
-share/traccar/lib/jackson-dataformat-cbor-2.12.2.jar
-share/traccar/lib/jackson-datatype-jsr353-2.12.2.jar
-share/traccar/lib/jackson-jaxrs-base-2.12.2.jar
-share/traccar/lib/jackson-jaxrs-json-provider-2.12.2.jar
-share/traccar/lib/jackson-module-jaxb-annotations-2.12.2.jar
-share/traccar/lib/jakarta.activation-1.2.2.jar
-share/traccar/lib/jakarta.activation-api-1.2.2.jar
+share/traccar/lib/jackson-annotations-2.12.3.jar
+share/traccar/lib/jackson-core-2.12.3.jar
+share/traccar/lib/jackson-databind-2.12.3.jar
+share/traccar/lib/jackson-dataformat-cbor-2.12.3.jar
+share/traccar/lib/jackson-datatype-jsr353-2.12.3.jar
+share/traccar/lib/jackson-jaxrs-base-2.12.3.jar
+share/traccar/lib/jackson-jaxrs-json-provider-2.12.3.jar
+share/traccar/lib/jackson-module-jaxb-annotations-2.12.3.jar
+share/traccar/lib/jakarta.activation-2.0.1.jar
+share/traccar/lib/jakarta.activation-api-1.2.1.jar
share/traccar/lib/jakarta.annotation-api-1.3.5.jar
share/traccar/lib/jakarta.inject-2.6.1.jar
share/traccar/lib/jakarta.transaction-api-1.3.2.jar
share/traccar/lib/jakarta.validation-api-2.0.2.jar
share/traccar/lib/jakarta.ws.rs-api-2.1.6.jar
-share/traccar/lib/jakarta.xml.bind-api-2.3.3.jar
+share/traccar/lib/jakarta.xml.bind-api-3.0.1.jar
share/traccar/lib/javassist-3.25.0-GA.jar
share/traccar/lib/javax.activation-api-1.2.0.jar
share/traccar/lib/javax.inject-1.jar
@@ -95,8 +95,8 @@ share/traccar/lib/javax.json-1.1.4.jar
share/traccar/lib/javax.json-api-1.1.4.jar
share/traccar/lib/javax.mail-1.6.2.jar
share/traccar/lib/jaxb-api-2.3.1.jar
-share/traccar/lib/jaxb-core-2.3.0.1.jar
-share/traccar/lib/jaxb-impl-2.3.4.jar
+share/traccar/lib/jaxb-core-3.0.2.jar
+share/traccar/lib/jaxb-impl-3.0.2.jar
share/traccar/lib/jcl-over-slf4j-1.7.12.jar
share/traccar/lib/jersey-client-2.34.jar
share/traccar/lib/jersey-common-2.34.jar
@@ -106,64 +106,65 @@ share/traccar/lib/jersey-entity-filterin
share/traccar/lib/jersey-hk2-2.34.jar
share/traccar/lib/jersey-media-json-jackson-2.34.jar
share/traccar/lib/jersey-server-2.34.jar
Re: Teeworlds update - Teeworlds 0.7.5
Stefan Hagen wrote:
> Stefan Hagen wrote:
> > Stefan Hagen wrote:
> >>> Updated version below with the following changes:
> >>>
> >>> * dropped MESSAGE (outdated)
> >>> * dropped ONLY_FOR_ARCHS
> >>> * brought back your patch-src_base_detect_h which fixes BE archs
> >>> * put myself into the maintainer seat
Again with a small, non-functional correction:
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+FLAVORS= python3
+FLAVOR=python3
Index: games/teeworlds/Makefile
===
RCS file: /cvs/ports/games/teeworlds/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- games/teeworlds/Makefile23 Feb 2021 19:39:23 - 1.28
+++ games/teeworlds/Makefile16 Aug 2021 11:32:05 -
@@ -1,76 +1,59 @@
# $OpenBSD: Makefile,v 1.28 2021/02/23 19:39:23 sthen Exp $
-# Crashes on strict-alignment archs, see: src/base/system.c:164
-ONLY_FOR_ARCHS=amd64 i386 powerpc
-
COMMENT= platform game featuring buggers equipped with weapons
-V= 0.6.4
-DISTNAME= teeworlds-${V}-src
-PKGNAME= teeworlds-${V}
+V= 0.7.5
+GH_ACCOUNT=teeworlds
+GH_PROJECT=teeworlds
+GH_TAGNAME=${V}
+
CATEGORIES=games
-REVISION= 3
-HOMEPAGE= https://www.teeworlds.com/
+HOMEPAGE= https://www.teeworlds.com
+
+PKGNAME= ${GH_PROJECT}-${V}
+DISTNAME= ${PKGNAME}-src
-BAM_VERSION= 0.4.0
-BAM_WRKSRC=${WRKSRC}/bam-${BAM_VERSION}
+MAINTAINER=Stefan Hagen
-MASTER_SITES= https://downloads.teeworlds.com/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
+MASTER_SITES= https://github.com/teeworlds/teeworlds/releases/download/${V}/
+# maps repo without tags/releases on
https://github.com/teeworlds/teeworlds-maps
+# therefore hosted as archive on perso.pw
+MASTER_SITES0= http://distfiles-openbsd.perso.pw/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} teeworlds-data.tar.gz:0
# BSD-like
PERMIT_PACKAGE=Yes
-WANTLIB= GL GLU SDL X11 c freetype m pthread ${COMPILER_LIBCXX} wavpack z
+WANTLIB= GL SDL2 X11 c crypto freetype m pthread ${COMPILER_LIBCXX}
+WANTLIB+= wavpack z
COMPILER = base-clang ports-gcc
LIB_DEPENDS= audio/wavpack \
- devel/sdl
+ devel/sdl2
-MODULES= lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
+FLAVORS= python3
+FLAVOR=python3
+
+MODULES= devel/cmake lang/python
MODPY_RUNDEP= No
-SUBST_VARS=CC CXX CFLAGS CXXFLAGS X11BASE
+CONFIGURE_STYLE= cmake
+CONFIGURE_ARGS=-DPYTHON_EXECUTABLE="${MODPY_BIN}"
NO_TEST= Yes
+WRKSRC=${WRKDIR}/${DISTNAME}
+WRKDIST= ${WRKSRC}
+
# Give it a chance on ppc
CXXFLAGS+= -fsigned-char
-post-extract:
- @mv ${WRKDIR}/bam-${BAM_VERSION} ${BAM_WRKSRC}
-
-pre-configure:
- @${SUBST_CMD} ${WRKSRC}/src/engine/shared/storage.cpp \
- ${WRKSRC}/src/game/client/gameclient.cpp \
- ${WRKSRC}/scripts/build.py \
- ${WRKSRC}/scripts/compiler.py \
- ${WRKSRC}/scripts/font_installer.sh \
- ${WRKSRC}/scripts/make_src.py \
- ${WRKSRC}/bam.lua \
- ${WRKSRC}/configure.lua \
- ${BAM_WRKSRC}/make_unix.sh \
- ${BAM_WRKSRC}/src/driver_gcc.lua \
- ${BAM_WRKSRC}/src/base.lua
- # Make sure internal wavpack and zlib can't be picked up
- rm -rf ${WRKSRC}/src/engine/external/{wavpack,zlib}
- # Don't provide an extra copy of DejaVu
- rm -rf ${WRKSRC}/data/fonts
-
-# build bam executable - teeworlds own build system
-pre-build:
- cd ${BAM_WRKSRC} && /bin/sh -v make_unix.sh
-
-do-build:
- cd ${WRKSRC} && CC=${CC} ${BAM_WRKSRC}/bam -a -v release
wavpack=${LOCALBASE}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/teeworlds ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/teeworlds_srv ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/teeworlds
- cd ${WRKSRC}; tar cf - data | tar xf - -C ${PREFIX}/share/teeworlds
+post-install:
+ ${INSTALL_DATA_DIR} ${WRKDIST}/datasrc/maps
+ ${INSTALL_DATA_DIR} ${WRKDIST}/datasrc/maps
+ ${INSTALL_DATA} ${WRKDIR}/maps/* ${WRKDIST}/datasrc/maps/
+ ${INSTALL_DATA} ${WRKDIR}/languages/* ${WRKDIST}/datasrc/languages/
.include
Index: games/teeworlds/distinfo
===
RCS file: /cvs/ports/games/teeworlds/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- games/teeworlds/distinfo30 Nov 2016 18:17:03 - 1.6
+++ games/teeworlds/distinfo16 Aug 2021 11:32:05 -
@@ -1,4 +1,4 @@
-SHA256 (bam-0.4.0.tar.gz) = Xk5JILTSZdpYL2Z3TpseyN37513cAo+6hsEvaG6hjbM=
-SHA256 (teeworlds-0.6.4-src.tar.gz) =
wmHRnrsAtUUfqizrSnypRcrSrdSLBgRutDtAzMn9mOI=
-SIZE (bam-0.4.0.tar.gz) = 206780
-SIZE
Re: [new] net/lurch - OMEMO support for libpurple
Stuart Henderson wrote:
> On 2021/08/15 22:51, Stefan Hagen wrote:
> > Portcheck is happy, but make ports-lib-depends-check has issues:
> >
> > $ make port-lib-depends-check
> >
> > lurch-0.7.0-src(net/lurch):
> > Missing lib: jabber.0 (/usr/local/lib/purple-2/lurch.so) (NOT REACHABLE)
> > Extra: purple.7
> > *** Error 1 in target 'port-lib-depends-check' (ignored)
>
> That needs lib/purple-2/jabber in WANTLIB and net/pidgin,-libpurple in
> LIB_DEPENDS, it does not want purple in WANTLIB. check-lib-depends will
> still warn because it doesn't handle subdirectories properly.
Now that I know what to look for, I found the documentation in
library-specs(7).
> > $ ldd /usr/local/lib/purple-2/lurch.so | grep jabber
> > [...] /usr/local/lib/purple-2/libjabber.so.0.0
>
> Use objdump -p and look for NEEDED lines, ldd will show inter-library deps
> too which shouldn't be listed.
Good to know. Thanks.
Attached is the corrected port:
- updated WANTLIB
- added comment about portcheck + lib-depends-check errors
- fixed PKGNAME
- fixed some variables and tabs
I assume both errors are caused by the path in WANTLIB and can be ignored:
$ portcheck -N
hardcoded paths detected in Makefile, consider using SUBST_VARS and
TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE
net/lurch
$ make lib-depends-check
lurch-0.7.0(net/lurch):
Bogus WANTLIB: jabber.0 (/usr/local/lib/purple-2/lurch.so) (NOT REACHABLE)
Scanning: ok
*** Error 1 in /usr/ports/mystuff/net/lurch
(/usr/ports/infrastructure/mk/bsd.port.mk:2448 'lib-depends-check': @case
X${_DEPENDS_CACHE} in ...)
Best regards,
Stefan
lurch.tgz
Description: application/tar-gz
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Fri Aug 13 17:09:33 MDT 2021 Finished: Mon Aug 16 05:08:06 MDT 2021 Duration: 2 Days 11 hours 59 minutes Built using OpenBSD 6.9-current (GENERIC.MP) #943: Thu Aug 12 12:42:57 MDT 2021 Built 9692 packages Number of packages built each day: Aug 13: 5830 Aug 14: 2335 Aug 15: 1489 Aug 16: 38 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2021-08-13/summary.log Build failures: 30 http://build-failures.rhaalovely.net/sparc64/2021-08-13/audio/ncmpcpp.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/cad/dxf2gcode.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/devel/ruby-extlib.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/editors/calligra.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/emulators/openmsx.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/games/colobot/colobot.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/games/egoboo.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/games/godot.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/games/odamex.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/games/openxcom.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/games/stepmania.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/graphics/birdfont.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/graphics/enblend-enfuse.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/graphics/gmic.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/graphics/makehuman.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/lang/clazy.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/lang/fpc.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/math/veusz.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/multimedia/mkvtoolnix,no_x11.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/net/barrier.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/net/ntopng.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/net/pmacct,postgresql.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/productivity/gnucash.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/www/nextcloud_notify_push.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/x11/gnome/gjs.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/x11/kde-applications/kate.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/x11/kde-applications/kmix.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/x11/kde-applications/kompare.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/x11/kde-applications/rocs.log http://build-failures.rhaalovely.net/sparc64/2021-08-13/x11/qt5/docs,-html.log Recurrent failures: failures/audio/ncmpcpp.log failures/cad/dxf2gcode.log failures/editors/calligra.log failures/emulators/openmsx.log failures/games/colobot/colobot.log failures/games/egoboo.log failures/games/godot.log failures/games/odamex.log failures/games/openxcom.log failures/games/stepmania.log failures/graphics/birdfont.log failures/graphics/enblend-enfuse.log failures/graphics/gmic.log failures/graphics/makehuman.log failures/lang/clazy.log failures/math/veusz.log failures/multimedia/mkvtoolnix,no_x11.log failures/net/barrier.log failures/net/ntopng.log failures/net/pmacct,postgresql.log failures/productivity/gnucash.log failures/www/nextcloud_notify_push.log failures/x11/gnome/gjs.log failures/x11/kde-applications/kmix.log New failures: +failures/devel/ruby-extlib.log +failures/lang/fpc.log +failures/x11/kde-applications/kate.log +failures/x11/kde-applications/kompare.log +failures/x11/kde-applications/rocs.log +failures/x11/qt5/docs,-html.log Resolved failures: -failures/games/lwjgl.log -failures/graphics/krita.log -failures/net/gupnp/core.log Packages newly built: +audio/rhythmbox +fonts/mononoki +games/lwjgl +games/minecraft +graphics/krita +meta/mate,-extras +net/dleyna/connector-dbus +net/dleyna/core +net/dleyna/renderer +net/dleyna/server +net/gupnp/core +net/gupnp/dlna +net/gupnp/igd +net/gupnp/tools +x11/gnome/control-center +x11/gnome/grilo-plugins +x11/gnome/music +x11/gnome/online-miners +x11/gnome/photos +x11/gnome/totem +x11/mate/caja-extensions Packages not built this time: -devel/py-click -devel/py-click-log -devel/py-click-plugins -devel/py-click-threading -devel/py-spark-parser -devel/py-uncompyle6 -devel/py-xdis -devel/ruby-extlib -editors/kile -x11/kde-applications/kate -x11/kde-applications/kompare -x11/kde-applications/rocs -x11/krusader -x11/qt5/docs -x11/qt5/docs,-html -x11/qt5/docs,-qch
Re: [new dependency] textproc/py-ijson 3.1.4
On 2021/08/16 12:47, Renaud Allard wrote: > > > On 8/16/21 12:23 PM, Stuart Henderson wrote: > > On 2021/08/16 11:19, Stuart Henderson wrote: > > > On 2021/08/16 12:10, Renaud Allard wrote: > > > > Hello, > > > > > > > > Here is a port of python ijson library will be needed in future > > > > versions of > > > > net/synapse. > > > > > > > > Best Regards > > > > > > > > > > > > COMMENT needs expanding, please don't include CVS dirs > > > > > > > ... gets some of these during build (though build does finish) > > > > /tmp/yajl_versionj7af_s6f.c:2:22: fatal error: 'yajl/yajl_version.h' file > > not found > > #include > > ^ > > 1 error generated. > > > > > > ... couple of errors in tests as-is, but adding MODPY_PYTEST=Yes gets them > > to work. > > > > ... possibly missing a dependency of some sort on libyajl? > > > > > I tried with libyajl and with py-yajl (freshly ported) and I still get that > error. When looking at ijson-3.1.4/setup.py, it seems they use a non > standard way of testing if the library is there. It probably just needs the include path setting. > BTW, synapse works fine even with the error. >
Re: [new dependency] textproc/py-ijson 3.1.4
On 2021/08/16 11:19, Stuart Henderson wrote: > On 2021/08/16 12:10, Renaud Allard wrote: > > Hello, > > > > Here is a port of python ijson library will be needed in future versions of > > net/synapse. > > > > Best Regards > > > > COMMENT needs expanding, please don't include CVS dirs > ... gets some of these during build (though build does finish) /tmp/yajl_versionj7af_s6f.c:2:22: fatal error: 'yajl/yajl_version.h' file not found #include ^ 1 error generated. ... couple of errors in tests as-is, but adding MODPY_PYTEST=Yes gets them to work. ... possibly missing a dependency of some sort on libyajl?
Re: [new dependency] textproc/py-ijson 3.1.4
On 2021/08/16 12:10, Renaud Allard wrote: > Hello, > > Here is a port of python ijson library will be needed in future versions of > net/synapse. > > Best Regards COMMENT needs expanding, please don't include CVS dirs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/16 04:15:15 Modified files: graphics/libpano13: Makefile distinfo graphics/libpano13/patches: patch-CMakeLists_txt graphics/libpano13/pkg: PLIST Log message: update to libpano13-2.9.20
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/16 04:11:44 Modified files: net/py-curl: Makefile distinfo Removed files: net/py-curl/patches: patch-setup_py Log message: update to pycurl-7.44.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/16 04:11:38 Modified files: textproc/py-pygments: Makefile distinfo textproc/py-pygments/pkg: PLIST Log message: update to py3-pygments-2.10.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/08/16 04:09:10 Modified files: geo/traccar: Makefile distinfo geo/traccar/pkg: PLIST Log message: update to traccar-4.14, from maintainer
Re: NEW: security/py-hvac 0.10.6
On Mon, Aug 09, 2021 at 06:41:02PM +, Mikolaj Kucharski wrote:
> On Tue, Mar 23, 2021 at 10:53:08PM +, Mikolaj Kucharski wrote:
> > On Tue, Mar 23, 2021 at 10:25:13PM +, Stuart Henderson wrote:
> > >
> > > There don't seem to be any tests in the distribution, so TEST_DEPENDS
> > > doesn't make much sense?
> > >
> > > Port looks good to me but I have no way to test it.
> > >
> >
> > Dropped TEST_DEPENDS. I've used it with Ansible:
> >
> > bindpw: "{{ lookup('hashi_vault', 'secret=secret/... }}"
> >
> > to fetch secrets from Vault.
> >
>
> Updated to 0.11.0
>
>
> Information for inst:py3-hvac-0.11.0
>
> Comment:
> Python client library for Hashicorp Vault
>
> Description:
> HVAC allows accessing secrets stored in a Vault directly from
> Python code.
>
> An access token must be created first, using a separate tool
> like vault or vault-client.
>
> Maintainer: Mikolaj Kucharski
>
> WWW: https://github.com/hvac/hvac
>
Kind reminder. I've tested it with my own client script. It works here.
--
Regards,
Mikolaj
py-hvac-0.11.0.port.tgz
Description: application/tar-gz
Re: [new][help-needed] net/lurch - OMEMO support for libpurple
On 2021/08/16 10:32, Stuart Henderson wrote: > On 2021/08/15 22:51, Stefan Hagen wrote: > > Hi, > > > > I'm using this port for a while already, but I'm not able to fully fix > > it for submission. Some help would be appreciated. > > > > Portcheck is happy, but make ports-lib-depends-check has issues: > > > > $ make port-lib-depends-check > > > > lurch-0.7.0-src(net/lurch): Oh that package name is bogus too.
Re: [new][help-needed] net/lurch - OMEMO support for libpurple
On 2021/08/15 22:51, Stefan Hagen wrote: > Hi, > > I'm using this port for a while already, but I'm not able to fully fix > it for submission. Some help would be appreciated. > > Portcheck is happy, but make ports-lib-depends-check has issues: > > $ make port-lib-depends-check > > lurch-0.7.0-src(net/lurch): > Missing lib: jabber.0 (/usr/local/lib/purple-2/lurch.so) (NOT REACHABLE) > Extra: purple.7 > *** Error 1 in target 'port-lib-depends-check' (ignored) > > Can someone help me to read this error? That needs lib/purple-2/jabber in WANTLIB and net/pidgin,-libpurple in LIB_DEPENDS, it does not want purple in WANTLIB. check-lib-depends will still warn because it doesn't handle subdirectories properly. > $ ldd /usr/local/lib/purple-2/lurch.so | grep jabber > [...] /usr/local/lib/purple-2/libjabber.so.0.0 Use objdump -p and look for NEEDED lines, ldd will show inter-library deps too which shouldn't be listed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/08/16 02:29:20 Modified files: geo/qgis : Makefile distinfo Log message: geo/qgis: update to 3.20.2.
math/py-patsy: Update to 0.5.1
Hi, ports@:
Here is a patch for math/py-patsy to update to 0.5.1.
It build well and all 39 tests passed on amd64-current
system.
Cheers !
wenIndex: Makefile
===
RCS file: /cvs/ports/math/py-patsy/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile8 Oct 2020 20:34:52 - 1.8
+++ Makefile16 Aug 2021 08:17:43 -
@@ -2,16 +2,13 @@
COMMENT = Python package for describing statistical models
-MODPY_EGG_VERSION =0.4.1
+MODPY_EGG_VERSION =0.5.1
DISTNAME = patsy-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = math
-REVISION = 3
# BSD
PERMIT_PACKAGE = Yes
-
-EXTRACT_SUFX = .zip
MODULES = lang/python
Index: distinfo
===
RCS file: /cvs/ports/math/py-patsy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo24 Feb 2017 21:51:36 - 1.1.1.1
+++ distinfo16 Aug 2021 08:17:43 -
@@ -1,2 +1,2 @@
-SHA256 (patsy-0.4.1.zip) = 3BzCgARbDm5QwEcG/R4m0qAOpACqES+I6BQviLC309Q=
-SIZE (patsy-0.4.1.zip) = 425390
+SHA256 (patsy-0.5.1.tar.gz) = 8RXOxCAeFGXNWLmGawsOe5Qcqv7BKYaQV0Bb/lteOZE=
+SIZE (patsy-0.5.1.tar.gz) = 397623
graphics/py-seaborn: Update to 0.11.2
Hi,
Here is a patch for graphics/py-seaborn:
i) Update to 0.11.2
ii) Update RUN_DEPENDS
It build well on amd64-current system, 4 tests failed in
all 1000+ tests.
Cheers !
wenIndex: Makefile
===
RCS file: /cvs/ports/graphics/py-seaborn/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile21 Dec 2020 09:29:01 - 1.6
+++ Makefile16 Aug 2021 08:00:43 -
@@ -2,7 +2,7 @@
COMMENT = statistical data visualization
-MODPY_EGG_VERSION =0.11.1
+MODPY_EGG_VERSION =0.11.2
DISTNAME = seaborn-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -21,10 +21,10 @@ MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS =seaborn
-RUN_DEPENDS = graphics/py-matplotlib${MODPY_FLAVOR}>=2.2.0 \
- math/py-numpy${MODPY_FLAVOR}>=1.15.0 \
- math/py-pandas${MODPY_FLAVOR}>=0.23.0 \
- math/py-scipy${MODPY_FLAVOR}>=1.0.0
+RUN_DEPENDS = graphics/py-matplotlib${MODPY_FLAVOR}>=3.0 \
+ math/py-numpy${MODPY_FLAVOR}>=1.16.0 \
+ math/py-pandas${MODPY_FLAVOR}>=0.24.0 \
+ math/py-scipy${MODPY_FLAVOR}>=1.2.0
TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR}
Index: distinfo
===
RCS file: /cvs/ports/graphics/py-seaborn/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo21 Dec 2020 09:29:01 - 1.5
+++ distinfo16 Aug 2021 08:00:43 -
@@ -1,2 +1,2 @@
-SHA256 (seaborn-0.11.1.tar.gz) = ROeOrtk3xah/x6iSwymnzAkQYLZ+vR0NMGtEanS6Aa0=
-SIZE (seaborn-0.11.1.tar.gz) = 261397
+SHA256 (seaborn-0.11.2.tar.gz) = z0XpKG1Agmhkvg48Bm+YU2mCuvcBp8qjhlEXktYf9PY=
+SIZE (seaborn-0.11.2.tar.gz) = 268839
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/08/16 01:43:40 Modified files: graphics/opencv: Makefile distinfo graphics/opencv/patches: patch-modules_core_src_system_cpp graphics/opencv/pkg: PLIST-java PLIST-main Log message: Update opencv to 4.5.3 OK kevlo@
Re: New port: Gaupol subtitle editor
On Sun, Aug 15, 2021 at 12:21:45AM +0200, Stefan Hagen wrote: > Anindya Mukherjee wrote: > > On Sat, Aug 14, 2021 at 06:27:05PM +0200, Stefan Hagen wrote: > > > Anindya Mukherjee wrote: > > > > Ping > > > > > > > > On Tue, Feb 02, 2021 at 11:50:40AM +, Stuart Henderson wrote: > > > > > start COMMENT with lower-case please (unless it's a proper noun, > > > > > but that doesn't apply here). > > > > > > > > > > we are a bit busy fixing hundreds of ports for a forthcoming > > > > > clang update at the moment so it may take a while to get to it :) > > > > > > I reviewed this port. It works fine and it is a useful tool. > > > > > > Remarks: > > > - NO_TEST=Yes should be set when there are no regression tests > > > - pkg/DESCR mentions README.aeidon.md, which is nowhere to be found > > > > > > You can either install the file (to share/doc/), or link to the API > > > docs directly: https://otsaloma.io/gaupol/doc/api/aeidon.html > > > > > > But actually, I think we can omit the paragraph about aeidon. If we want > > > it to be used by other software, we should package it independently from > > > the GTK UI. Right now, it's only used by gaupol and so I would not give > > > it special treatment. > > > > Thanks a lot for reviewing the port. I have updated it following your > > suggestions above. Please have a look. > > Looks good to me. > > Thanks, > Stefan Thanks! Looking forward to getting it committed. Regards, Anindya
Re: chromium sound handling
On Wed, Aug 11, 2021 at 12:52:22AM -0500, Abel Abraham Camarillo Ojeda wrote: > > I'm not on my machine right now but I have seen this related with the video > display. A lot of times I put music then go away, after some minutes my > monitor turns off the screen, if I come back and move the mouse just so the > screen turns on again I ear my audio jump. Sometimes it just stops and have > to stop/pause song in mpd. But not related directly to mpd, have seen it > with chrome/Firefox also. Will share dmesg later when I'm on my machine. > Basically, the screen saver grabs the CPU for too long so the audio process can't make progress: it misses its deadline and the hardware plays a block of silence. If audio doesn't progress for too long, sndiod assumes there's a permanent error stops. There are few other code-paths, similar to the screen saver, that also may hurt audio, including freeing big amounts of memory (browsers do that).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/08/16 00:17:29 Modified files: mail/mozilla-thunderbird/pkg: Tag: OPENBSD_6_9 PLIST Log message: mail/mozilla-thunderbird: fix PLIST so that it packages, wetransfer feature was removed. reported by naddy@ and bowser at comcast dot net
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/08/16 00:16:59 Modified files: mail/mozilla-thunderbird/pkg: PLIST Log message: mail/mozilla-thunderbird: fix PLIST so that it packages, wetransfer feature was removed. reported by naddy@ and bowser at comcast dot net
