CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2020/08/22 20:59:00 Modified files: net/websocketd : Makefile distinfo Removed files: net/websocketd/patches: patch-version_go Log message: Bump websocketd to 0.3.1 - Switch to MODGO_MOD*. - Remove patch in favor of MODGO_LDFLAGS. OK kspillner@
回复: [NEW] devel/perltidy : Update to 20200822
Sorry, it should be [Update], not [NEW] wen 发件人: owner-po...@openbsd.org 代表 wen heping 发送时间: 2020年8月23日 7:55 收件人: ports@openbsd.org 主题: [NEW] devel/perltidy : Update to 20200822 Hi, ports@: Here is a simple patch for devel/perltidy to update to 20200822. It build well and pass all tests on amd64-current system, its only dependence(devel/p5-Perl-Critic) too. Cheers ! wen
[NEW] devel/perltidy : Update to 20200822
Hi, ports@: Here is a simple patch for devel/perltidy to update to 20200822. It build well and pass all tests on amd64-current system, its only dependence(devel/p5-Perl-Critic) too. Cheers ! wen Index: Makefile === RCS file: /cvs/ports/devel/perltidy/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile6 Jun 2020 20:22:47 - 1.26 +++ Makefile22 Aug 2020 23:50:00 - @@ -2,7 +2,7 @@ COMMENT = tool to indent and reformat perl scripts -V =20200110 +V =20200822 DISTNAME = Perl-Tidy-$V PKGNAME = perltidy-$V CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/perltidy/distinfo,v retrieving revision 1.20 diff -u -p -r1.20 distinfo --- distinfo6 Jun 2020 20:22:47 - 1.20 +++ distinfo22 Aug 2020 23:50:00 - @@ -1,2 +1,2 @@ -SHA256 (Perl-Tidy-20200110.tar.gz) = yME6uI9CQJ1BmZPUiLjcfPSgLVA00wN8qFn7k7GOgIY= -SIZE (Perl-Tidy-20200110.tar.gz) = 611243 +SHA256 (Perl-Tidy-20200822.tar.gz) = dXrAe+xZcHhFmVqq+7RLZkEg9XhQzpMrwx8tleDF3zY= +SIZE (Perl-Tidy-20200822.tar.gz) = 657209
Re: emacs-27.1
Jeremie Courreges-Anglas writes:
> emacs-27.1 was released earlier than I expected, thanks Ken for the
> heads-up.
>
> This is good news. As mentioned in
> https://marc.info/?l=openbsd-ports=159380829911290=2 emacs now uses
> a "portable dumper" that doesn't involve games with ELF layout and sbrk
> at build time. No more ld -Z or -nopie flags hampering ASLR, no more
> workarounds in libc, etc.
>
> A few changes regarding deps:
> - libgmp is now a direct dep used for bignums, it was already there
> because of gnutls
> - libjansson is now linked in for LSP (Language Server Protocol) support
> (requested by Timo Myyra). Yes, this introduce an indirect build dep
> on cmake which kinda sucks for non-clang archs. If that's a problem,
> well, it was already the case because emacs->gnutls->cmocka->cmake->argh.
> - harfbuzz is used for test layout
> - bye bye ImageMagick
>
> If you notice changes with highlighting, particularly with vc-diff, well
> you're not alone. I find that some foreground and background color
> changes (maybe not intended) make the resulting frames very hard to
> read. But maybe just in the no_x11/tty case?
vc-diff looks very hard to read now in no_x11. Some deleted lines are
highlighted and some are not, clashing with the highlighted lines of
additions. Even graphical emacs made vc-diff harder to read a bit with -
and + being red and green to blend in with the highlighted line. Strings
and variables now have colors, too.
>
> Anyway, test reports welcome. Even if the new dumping mechanism is
> called "portable" I'm not sure it has been tested on the wide range of
> architectures we provide. amd64 and sparc64 seem to behave, what about
> yours?
I tested the amd64 athena flavor. I tested org-mode, vc-diff, gnus and
rcirc. Org-mode changed a keybinding for https://orgmode.org/manual/Structure-Templates.html
Thank you for the update.
>
> Finally, oks?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.95
> diff -u -p -r1.95 Makefile
> --- Makefile 3 Jul 2020 17:05:14 - 1.95
> +++ Makefile 14 Aug 2020 07:36:48 -
> @@ -2,8 +2,7 @@
>
> COMMENT= GNU editor: extensible, customizable, self-documenting
>
> -VERSION= 26.3
> -REVISION=2
> +VERSION= 27.1
> DISTNAME=emacs-${VERSION}
>
> CATEGORIES= editors
> @@ -13,9 +12,9 @@ HOMEPAGE= https://www.gnu.org/software/
> MAINTAINER= Jeremie Courreges-Anglas
>
> # GPLv3+
> -PERMIT_PACKAGE= Yes
> +PERMIT_PACKAGE= Yes
>
> -WANTLIB= c m curses pthread gnutls xml2 z
> +WANTLIB =c curses jansson gmp gnutls m pthread xml2 z
>
> MASTER_SITES=${MASTER_SITE_GNU:=emacs/}
> EXTRACT_SUFX=.tar.xz
> @@ -33,18 +32,8 @@ CONFIGURE_ARGS=--build="${GCCARCH}" \
> --without-sound
>
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib -nopie ${LDFLAGS}" \
> + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
> ac_cv_header_execinfo_h=no
> -CFLAGS+= -fno-pie
> -
> -.include
> -.if ${PROPERTIES:Mlld}
> -# ld -Z not supported
> -.elif ${MACHINE_ARCH} == "sparc64"
> -# No need for ld -Z
> -.else
> -CONFIGURE_ENV+= EMACS_LD_SWITCH_SYSTEM="-Z"
> -.endif
>
> MAKE_ENV=INSTALL_EMACS="${INSTALL_SCRIPT}" \
> LOGNAME="${SHAREOWN}"
> @@ -52,24 +41,27 @@ MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRI
> SUBST_VARS= GCCARCH VERSION
>
> USE_GMAKE= Yes
> -LIB_DEPENDS= security/gnutls \
> +LIB_DEPENDS= devel/jansson \
> + devel/gmp \
> + security/gnutls \
> textproc/libxml
>
> .if ${FLAVOR} == "no_x11"
> CONFIGURE_ARGS+= --without-x \
> --without-dbus \
> --without-gsettings \
> + --without-harfbuzz \
> --without-jpeg \
> --without-lcms2 \
> --without-libotf \
> --without-m17n-flt
> .else
> -LIB_DEPENDS+=devel/libotf \
> +LIB_DEPENDS+=devel/harfbuzz \
> + devel/libotf \
> graphics/jpeg \
> graphics/png \
> graphics/tiff \
> graphics/giflib \
> - graphics/ImageMagick \
> graphics/lcms2 \
> misc/m17n/lib \
> x11/dbus \
> @@ -80,30 +72,29 @@ RUN_DEPENDS+= devel/desktop-file-utils
> . if ${FLAVOR} == "athena"
> CONFIGURE_ARGS+= --with-x-toolkit=athena
> LIB_DEPENDS+=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2020/08/22 17:20:56 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Remove go-xlsx and go-check-v1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2020/08/22 17:05:34 Removed files: devel/go-check-v1: Makefile distinfo devel/go-check-v1/pkg: DESCR PLIST Log message: Remove go-check-v1 as nothing is using it. OK naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2020/08/22 17:02:54 Modified files: devel : Makefile Log message: - go-check-v1
Re: Hacking cabal v2-build stuff together
Greg Steuck writes:
> I took this a bit further and I get a working devel/happy package now.
>
> This is still a complete WIP but I wanted to get some early feedback on
> the implementation choices as this is my first foray into port-modules.
Converting devel/alex is straightforward which further validates the
approach (though still doesn't touch any of the existing limitations).
>From 6e1020d085e778f65dc672ee356e26d129e5d174 Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Sat, 22 Aug 2020 15:27:27 -0700
Subject: [PATCH] Use devel/cabal module for devel/alex
---
devel/alex/Makefile | 23 +++
devel/alex/distinfo | 4 ++--
devel/alex/pkg/PLIST | 5 -
devel/cabal/cabal.port.mk | 4 ++--
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git devel/alex/Makefile devel/alex/Makefile
index 7b8b5d667a3..d72571f1be2 100644
--- devel/alex/Makefile
+++ devel/alex/Makefile
@@ -2,13 +2,8 @@
COMMENT = lexical analyser generator for Haskell
-# Dependency of meta/haskell-platform.
-# Please do *not* update without thinking.
-PORTROACH = ignore:1
-
-DISTNAME = alex-3.1.7
+DISTNAME = alex-3.2.5
CATEGORIES = devel
-REVISION = 0
HOMEPAGE = http://www.haskell.org/alex/
@@ -17,8 +12,10 @@ PERMIT_PACKAGE = Yes
WANTLIB = c charset ffi gmp iconv m pthread util
-MODULES = lang/ghc
-MODGHC_BUILD = cabal hackage nort
+MODULES = devel/cabal
+MODCABAL_EXECUTABLES= alex
+MODCABAL_BUILD= hackage
+MODCABAL_DATA_DIRS= data
LIB_DEPENDS = converters/libiconv \
devel/gmp \
@@ -31,8 +28,7 @@ AUTOCONF_VERSION = 2.61
AUTOCONF_DIR = ${WRKSRC}/doc
WRKCONF = ${AUTOCONF_DIR}
-BUILD_DEPENDS += devel/hs-QuickCheck>=2 \
- textproc/docbook-xsl
+BUILD_DEPENDS += textproc/docbook-xsl
post-build:
@cd ${WRKBUILD}/doc && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
@@ -42,7 +38,10 @@ post-install:
cd ${WRKBUILD}/doc && umask 022 && pax -rw alex ${PREFIX}/share/doc
do-test:
- cd ${WRKBUILD}/tests && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
- all
+ cd ${WRKBUILD}/tests && exec ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} ALEX=${MODCABAL_BUILT_EXECUTABLE_alex} \
+ TEST_ALEX_OPTS=--template=../data \
+ -j ${MAKE_JOBS} all
+
.include
diff --git devel/alex/distinfo devel/alex/distinfo
index d3ce2e457cf..0dbe0647154 100644
--- devel/alex/distinfo
+++ devel/alex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ghc/alex-3.1.7.tar.gz) = iaGhPabMvrAGSI2VdDguiRz3wFZ3UrMwzIYW10i/KNE=
-SIZE (ghc/alex-3.1.7.tar.gz) = 103624
+SHA256 (hackage/alex-3.2.5.tar.gz) = t3yKEnB2fGTirbIabpHufNkEuhftrhe8IP0D2lJW4OM=
+SIZE (hackage/alex-3.2.5.tar.gz) = 108531
diff --git devel/alex/pkg/PLIST devel/alex/pkg/PLIST
index 2e8e08fd666..e128b76c59d 100644
--- devel/alex/pkg/PLIST
+++ devel/alex/pkg/PLIST
@@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.6 2013/07/18 21:58:00 kili Exp $
-@bin bin/alex
+bin/alex
+libexec/cabal/
+@bin libexec/cabal/alex
share/${DISTNAME}/
share/${DISTNAME}/AlexTemplate
share/${DISTNAME}/AlexTemplate-debug
@@ -35,4 +37,5 @@ share/doc/alex/relnotes-20.html
share/doc/alex/relnotes-210.html
share/doc/alex/relnotes-22.html
share/doc/alex/syntax.html
+share/doc/alex/types.html
share/doc/alex/wrappers.html
diff --git devel/cabal/cabal.port.mk devel/cabal/cabal.port.mk
index d48c4a29c14..292e3773f94 100644
--- devel/cabal/cabal.port.mk
+++ devel/cabal/cabal.port.mk
@@ -40,14 +40,14 @@ MODCABAL_post-extract += \
.endfor
.endif
-CABAL = ${SETENV} ${MAKE_ENV} HOME=${_MODCABAL_HOME} ${LOCALBASE}/bin/cabal
+MODCABAL_CABAL = ${SETENV} ${MAKE_ENV} HOME=${_MODCABAL_HOME} ${LOCALBASE}/bin/cabal
MODCABAL_BUILD_ARGS = --datadir=${PREFIX}/share/${PKGNAME}
_MODCABAL_BUILD_TARGETS ?= ${MODCABAL_EXECUTABLES:C/^/exe:&/}
MODCABAL_BUILD_TARGET = \
cd ${WRKBUILD} \
- && ${CABAL} v2-build --offline --disable-benchmarks --disable-tests \
+ && ${MODCABAL_CABAL} v2-build --offline --disable-benchmarks --disable-tests \
--flags "${MODCABAL_FLAGS}" ${MODCABAL_BUILD_ARGS} ${MODCABAL_BUILD_TARGETS}
_MODCABAL_LIBEXEC = libexec/cabal
--
2.28.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2020/08/22 16:33:57 Modified files: devel/fossil : Makefile distinfo Log message: Update fossil to 2.12.1 Includes a client-side security fix.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2020/08/22 16:08:55 Removed files: textproc/go-xlsx: Makefile distinfo textproc/go-xlsx/pkg: DESCR PLIST Log message: Remove go-xlsx as it is no longer used by anything. OK kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2020/08/22 16:07:22 Modified files: textproc : Makefile Log message: - go-xlsx
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/08/22 16:06:01 Modified files: devel/py-llvmlite: Makefile Log message: Mark BROKEN: requires update to 0.34.0 for LLVM 10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2020/08/22 16:04:27 Modified files: textproc/xlsx2csv: Makefile distinfo Log message: Bump xlsx2csv to 20200427211949. OK kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2020/08/22 15:27:01 Modified files: net/syncthing : Makefile distinfo net/syncthing/patches: patch-build_go Log message: Update Syncthing to version 1.9.0rc4. I wouldn't normally reccommend updating a port to a release candidate, but Syncthing has been broken ever since the golang 1.15beta1 update, and this version unbreaks it for us. Details here: https://forum.syncthing.net/t/syncthing-broken-by-go-1-15-quic/15467/13 OK abieber@, thanks!
Re: Hacking cabal v2-build stuff together
I took this a bit further and I get a working devel/happy package now.
This is still a complete WIP but I wanted to get some early feedback on
the implementation choices as this is my first foray into port-modules.
The patch is currently tested on top of a bunch of hacked ghc-8.10 and
cabal-3.4 patches. I'll have to figure out if there's a way to go back
to ghc-8.6 and cabal-2.4.
Thanks
Greg
>From 44e3d9a1b52ffd5ef6ff327d929fe22977c77082 Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Thu, 20 Aug 2020 11:54:08 -0700
Subject: [PATCH] Build devel/happy with cabal v2-install
Passes `make test` and produces a package good enough for ghc build.
---
devel/cabal/cabal.port.mk | 92 +++
devel/happy/Makefile | 15 ---
devel/happy/distinfo | 4 +-
devel/happy/pkg/PLIST | 4 +-
4 files changed, 105 insertions(+), 10 deletions(-)
create mode 100644 devel/cabal/cabal.port.mk
diff --git devel/cabal/cabal.port.mk devel/cabal/cabal.port.mk
new file mode 100644
index 000..d48c4a29c14
--- /dev/null
+++ devel/cabal/cabal.port.mk
@@ -0,0 +1,92 @@
+# $OpenBSD$
+
+# Module for building Haskell programs with cabal-install.
+# Inspired by FreeBSD cabal.mk by Gleb Popov.
+
+ONLY_FOR_ARCHS = i386 amd64
+
+BUILD_DEPENDS+= devel/cabal \
+ lang/ghc
+
+.if ${MODCABAL_BUILD:L:Mhackage}
+MODGHC_HACKAGE_NAME = ${DISTNAME:C,-[0-9.]*$,,}
+MODGHC_HACKAGE_VERSION = ${DISTNAME:C,.*-([0-9.]*)$,\1,}
+HOMEPAGE ?= https://hackage.haskell.org/package/${MODGHC_HACKAGE_NAME}
+MASTER_SITES = https://hackage.haskell.org/package/${DISTNAME}/
+SUBST_VARS += DISTNAME MODGHC_HACKAGE_VERSION
+.endif
+
+MASTER_SITES0 = https://hackage.haskell.org/package/
+DIST_SUBDIR ?= hackage
+
+_MODCABAL_HOME=${WRKSRC}
+
+MODCABAL_post-extract = \
+ mkdir -p ${_MODCABAL_HOME}/.cabal \
+ && touch ${_MODCABAL_HOME}/.cabal/config
+
+.if defined(MODCABAL_MANIFEST)
+
+.for package version revision in ${MODCABAL_MANIFEST}
+DISTFILES += {${package}-${version}/}${package}-${version}.tar.gz:0
+DISTFILES += ${package}-${version}_${revision}{${package}-${version}/revision/${revision}}.cabal:0
+.endfor
+
+
+MODCABAL_post-extract += \
+.for package version revision in ${MODCABAL_MANIFEST}
+ && tar zxf ${FULLDISTDIR}/${package}-${version}.tar.gz -C ${WRKBUILD} \
+ && ln -s ${FULLDISTDIR}/${package}-${version}_${revision}.cabal ${WRKBUILD}/_build/tarballs/${package}.cabal \
+.endfor
+.endif
+
+CABAL = ${SETENV} ${MAKE_ENV} HOME=${_MODCABAL_HOME} ${LOCALBASE}/bin/cabal
+
+MODCABAL_BUILD_ARGS = --datadir=${PREFIX}/share/${PKGNAME}
+_MODCABAL_BUILD_TARGETS ?= ${MODCABAL_EXECUTABLES:C/^/exe:&/}
+
+MODCABAL_BUILD_TARGET = \
+ cd ${WRKBUILD} \
+ && ${CABAL} v2-build --offline --disable-benchmarks --disable-tests \
+ --flags "${MODCABAL_FLAGS}" ${MODCABAL_BUILD_ARGS} ${MODCABAL_BUILD_TARGETS}
+
+_MODCABAL_LIBEXEC = libexec/cabal
+MODCABAL_INSTALL_TARGET = \
+ mkdir -p ${PREFIX}/${_MODCABAL_LIBEXEC}
+
+.for data in ${MODCABAL_DATA_DIRS}
+MODCABAL_INSTALL_TARGET += \
+ && ${INSTALL_DATA_DIR} ${WRKSRC}/${data} ${PREFIX}/share/${DISTNAME} \
+ && cd ${WRKSRC}/${data} && umask 022 && pax -rw . ${PREFIX}/share/${DISTNAME}
+.endfor
+
+.for exe in ${MODCABAL_EXECUTABLES}
+
+# Exports the paths to executables for testing.
+MODCABAL_BUILT_EXECUTABLE_${exe} = $$(find ${WRKSRC}/dist-newstyle -name ${exe} -type f -perm -a+x)
+
+.for data in ${MODCABAL_DATA_DIRS}
+_MODCABAL_EXPORTS += \
+ && echo 'export ${exe}_datadir=${LOCALBASE}/share/${DISTNAME}' >> ${PREFIX}/bin/${exe}
+.endfor
+
+MODCABAL_INSTALL_TARGET += \
+ && ${INSTALL_PROGRAM} \
+ ${MODCABAL_BUILT_EXECUTABLE_${exe}} \
+ ${PREFIX}/${_MODCABAL_LIBEXEC}/${exe} \
+ && echo '\#!/bin/sh' > ${PREFIX}/bin/${exe} \
+ ${_MODCABAL_EXPORTS} \
+ && echo 'exec ${LOCALBASE}/${_MODCABAL_LIBEXEC}/${exe} "$$@"' >> ${PREFIX}/bin/${exe} \
+ && chmod +x ${STAGEDIR}${PREFIX}/bin/${exe}
+.endfor
+
+
+.if !target(do-build)
+do-build:
+ @${MODCABAL_BUILD_TARGET}
+.endif
+
+.if !target(do-install)
+do-install:
+ @${MODCABAL_INSTALL_TARGET}
+.endif
diff --git devel/happy/Makefile devel/happy/Makefile
index 341a5ba2d73..8e1bede8bc3 100644
--- devel/happy/Makefile
+++ devel/happy/Makefile
@@ -2,9 +2,7 @@
COMMENT= parser generator for Haskell
-PORTROACH = ignore:1
-
-DISTNAME= happy-1.19.10
+DISTNAME= happy-1.19.12
CATEGORIES= devel
HOMEPAGE= http://www.haskell.org/happy/
@@ -14,8 +12,11 @@ PERMIT_PACKAGE= Yes
WANTLIB= c ffi gmp iconv m pthread
-MODULES= lang/ghc
-MODGHC_BUILD= cabal hackage nort
+MODULES= devel/cabal
+
+MODCABAL_EXECUTABLES= happy
+MODCABAL_BUILD= hackage
+MODCABAL_DATA_DIRS= data
LIB_DEPENDS= converters/libiconv \
devel/gmp \
@@ -40,7 +41,7 @@ post-install:
do-test:
@cd ${WRKBUILD}/tests && exec ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} HAPPY=${WRKBUILD}/dist/build/happy/happy \
- TEST_HAPPY_OPTS="-t ${WRKBUILD} --strict"
+ ${MAKE_PROGRAM} -j${MAKE_JOBS} HAPPY=${MODCABAL_BUILT_EXECUTABLE_happy} \
+ TEST_HAPPY_OPTS="-t
IPv4/TCPv4 invalid checksum even though checksum-validation = yes
Hi *,
I am running suricata in inline-mode on an openbsd router running -current.
$ pf.conf <- strongly simplified
.
.
.
pass out quick on <...> divert-packet port 700 tag "toBeProcessed" ! tagged
"toBeProcessed"
.
.
.
pass out tagged "toBeProcessed"
.
.
.
EOF
Yes I set checksum-validation to "yes" in suricata.yaml. I'am seeing large
amounts of the following warnings in
fast.log.
08/19/2020-22:45:47.670958 [**] [1:2200073:2] SURICATA IPv4 invalid checksum
[**] [Classification: Generic Protocol
Command Decode] [Priority: 3] {TCP} <...>
08/19/2020-22:45:47.670958 [**] [1:2200074:2] SURICATA TCPv4 invalid checksum
[**] [Classification: Generic Protocol
Command Decode] [Priority: 3] {TCP} <...>
08/19/2020-22:45:47.671381 [**] [1:2200073:2] SURICATA IPv4 invalid checksum
[**] [Classification: Generic Protocol
Command Decode] [Priority: 3] {TCP} <...>
08/19/2020-22:45:47.671381 [**] [1:2200074:2] SURICATA TCPv4 invalid checksum
[**] [Classification: Generic Protocol
Command Decode] [Priority: 3] {TCP} <...>
Is this wanted behavior ? Because it feels like there's something not quite
right about it. Especially whilst running an
application via tor.
Best regards,
Stephan
Re: NEW: net/i2p
On Sat, August 22, 2020 15:57, Solene Rapenne wrote: > On Sat, 22 Aug 2020 14:59:11 - > "Dimitri Karamazov" : > > >> Ping, is there nobody with time to review this? >> >> >> On Sun, August 16, 2020 09:57, Dimitri Karamazov wrote: >> >>> Ping >>> >>> >>> >>> On Sun, August 09, 2020 09:55, Dimitri Karamazov wrote: >>> >>> Ping On Sun, August 2, 2020 18:44, Dimitri Karamazov wrote: > I2P software bundle, includes the standard I2P implementation. > https://geti2p.net/ > > > > > > About: > *I2P is an anonymous overlay network - a network within a network. > *It is intended to protect communication from dragnet surveillance > and monitoring by third parties such as ISPs. *Is decentralised > completely unlike tor. Each client routes > anonymous and encrypted traffic from other clients by default. No central > directory for routing. > *I2P incorporates applications in the form of webapps. > *Webapps plugins (*.su3) can be loaded easily through the console. > *Includes a ready mail(smtp pop3) client, i2psnark (bittorrent) client, > and Jetty (webserver). > Or host with your own webserver. > *Allows anonymous chats through IRC tunnel service. > *Plugins for blogging, chatting, file sharing have already been written. > *Every service(plugin) works within the i2p network itself(Except mail). > *Not supposed to be used as an outproxy, still an outproxy is included. > *I2P source code includes a java-service-wrapper compiled for specific > targets > but is not compatible with OpenBSD. So I've included a new port > tanukiwrapper, and configured I2P to use it. > *Very exhaustive(functionality) but easy to use router console. > > > > > > Testing: > *Run the rc service, point browser to localhost:7657. > *Set HTTP proxy to localhost: to view eepsites. > https://geti2p.net/en/about/browser-config > *Been running the router for a week now, with no problems. > *Personally tested the default and external plugins(e.g muwire). > *Test dependencies not present in ports, will add to it. > *Mount separate partition for /var/i2p if you do heavy transfers. > > > > > > Index: user.list > === > RCS file: /cvs/ports/infrastructure/db/user.list,v > retrieving revision 1.371 diff -u -p -r1.371 user.list --- user.list > 12 Jun 2020 11:27:08 - 1.371 +++ > user.list 2 Aug 2020 18:16:51 - @@ -366,3 +366,4 @@ id user > group port > 855 _repro_repro telephony/resiprocate > 856 _return _return telephony/resiprocate > 857 _web2ldap _web2ldap sysutils/web2ldap > +858 _i2p _i2pnet/i2p > > > > > > Any comments? > > > >>> >>> >> >> > > Hi, I plan to review it but I currently have no time. > > There will be a new release on 24th August according to upstream discussion. I'll post again.
NEW: net/kdsoap
I need kdsoap to update KDE applications to 20.08.0. OK? Information for inst:kdsoap-1.9.0 Comment: Qt-based client-side and server-side SOAP component Description: KD Soap is a Qt-based client-side and server-side SOAP component. It can be used to create client applications for web services and also provides the means to create web services without the need for any further component such as a dedicated web server. KD Soap targets C++ programmers who use Qt in their applications. Maintainer: The OpenBSD ports mailing-list WWW: https://www.kdab.com/development-resources/qt-tools/kd-soap/ kdsoap-1.9.0.tar.gz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/08/22 14:11:53 Modified files: productivity/aqbanking: Makefile Log message: update master site URL; it changes for each distfile
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: tra...@cvs.openbsd.org 2020/08/22 13:15:24 Modified files: devel/arduino-esp8266: Makefile distinfo Log message: Update to 2.7.4. ok km@ benoit@ kmos@
Re: VAAPI ports
On Sat, Aug 22, 2020 at 09:13:51PM +0200, Luca De Pandis wrote: > On Sat, Aug 22, 2020 at 02:11:34PM -0400, Bryan Steele wrote: > > On Sat, Aug 22, 2020 at 07:35:47PM +0200, Luca De Pandis wrote: > > > Hi everyone, > > > I'm Luca De Pandis and I'm an OpenBSD user since March. > > > > > > I'd like to contribute to the project since I'm using it everyday, so I > > > decided to work on porting the VAAPI stack on OpenBSD. > > > > > > Before submitting I checked with portcheck and make > > > ports-lib-depends-check for errors or things I could improve to make the > > > ports as compliant as possible. Still, as they are my first attempt to > > > port something I'd like to receive your feedbacks about them. > > > > > > Since I need for VAAPI to get hw acceleration on mpv I wouldn't mind to > > > step up as a maintainer for these ports. > > > > > > Also, I wrote some patches, but I'm not as proficient in C as I would. So > > > I'm counting on your feedbacks if there are some things I could do > > > better in that regard as well. > > > > > > > > > Best regards, > > > Luca De Pandis > > > > Hi Luca, > > > > This has come up before last year [0], and the conclusion was that this > > needed to be a part of xenocara [1] as Mesa needs to be compiled with > > '--enable-va' to have working r600/radeonsi gallium drivers [2]. > > > > The original work was done by Brad DeMorrow and Jonathan Gray had > > picked it up after that, not sure what the status is now. I had it > > working on my Radeon HD 7450 along with a modified ffmpeg port with > > Brad's original ports and recompiled Mesa. > > > > Having support for video encode/decode offloading would be nice, > > especially on lower power CPUs. > > > > -Bryan. > > > > [0] https://marc.info/?l=openbsd-ports=157626463822587=2 > > [1] https://marc.info/?l=openbsd-tech=157676527322944=2 > > [2] https://marc.info/?l=openbsd-ports=157638698722892=2 > Hi Bryan, > no problem at all. > > I just submitted them because I need hwdec on my Intel hardware to > reduce frame dropping. If they are going to be part of base, that's even > better! > > Right now I'm focusing on porting the newest intel-media-driver for >= > Broadwell CPUs (in this archive I only ported the old > intel-vaapi-driver). > > If I can be of any help about the integration of VAAPI, just let me > know. :-) > > > Best regards, > Luca De Pandis >From a ports perspective quick look, each one of those ports had a release. So, for future submissions you should probably use MASTER_SITES instead of the on-the-fly tag generation thingy. To go with that, EXTRACT_SUFX = .tar.bz2. Thanks! -- Tracey Emery
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/22 13:02:08 Modified files: productivity/aqbanking: Makefile distinfo productivity/aqbanking/pkg: PLIST Log message: Bugfix update aqbanking to 6.2.2
Re: NEW: net/i2p
Ping, is there nobody with time to review this? On Sun, August 16, 2020 09:57, Dimitri Karamazov wrote: > Ping > > > On Sun, August 09, 2020 09:55, Dimitri Karamazov wrote: > >> Ping >> >> >> >> On Sun, August 2, 2020 18:44, Dimitri Karamazov wrote: >> >> >>> I2P software bundle, includes the standard I2P implementation. >>> https://geti2p.net/ >>> >>> >>> >>> >>> About: >>> *I2P is an anonymous overlay network - a network within a network. >>> *It is intended to protect communication from dragnet surveillance >>> and monitoring by third parties such as ISPs. >>> *Is decentralised completely unlike tor. Each client routes >>> anonymous and encrypted traffic from other clients by default. >>> No central directory for routing. >>> *I2P incorporates applications in the form of webapps. >>> *Webapps plugins (*.su3) can be loaded easily through the console. >>> *Includes a ready mail(smtp pop3) client, i2psnark (bittorrent) client, and >>> Jetty (webserver). >>> Or host with your own webserver. >>> *Allows anonymous chats through IRC tunnel service. >>> *Plugins for blogging, chatting, file sharing have already been written. >>> *Every service(plugin) works within the i2p network itself(Except mail). >>> *Not supposed to be used as an outproxy, still an outproxy is included. >>> *I2P source code includes a java-service-wrapper compiled for specific >>> targets >>> but is not compatible with OpenBSD. So I've included a new port >>> tanukiwrapper, and configured I2P >>> to use it. >>> *Very exhaustive(functionality) but easy to use router console. >>> >>> >>> >>> >>> Testing: >>> *Run the rc service, point browser to localhost:7657. >>> *Set HTTP proxy to localhost: to view eepsites. >>> https://geti2p.net/en/about/browser-config >>> *Been running the router for a week now, with no problems. >>> *Personally tested the default and external plugins(e.g muwire). >>> *Test dependencies not present in ports, will add to it. >>> *Mount separate partition for /var/i2p if you do heavy transfers. >>> >>> >>> >>> >>> Index: user.list >>> === >>> RCS file: /cvs/ports/infrastructure/db/user.list,v >>> retrieving revision 1.371 diff -u -p -r1.371 user.list --- user.list >>> 12 Jun 2020 11:27:08 - 1.371 +++ >>> user.list 2 Aug 2020 18:16:51 - >>> @@ -366,3 +366,4 @@ id usergroup port >>> 855 _repro _repro telephony/resiprocate >>> 856 _return _return telephony/resiprocate >>> 857 _web2ldap _web2ldap sysutils/web2ldap >>> +858 _i2p _i2pnet/i2p >>> >>> >>> >>> >>> Any comments? >>> >>> >> > >
Re: VAAPI ports
On Sat, Aug 22, 2020 at 02:11:34PM -0400, Bryan Steele wrote: > On Sat, Aug 22, 2020 at 07:35:47PM +0200, Luca De Pandis wrote: > > Hi everyone, > > I'm Luca De Pandis and I'm an OpenBSD user since March. > > > > I'd like to contribute to the project since I'm using it everyday, so I > > decided to work on porting the VAAPI stack on OpenBSD. > > > > Before submitting I checked with portcheck and make > > ports-lib-depends-check for errors or things I could improve to make the > > ports as compliant as possible. Still, as they are my first attempt to > > port something I'd like to receive your feedbacks about them. > > > > Since I need for VAAPI to get hw acceleration on mpv I wouldn't mind to > > step up as a maintainer for these ports. > > > > Also, I wrote some patches, but I'm not as proficient in C as I would. So > > I'm counting on your feedbacks if there are some things I could do > > better in that regard as well. > > > > > > Best regards, > > Luca De Pandis > > Hi Luca, > > This has come up before last year [0], and the conclusion was that this > needed to be a part of xenocara [1] as Mesa needs to be compiled with > '--enable-va' to have working r600/radeonsi gallium drivers [2]. > > The original work was done by Brad DeMorrow and Jonathan Gray had > picked it up after that, not sure what the status is now. I had it > working on my Radeon HD 7450 along with a modified ffmpeg port with > Brad's original ports and recompiled Mesa. > > Having support for video encode/decode offloading would be nice, > especially on lower power CPUs. > > -Bryan. > > [0] https://marc.info/?l=openbsd-ports=157626463822587=2 > [1] https://marc.info/?l=openbsd-tech=157676527322944=2 > [2] https://marc.info/?l=openbsd-ports=157638698722892=2 Hi Bryan, no problem at all. I just submitted them because I need hwdec on my Intel hardware to reduce frame dropping. If they are going to be part of base, that's even better! Right now I'm focusing on porting the newest intel-media-driver for >= Broadwell CPUs (in this archive I only ported the old intel-vaapi-driver). If I can be of any help about the integration of VAAPI, just let me know. :-) Best regards, Luca De Pandis
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/08/22 12:25:04 Modified files: sysutils/diffoscope: Makefile distinfo Log message: Update to diffoscope-157
Re: VAAPI ports
On Sat, Aug 22, 2020 at 07:35:47PM +0200, Luca De Pandis wrote: > Hi everyone, > I'm Luca De Pandis and I'm an OpenBSD user since March. > > I'd like to contribute to the project since I'm using it everyday, so I > decided to work on porting the VAAPI stack on OpenBSD. > > Before submitting I checked with portcheck and make > ports-lib-depends-check for errors or things I could improve to make the > ports as compliant as possible. Still, as they are my first attempt to > port something I'd like to receive your feedbacks about them. > > Since I need for VAAPI to get hw acceleration on mpv I wouldn't mind to > step up as a maintainer for these ports. > > Also, I wrote some patches, but I'm not as proficient in C as I would. So > I'm counting on your feedbacks if there are some things I could do > better in that regard as well. > > > Best regards, > Luca De Pandis Hi Luca, This has come up before last year [0], and the conclusion was that this needed to be a part of xenocara [1] as Mesa needs to be compiled with '--enable-va' to have working r600/radeonsi gallium drivers [2]. The original work was done by Brad DeMorrow and Jonathan Gray had picked it up after that, not sure what the status is now. I had it working on my Radeon HD 7450 along with a modified ffmpeg port with Brad's original ports and recompiled Mesa. Having support for video encode/decode offloading would be nice, especially on lower power CPUs. -Bryan. [0] https://marc.info/?l=openbsd-ports=157626463822587=2 [1] https://marc.info/?l=openbsd-tech=157676527322944=2 [2] https://marc.info/?l=openbsd-ports=157638698722892=2
Re: [update] textproc/xlsx2csv to 20200427211949
On Sat, Aug 22, 2020 at 11:08:50AM -0600, Aaron Bieber wrote: > OK? > OK for removal of textproc/go-xlsx? Both fine with me.
[update] textproc/xlsx2csv to 20200427211949
Hi,
This update brings xlsx2csv to the latest version. It also lets us delete
textproc/go-xlsx.
It seems to run fine for me:
- "make test" works.
- Running it against a xlsx file produces the expected results.
show-reverse-deps shows textproc/go-xlsx is only used by this port.
OK?
OK for removal of textproc/go-xlsx?
Cheers,
Aaron
diff bb80fbc51403ae6a331d6ff705a74dc1349a6c7d /usr/ports
blob - 0d8e908156dcddd3d5150a31aa53a5e363eb2593
file + textproc/xlsx2csv/Makefile
--- textproc/xlsx2csv/Makefile
+++ textproc/xlsx2csv/Makefile
@@ -1,18 +1,304 @@
# $OpenBSD: Makefile,v 1.9 2019/07/12 20:50:17 sthen Exp $
COMMENT = convert XLSX files to CSV
-DISTNAME = xlsx2csv-20150318
-CATEGORIES = textproc converters
-REVISION = 1
+MODGO_MODNAME =github.com/tealeg/xlsx2csv
+MODGO_VERSION =v0.0.0-20200427211949-6a39463d05cf
+PKGNAME = xlsx2csv-20200427211949
+DISTNAME = xlsx2csv-${MODGO_VERSION}
+
+CATEGORIES = textproc
+
# BSD
PERMIT_PACKAGE = Yes
-BUILD_DEPENDS =textproc/go-xlsx
-GH_ACCOUNT = tealeg
-GH_PROJECT = xlsx2csv
-GH_COMMIT =d8ea142750f57ca9998a632d2b6c61f818f0c5a9
-
MODULES = lang/go
+MODGO_MODFILES = \
+ cloud.google.com/go v0.26.0 \
+ cloud.google.com/go v0.34.0 \
+ cloud.google.com/go v0.38.0 \
+ cloud.google.com/go v0.44.1 \
+ cloud.google.com/go v0.44.2 \
+ cloud.google.com/go v0.45.1 \
+ cloud.google.com/go v0.46.3 \
+ cloud.google.com/go v0.50.0 \
+ cloud.google.com/go v0.52.0 \
+ cloud.google.com/go v0.53.0 \
+ cloud.google.com/go/bigquery v1.0.1 \
+ cloud.google.com/go/bigquery v1.3.0 \
+ cloud.google.com/go/datastorev1.0.0 \
+ cloud.google.com/go/pubsub v1.0.1 \
+ cloud.google.com/go/pubsub v1.1.0 \
+ cloud.google.com/go/storage v1.0.0 \
+ cloud.google.com/go/storage v1.5.0 \
+ github.com/davecgh/go-spew v1.1.0 \
+ github.com/go-gl/glfw/v3.3/glfw
v0.0.0-20191125211704-12ad95a8df72 \
+ github.com/golang/groupcache
v0.0.0-20190702054246-869f871628b6 \
+ github.com/golang/groupcache
v0.0.0-20191227052852-215e87163ea7 \
+ github.com/golang/mock v1.1.1 \
+ github.com/golang/mock v1.2.0 \
+ github.com/golang/mock v1.3.1 \
+ github.com/golang/mock v1.4.0 \
+ github.com/golang/protobuf v1.2.0 \
+ github.com/golang/protobuf v1.3.1 \
+ github.com/golang/protobuf v1.3.2 \
+ github.com/golang/protobuf v1.3.3 \
+ github.com/google/btree
v0.0.0-20180813153112-4030bb1f1f0c \
+ github.com/google/go-cmp v0.2.0 \
+ github.com/google/go-cmp v0.3.0 \
+ github.com/google/go-cmp v0.3.1 \
+ github.com/google/pprof
v0.0.0-20181206194817-3ea8567a2e57 \
+ github.com/google/pprof
v0.0.0-20190515194954-54271f7e092f \
+ github.com/google/pprof
v0.0.0-20191218002539-d4f498aebedc \
+ github.com/google/pprof
v0.0.0-20200212024743-f11f1df84d12 \
+ github.com/googleapis/gax-go/v2 v2.0.4 \
+ github.com/hashicorp/golang-lru v0.5.0 \
+ github.com/jstemmer/go-junit-report
v0.0.0-20190106144839-af01ea7f8024 \
+ github.com/kr/ptyv1.1.1 \
+ github.com/stretchr/testify v1.3.0 \
+ go.opencensus.io v0.21.0 \
+ go.opencensus.io v0.22.0 \
+ go.opencensus.io v0.22.2 \
+ golang.org/x/crypto
v0.0.0-20190308221718-c2843e01d9a2 \
+ golang.org/x/crypto
v0.0.0-20190510104115-cbcb75029529 \
+ golang.org/x/crypto
v0.0.0-20190605123033-f99c8df09eb5 \
+ golang.org/x/crypto
v0.0.0-20191011191535-87dc89f01550 \
+ golang.org/x/exp
v0.0.0-20190121172915-509febef88a4 \
+ golang.org/x/exp
v0.0.0-20190306152737-a1d7652674e8 \
+ golang.org/x/exp
v0.0.0-20190510132918-efd6b22b2522 \
+ golang.org/x/exp
v0.0.0-20190829153037-c13cbed26979 \
+ golang.org/x/exp
v0.0.0-20191030013958-a1ab85dbe136 \
+
VAAPI ports
Hi everyone, I'm Luca De Pandis and I'm an OpenBSD user since March. I'd like to contribute to the project since I'm using it everyday, so I decided to work on porting the VAAPI stack on OpenBSD. Before submitting I checked with portcheck and make ports-lib-depends-check for errors or things I could improve to make the ports as compliant as possible. Still, as they are my first attempt to port something I'd like to receive your feedbacks about them. Since I need for VAAPI to get hw acceleration on mpv I wouldn't mind to step up as a maintainer for these ports. Also, I wrote some patches, but I'm not as proficient in C as I would. So I'm counting on your feedbacks if there are some things I could do better in that regard as well. Best regards, Luca De Pandis vaapi.tar.gz Description: Binary data
Re: something broke net/syncthing
Hello Edd, e...@theunixzoo.co.uk (Edd Barrett), 2020.08.22 (Sat) 09:37 (CEST): > On Sat, Aug 22, 2020 at 05:49:59AM +, Mikolaj Kucharski wrote: > Updated diff (also put back WANTLIB): works, thanks! Marcus
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/08/22 08:34:29 Modified files: productivity/aqbanking: Makefile Log message: Use GNU libtool, avoids an error caused by duplicated symbols ok rsadowski@ and ajacoutot@ (who had the same diff) Now py-llvmlite is the only remaining fallout from the update to llvm 10 on amd64.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/08/22 08:32:26 Removed files: productivity/aqbanking/patches: patch-src_libs_plugins_Makefile_in Log message: Zap patch responsible for unresolved symbols errors with lld 10 ok rsadowski@ and ajacoutot@ (who had the same diff)
[new] net/gomuks a Matrix client for your terminal
Hi, Here is a port of gomuks a matrix client that runs in the terminal. I have tested it against my own homeserver, it seems to work fairly well! HOMEPAGE: https://github.com/tulir/gomuks OK? Cheers, Aaron gomuks.tar.gz Description: Binary data
Re: Remove: emulators/gns3
On Sat Aug 22, 2020 at 03:11:16PM +0200, Matthieu Herrb wrote: > On Sat, Aug 22, 2020 at 12:26:09PM +0200, Rafael Sadowski wrote: > > As mentioned here: https://marc.info/?l=openbsd-ports=159447072122157=2 > > > > Looks dead upstream and I ran into python2.7(93015) in free(): use after > > free 0xd64017baf00. > > > > OK to remove? > > Hi, > > FWIW, gns3 is not dead upstream. They changed domain. Last release is > only a couple of weeks old: > > https://www.gns3.com/community/blog/gns3-2-2-12-released > > But someone probably needs to start over to port that version... (I > don't have enough interest in this). > Thanks Matthieu for the note. Is anybody willing to update gns3?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/22 07:57:09 Modified files: sysutils/py-pynetbox: Makefile distinfo Log message: update to pynetbox-5.0.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/22 07:55:07 Modified files: net/mosquitto : Makefile distinfo Log message: update to mosquitto-1.6.12 addressing a memory leak when handling PUBLISH messages
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/08/22 07:55:16 Modified files: sysutils/borgmatic: Makefile distinfo Log message: update to borgmatic-1.5.10
Re: Remove: emulators/gns3
On Sat, Aug 22, 2020 at 12:26:09PM +0200, Rafael Sadowski wrote: > As mentioned here: https://marc.info/?l=openbsd-ports=159447072122157=2 > > Looks dead upstream and I ran into python2.7(93015) in free(): use after > free 0xd64017baf00. > > OK to remove? Hi, FWIW, gns3 is not dead upstream. They changed domain. Last release is only a couple of weeks old: https://www.gns3.com/community/blog/gns3-2-2-12-released But someone probably needs to start over to port that version... (I don't have enough interest in this). -- Matthieu Herrb
UPDATE: audio/musique
Update musique from 1.7 to 1.9
- Take maintainer
- Zap some tweaks/hacks
OK?
Index: Makefile
===
RCS file: /cvs/ports/audio/musique/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile13 Jun 2020 14:45:28 - 1.24
+++ Makefile22 Aug 2020 12:57:31 -
@@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.24 2020/06/13 14:45:28 rsadowski Exp $
COMMENT = graphical music player focused on a clean ui
-V =1.7
+V =1.9
DISTNAME = musique-${V}
CATEGORIES = audio
-EXTRACT_SUFX = .tar.bz2
-REVISION = 1
HOMEPAGE = http://flavio.tordini.org/musique/
+MAINTAINER = Rafael Sadowski
+
# GPLv3
PERMIT_PACKAGE = Yes
@@ -16,12 +16,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core
WANTLIB += Qt5Sql Qt5Widgets c m mpv tag
MASTER_SITES = https://github.com/flaviotordini/musique/releases/download/$V/
-
-# musique-3.1.tar.bz2 is actually gzipped.
-# i would just use GH_* rather than EXTRACT_CASES, but the git tree uses
-# submodules (build fails with missing media.h) so this is easier.
-# https://github.com/flaviotordini/musique/issues/25
-EXTRACT_CASES += musique*.tar.bz2) ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive |
${TAR} xf -;;
+EXTRACT_SUFX = .tar.bz2
MODULES = devel/qmake \
x11/qt5
@@ -41,7 +36,5 @@ NO_TEST = Yes
pre-configure:
perl -pi -e 's,/usr/include,${LOCALBASE}/include,' ${WRKSRC}/musique.pro
- perl -pi -e 's,imagedownloader.h,../imagedownloader.h,' \
- ${WRKSRC}/src/model/artist.cpp
.include
Index: distinfo
===
RCS file: /cvs/ports/audio/musique/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo10 Jun 2020 19:29:53 - 1.4
+++ distinfo22 Aug 2020 12:57:31 -
@@ -1,2 +1,2 @@
-SHA256 (musique-1.7.tar.bz2) = TjSnMhWAkJHULdQEd9cFLDP6T2cJE27P/yxGwUHtew0=
-SIZE (musique-1.7.tar.bz2) = 425143
+SHA256 (musique-1.9.tar.bz2) = yRTnaMhAMWWLWpdg60SvnyG8KQl6G1uCYbUFPqG4U6Q=
+SIZE (musique-1.9.tar.bz2) = 475273
Index: patches/patch-src_mainwindow_cpp
===
RCS file: patches/patch-src_mainwindow_cpp
diff -N patches/patch-src_mainwindow_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_mainwindow_cpp22 Aug 2020 12:57:31 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+https://github.com/flaviotordini/musique/pull/28
+
+Index: src/mainwindow.cpp
+--- src/mainwindow.cpp.orig
src/mainwindow.cpp
+@@ -1310,8 +1310,8 @@ void MainWindow::runFinetune(const QString )
+ return;
+ #endif
+
+-#ifdef APP_EXTRA
+ const QString baseUrl = QLatin1String("https://;) + Constants::ORG_DOMAIN;
++#ifdef APP_EXTRA
+ const QString filesUrl = baseUrl + QLatin1String("/files/");
+ QString url = filesUrl + "finetune/finetune.";
+
Re: Remove: www/linkchecker
On Sat, August 22, 2020 13:27, Rafael Sadowski wrote: > As mentioned here: > https://marc.info/?l=openbsd-ports=159447072122157=2 > > Nobody is interested in it, nobody wants to update it and I want to get > rid of py-qt4. > > OK to remove? > > I'm working on update to 9.4.0 currently.
Remove: www/linkchecker
As mentioned here: https://marc.info/?l=openbsd-ports=159447072122157=2 Nobody is interested in it, nobody wants to update it and I want to get rid of py-qt4. OK to remove?
Remove: emulators/gns3
As mentioned here: https://marc.info/?l=openbsd-ports=159447072122157=2 Looks dead upstream and I ran into python2.7(93015) in free(): use after free 0xd64017baf00. OK to remove?
UPDATE: devel/qjson
Switch from qt4 to qt5. There are currently no consumer in the tree.
OK to update or we do want delete it?
Rafael
diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
index 918df2dfbf1..2a6bae43503 100644
--- a/devel/qjson/Makefile
+++ b/devel/qjson/Makefile
@@ -1,30 +1,26 @@
# $OpenBSD: Makefile,v 1.14 2019/07/12 20:45:57 sthen Exp $
-CATEGORIES = devel
-
COMMENT= Qt-based library that maps JSON data to QVariant objects
GH_ACCOUNT = flavio
GH_PROJECT = qjson
GH_TAGNAME = 0.9.0
-REVISION = 2
+REVISION = 3
+
+CATEGORIES = devel
HOMEPAGE = http://qjson.sourceforge.net/
-SHARED_LIBS = qjson 1.0
+SHARED_LIBS = qjson-qt5 0.0
MODULES = devel/cmake \
- x11/qt4
-
-WANTLIB += QtGui m ${COMPILER_LIBCXX}
-
-COMPILER = base-clang ports-gcc base-gcc
+ x11/qt5
# LGPLv2
-PERMIT_PACKAGE = Yes
+PERMIT_PACKAGE = Yes
+
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core m
-# XXX enable tests if we switch to qt5
-CONFIGURE_ARGS = -DQJSON_BUILD_TESTS:Bool=No \
- -DQT4_BUILD:Bool=Yes
+CONFIGURE_ARGS = -DQJSON_BUILD_TESTS=ON
.include
diff --git a/devel/qjson/pkg/PLIST b/devel/qjson/pkg/PLIST
index 728ae14f634..fe9d39a6427 100644
--- a/devel/qjson/pkg/PLIST
+++ b/devel/qjson/pkg/PLIST
@@ -1,15 +1,16 @@
@comment $OpenBSD: PLIST,v 1.5 2017/03/17 15:00:11 jca Exp $
-include/qjson/
-include/qjson/parser.h
-include/qjson/parserrunnable.h
-include/qjson/qjson_export.h
-include/qjson/qobjecthelper.h
-include/qjson/serializer.h
-include/qjson/serializerrunnable.h
-lib/cmake/qjson/
-lib/cmake/qjson/QJSONConfig.cmake
-lib/cmake/qjson/QJSONConfigVersion.cmake
-lib/cmake/qjson/QJSONTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/qjson/QJSONTargets.cmake
-@lib lib/libqjson.so.${LIBqjson_VERSION}
-lib/pkgconfig/QJson.pc
+include/qjson-qt5/
+include/qjson-qt5/parser.h
+include/qjson-qt5/parserrunnable.h
+include/qjson-qt5/qjson_export.h
+include/qjson-qt5/qobjecthelper.h
+include/qjson-qt5/serializer.h
+include/qjson-qt5/serializerrunnable.h
+lib/cmake/
+lib/cmake/qjson-qt5/
+lib/cmake/qjson-qt5/QJSON-qt5Config.cmake
+lib/cmake/qjson-qt5/QJSON-qt5ConfigVersion.cmake
+lib/cmake/qjson-qt5/QJSON-qt5Targets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/qjson-qt5/QJSON-qt5Targets.cmake
+@lib lib/libqjson-qt5.so.${LIBqjson-qt5_VERSION}
+lib/pkgconfig/QJson-qt5.pc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/22 03:06:36 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register keepassx
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/22 03:04:10 Modified files: security : Makefile Removed files: security/keepassx: Makefile distinfo security/keepassx/pkg: DESCR PLIST Log message: Remove keepassx (Qt4) With keepassxc we have a better alternative. No objections from maintainer steven@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org 2020/08/22 02:48:38
Modified files:
devel/quirks : Makefile
devel/quirks/files: Quirks.pm
Log message:
Register qca{-ossl,gnupg}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/22 02:45:48 Modified files: security : Makefile Removed files: security/qca : Makefile distinfo security/qca/patches: patch-plugins_qca-botan_CMakeLists_txt patch-plugins_qca-ossl_ossl110-compat_h patch-plugins_qca-ossl_qca-ossl_cpp security/qca/pkg: DESCR-gnupg DESCR-main DESCR-ossl PLIST-gnupg PLIST-main PLIST-ossl Log message: Remove QCA Qt4, long live qca-qt5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/22 02:41:40 Modified files: net/psi: Makefile Log message: Mark as broken runtime error: Connection Error: Unable to connect to server Discussed with landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/22 02:40:40 Modified files: net/psi: Makefile distinfo net/psi/pkg: PLIST Removed files: net/psi/patches: patch-iris_iris_pri patch-iris_src_jdns_jdns_p_h patch-iris_src_jdns_jdns_sys_c patch-iris_src_xmpp_base64_base64_cpp patch-iris_src_xmpp_xmpp-im_filetransfer_cpp Log message: Update psi-im to 1.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/08/22 02:22:33 Modified files: x11/mate/system-monitor: Makefile distinfo x11/mate/system-monitor/pkg: PLIST Log message: update to 1.24.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/08/22 02:21:40 Modified files: graphics/libraw: Makefile distinfo graphics/libraw/patches: patch-libraw_pc_in patch-libraw_r_pc_in graphics/libraw/pkg: PLIST Removed files: graphics/libraw/patches: patch-internal_dcraw_common_cpp Log message: Update libraw to 0.20.0 https://www.libraw.org/news/libraw-0-20-Release
Re: something broke net/syncthing
On Sat, Aug 22, 2020 at 05:49:59AM +, Mikolaj Kucharski wrote:
> I don't use syncthing, but that package name looks incorrect. String rc4
> is conflicting with flavor naming pattern. You need to drop the dash, so
> final package name is syncthing-1.9.0rc4
You're right.
This is confirmed by the suffix examples in packages-specs(7).
Updated diff (also put back WANTLIB):
Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile17 May 2020 16:10:25 - 1.30
+++ Makefile22 Aug 2020 07:33:00 -
@@ -1,10 +1,13 @@
# $OpenBSD: Makefile,v 1.30 2020/05/17 16:10:25 edd Exp $
+BROKEN-aarch64 =golang.org/x/Sys/cpu panic (illegal instruction)
+
COMMENT = open decentralized synchronization utility
-V =1.5.0
-DISTNAME = syncthing-${V}
-DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
+# Release candidate used so as to fix critical quic-go problem.
+V =1.9.0
+DISTNAME = syncthing-${V}rc4
+DISTFILES =syncthing-source-v${V}-rc.4${EXTRACT_SUFX}
CATEGORIES = net
HOMEPAGE = https://syncthing.net/
@@ -16,7 +19,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += c pthread
-MASTER_SITES = https://github.com/syncthing/syncthing/releases/download/v${V}/
+MASTER_SITES =
https://github.com/syncthing/syncthing/releases/download/v${V}-rc.4/
WRKDIST = ${WRKDIR}/syncthing
WRKSRC = ${WRKDIR}/go/src/github.com/syncthing/syncthing
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo17 May 2020 16:10:25 - 1.20
+++ distinfo21 Aug 2020 22:46:07 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v1.5.0.tar.gz) =
S048m76d15aRnTABGLaBft/j25UTsGelhZFSSzxaJI0=
-SIZE (syncthing-source-v1.5.0.tar.gz) = 10475068
+SHA256 (syncthing-source-v1.9.0-rc.4.tar.gz) =
F6cI6y/vvFwxfQi+U4lwf8II4PMyXUhKnWv1t/LMZ+o=
+SIZE (syncthing-source-v1.9.0-rc.4.tar.gz) = 11142237
Index: patches/patch-build_go
===
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.11
diff -u -p -r1.11 patch-build_go
--- patches/patch-build_go 3 Jan 2020 17:57:35 - 1.11
+++ patches/patch-build_go 20 Aug 2020 18:47:05 -
@@ -23,12 +23,12 @@ Index: build.go
}
// These are repos we need to clone to run "go generate"
-@@ -466,7 +480,7 @@ func appendParameters(args []string, tags []string, pk
+@@ -527,7 +541,7 @@ func appendParameters(args []string, tags []string, pk
if !debugBinary {
// Regular binaries get version tagged and skip some debug
symbols
-- args = append(args, "-ldflags", ldflags(path.Base(pkg)))
-+ args = append(args, "-x", "-ldflags", ldflags(path.Base(pkg)))
+- args = append(args, "-ldflags", ldflags(tags))
++ args = append(args, "-x", "-ldflags", ldflags(tags))
} else {
// -gcflags to disable optimizations and inlining. Skip -ldflags
// because `Could not launch program: decoding dwarf section
info at
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/08/22 00:44:00 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register qlandkartegt removal
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/08/22 00:38:09 Removed files: geo/qlandkartegt: Makefile distinfo geo/qlandkartegt/patches: patch-3rdparty_cache2gtiff_main_cpp patch-3rdparty_map2gcm_main_cpp patch-3rdparty_map2jnx_main_cpp patch-3rdparty_map2rmap_main_cpp patch-3rdparty_map2rmp_CFileGenerator_cpp patch-3rdparty_map2rmp_main_cpp patch-cmake_Modules_DefineInstallationPaths_cmake patch-src_CCanvas_cpp patch-src_CDeviceGPSD_cpp patch-src_CMainWindow_cpp patch-src_CMap3D_cpp patch-src_CRouteToolWidget_cpp patch-src_CWptDB_cpp patch-src_GeoMath_cpp patch-src_version_h geo/qlandkartegt/pkg: DESCR PLIST Log message: Remove qlandkartegt. It's dead upstream and has been replaced by QMapShack One less Qt4 consumer. Requestd and ok rsadowski@. Maintainer timeout.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/08/22 00:18:34 Modified files: geo: Makefile Log message: Replace qlandkartegt with qmapshack+routino
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/08/22 00:10:19 Log message: Import QMapShack-1.14.1 tweaks nad ok rsadowski@ QMapShack will help you to plan your next outdoor trip or to visualize and archive all the GPS recordings of your past exciting adventures. QMapShack is the next generation of the famous QLandkarte GT application. And of course it's even better and easier to use. Status: Vendor Tag: kirby Release Tags: kirby_20200822 N ports/geo/qmapshack/Makefile N ports/geo/qmapshack/distinfo N ports/geo/qmapshack/patches/patch-cmake_Modules_DefineInstallationPaths_cmake N ports/geo/qmapshack/patches/patch-cmake_Modules_FindPROJ4_cmake N ports/geo/qmapshack/patches/patch-src_qmapshack_CAbout_cpp N ports/geo/qmapshack/patches/patch-src_qmapshack_gis_CGisListWks_cpp N ports/geo/qmapshack/patches/patch-src_qmapshack_helpers_CToolBarSetupDialog_cpp N ports/geo/qmapshack/patches/patch-src_qmapshack_setup_IAppSetup_cpp N ports/geo/qmapshack/patches/patch-src_qmaptool_setup_IAppSetup_cpp N ports/geo/qmapshack/pkg/DESCR N ports/geo/qmapshack/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/08/22 00:01:08 Log message: Import routino-3.3.2 ok rsadowski@ Routino is an application for finding a route between two points using the dataset of topographical information collected by http://www.OpenStreetMap.org. Status: Vendor Tag: kirby Release Tags: kirby_20200822 N ports/geo/routino/Makefile N ports/geo/routino/distinfo N ports/geo/routino/patches/patch-Makefile N ports/geo/routino/patches/patch-Makefile_conf N ports/geo/routino/patches/patch-src_Makefile N ports/geo/routino/pkg/DESCR N ports/geo/routino/pkg/PLIST No conflicts created by this import
