CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mgloc...@cvs.openbsd.org2021/02/16 00:05:45 Modified files: www/chromium : Makefile www/chromium/files: hid_service_fido.cc Log message: Back-out USB data toggle fix for HID devices, since we received multiple reports about broken devices, e.g. for ukbd(4) and fido(4). ok ajacoutot@
Unplug unused lang/erlang/19 (avoids -fno-common)
I tested that benchmarks/tsung still works as a proxy for
all-things-erlang21. This is to be followed by erlang/19 directory
removal.
OK?
Subject: [PATCH] Unplug unused lang/erlang/19
Removed support from elrang.port.mk leaving the multi-version
structure in place for future use.
---
lang/erlang/Makefile | 1 -
lang/erlang/erlang.port.mk | 13 -
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git lang/erlang/Makefile lang/erlang/Makefile
index 36278c0aed4..d39ce7af68f 100644
--- lang/erlang/Makefile
+++ lang/erlang/Makefile
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.71 2020/03/16 16:07:45 jasper Exp $
SUBDIR =
-SUBDIR += 19
SUBDIR += 21
.include
diff --git lang/erlang/erlang.port.mk lang/erlang/erlang.port.mk
index 9536e0506b1..9b2e2f671ee 100644
--- lang/erlang/erlang.port.mk
+++ lang/erlang/erlang.port.mk
@@ -13,18 +13,15 @@ MODERL_DEFAULT_VERSION =21
# If the port already has flavors, append ours to it unless the port requires
# a specific version of Erlang.
.if !defined(MODERL_VERSION) && !defined(FLAVORS)
-FLAVORS ?= erlang19 erlang21
+FLAVORS ?= erlang21
.else
-FLAVORS += erlang19 erlang21
+FLAVORS += erlang21
.endif
FLAVOR?= # empty
# When no flavor is explicitly set, assume MODERL_DEFAULT_VERSION
-.if ${FLAVOR:Merlang19}
-MODERL_VERSION = 19
-_MODERL_FLAVOR = ${FLAVOR}
-.elif ${FLAVOR:Merlang21}
+.if ${FLAVOR:Merlang21}
MODERL_VERSION = 21
_MODERL_FLAVOR = ${FLAVOR}
.else
@@ -32,9 +29,7 @@ MODERL_VERSION ?= ${MODERL_DEFAULT_VERSION}
_MODERL_FLAVOR ?= # empty
.endif
-.if ${MODERL_VERSION} == 19
-_MODERL_FLAVOR = erlang19
-.elif ${MODERL_VERSION} == 21
+.if ${MODERL_VERSION} == 21
_MODERL_FLAVOR = erlang21
.else
ERRORS += "Invalid MODERL_VERSION set: ${MODERL_VERSION}."
--
2.30.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/02/15 23:25:53 Modified files: benchmarks/tsung: Makefile Log message: Use erlang21 for benchmarks/tsung jasper@: go for it
Re: [update] net/snort 2.9.17, fix for -fno-common
Thanks for the ping and sorry about the delay. I have committed your
update.
Lawrence
On Mon, Feb 15, 2021 at 07:13:52PM +0100, Markus Lude wrote:
> ping
>
> On Tue, Feb 09, 2021 at 11:51:25PM +0100, Markus Lude wrote:
> > Hello,
> >
> > attached is an update to snort 2.9.17. The new version includes fixes
> > for gcc-10. Tested on amd64.
> >
> > Please test and eventually commit. Thanks.
> >
> > Regards,
> > Markus
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/snort/Makefile,v
> retrieving revision 1.107
> diff -u -p -u -p -r1.107 Makefile
> --- Makefile 27 May 2020 02:32:10 - 1.107
> +++ Makefile 9 Feb 2021 22:46:07 -
> @@ -2,8 +2,8 @@
>
> COMMENT =highly flexible sniffer/NIDS
>
> -DISTNAME = snort-2.9.16
> -RULESV = 29160
> +DISTNAME = snort-2.9.17
> +RULESV = 29170
> SUBST_VARS = RULESV
>
> CATEGORIES = net security
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/snort/distinfo,v
> retrieving revision 1.43
> diff -u -p -u -p -r1.43 distinfo
> --- distinfo 27 May 2020 02:32:10 - 1.43
> +++ distinfo 9 Feb 2021 22:46:07 -
> @@ -1,2 +1,2 @@
> -SHA256 (snort-2.9.16.tar.gz) = lojY7fHaCd7GV0AA+zwOYvmcVkKFh2FuF8YBA8C8utc=
> -SIZE (snort-2.9.16.tar.gz) = 6948498
> +SHA256 (snort-2.9.17.tar.gz) = w7I0w5IqCbA2i4R9240fo3G3QfAy9Cqpq1PWe0KNxkg=
> +SIZE (snort-2.9.17.tar.gz) = 6983018
> Index: patches/patch-src_decode_h
> ===
> RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 patch-src_decode_h
> --- patches/patch-src_decode_h27 May 2020 02:32:10 - 1.12
> +++ patches/patch-src_decode_h9 Feb 2021 22:46:07 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_decode_h,v 1.12 2020
> Index: src/decode.h
> --- src/decode.h.orig
> +++ src/decode.h
> -@@ -837,9 +837,9 @@ typedef struct _SLLHdr {
> +@@ -839,9 +839,9 @@ typedef struct _SLLHdr {
>* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
>* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
>* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
> Index: patches/patch-src_dynamic-preprocessors_Makefile_in
> ===
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 patch-src_dynamic-preprocessors_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_Makefile_in 27 May 2020
> 02:32:10 - 1.21
> +++ patches/patch-src_dynamic-preprocessors_Makefile_in 9 Feb 2021
> 22:46:07 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
> Index: src/dynamic-preprocessors/Makefile.in
> --- src/dynamic-preprocessors/Makefile.in.orig
> +++ src/dynamic-preprocessors/Makefile.in
> -@@ -1649,19 +1649,8 @@ clean-local:
> +@@ -1650,19 +1650,8 @@ clean-local:
> rm -rf include build
>
> install-data-local:
> Index: patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
> ===
> RCS file: patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
> diff -N patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in9 Feb
> 2021 22:46:07 -
> @@ -0,0 +1,23 @@
> +$OpenBSD$
> +
> +Index: src/dynamic-preprocessors/s7commplus/Makefile.in
> +--- src/dynamic-preprocessors/s7commplus/Makefile.in.orig
> src/dynamic-preprocessors/s7commplus/Makefile.in
> +@@ -344,7 +344,7 @@ top_srcdir = @top_srcdir@
> + AUTOMAKE_OPTIONS = foreign no-dependencies
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_s7commplus_preproc.la
> +-libsf_s7commplus_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> ++libsf_s7commplus_preproc_la_LDFLAGS = -export-dynamic -module
> -avoid-version @XCCFLAGS@
> + @SO_WITH_STATIC_LIB_TRUE@libsf_s7commplus_preproc_la_LIBADD =
> ../libsf_dynamic_preproc.la
> + @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_s7commplus_preproc_la_SOURCES = \
> + @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
> +@@ -546,7 +546,7 @@ distdir-am: $(DISTFILES)
> + done
> + check-am: all-am
> + check: check-am
> +-all-am: Makefile $(LTLIBRARIES) all-local
> ++all-am: Makefile $(LTLIBRARIES)
> + installdirs:
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_log_c
> ===
> RCS file: /cvs/ports/net/snort/patches/patch-src_log_c,v
> retrieving revision 1.8
> diff -u
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2021/02/15 20:02:38 Modified files: net/snort : Makefile distinfo net/snort/patches: patch-src_decode_h patch-src_dynamic-preprocessors_Makefile_in patch-src_log_c patch-src_preprocessors_Stream6_snort_stream_tcp_c net/snort/pkg : PLIST Log message: Update to Snort 2.9.17, with a fix for -fno-common >From maintainer Markus Lude
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/02/15 17:25:38 Modified files: games/sauerbraten: Makefile distinfo games/sauerbraten/patches: patch-Makefile patch-engine_serverbrowser_cpp games/sauerbraten/pkg: PLIST-data Log message: update sauerbraten to 20201227
Re: [PATCH] Use erlang21 for net/rabbitmq
Hi, I've been using rabbitmq for a while and am interested in updating the port. The latest version 3.8.11 , recommends >= erlang 23 (needs >=22.3): https://rabbitmq.com/which-erlang.html I'll try a hand at updating but I might not be able to do soon, plus the erlang port itself looks a bit complex. Just wanted to let know, incase someone was thinking of removing it. If someone else is interested in fixing, thats good too. Cheers, Aisha On 2/15/21 2:34 PM, Sebastian Reitenbach wrote: Hi, Am Sonntag, Februar 14, 2021 23:01 CET, schrieb Stuart Henderson : On 2021/02/08 20:59, Greg Steuck wrote: The other victim of my quest to get rid of erlang19 which is not -fno-common friendly. The package builds fine, but once installed it fails to start due to "Error when reading /var/rabbitmq/.erlang.cookie: eacces" when launched with `/etc/rc.d/rabbitmq -d start`. The cookie file is for some reason owned by root so a manual fixup of `chown _rabbitmq /var/rabbitmq/.erlang.cookie` makes the daemon runnable. I don't know what else to test and never heard of rabbitmq until today. If somebody feels this is enough, OK? diff --git net/rabbitmq/Makefile net/rabbitmq/Makefile index 5003dcf1bfe..e6b95d3eb66 100644 --- net/rabbitmq/Makefile +++ net/rabbitmq/Makefile @@ -3,7 +3,7 @@ COMMENT = highly reliable Enterprise Messaging System V = 3.6.15 -REVISION = 2 +REVISION = 3 DISTNAME =rabbitmq-server-$V PKGNAME = rabbitmq-$V CATEGORIES = net @@ -20,7 +20,7 @@ EXTRACT_SUFX =.tar.xz MODULES = lang/erlang \ lang/python -MODERL_VERSION = 19 +MODERL_VERSION = 21 USE_GMAKE = Yes CONFIGURE_STYLE = none -- 2.30.0 Upstream says "Maximum supported Erlang/OTP: 20.3.x" for 3.6.15. Please just mark it BROKEN. Sebastian, if you don't want to maintain the port, please drop the MAINTAINER line. sorry for the late reply, I only read ports@ ocassionally, and when I'm only CC: instead of TO: it doesn't end up in my inbox catching my attention, but gets filtered to the ports subfolder. In any case, I still have it running, but probably should not. I marked it BROKEN, and dropped MAINTAINER. Sebastian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/15 15:13:49 Modified files: www/webkitgtk4 : Tag: OPENBSD_6_8 Makefile distinfo www/webkitgtk4/patches: Tag: OPENBSD_6_8 patch-Source_WTF_wtf_PlatformEnable_h www/webkitgtk4/pkg: Tag: OPENBSD_6_8 PLIST Log message: SECURITY update to webkitgtk4-2.30.5. CVE-2020-13558.
Update libtool
The last release of libtool is 2.4.6, which is from 2015. We currently
have 2.4.2. I don't expect projects to actually require 2.4.6, but given
how old 2.4.6 is, some check for that version.
Given that libtool is not being developed, the one time pain of updating
to 2.4.6 might be worth it.
This is the first time I try to change anything in ports. What would be
the best way to test this?
Cheers,
Rafael
commit aa84897eb8840f32739b1d61fa5ae230ec8f232e
Author: Rafael Ávila de Espíndola
Date: Tue Sep 22 22:27:59 2020 -0700
Update libtool
Building sane-backends from git requires libtool 2.4.6. Given that
libtool 2.4.6 was released in 2015, it seems better to update it in
ports than try change sane-backends.
Warning: There was quite a bit of cargo cult involved in this. For
example, I have blindly update the patches and don't know if they are
still relevant in 2.4.6.
diff --git devel/libtool/Makefile devel/libtool/Makefile
index 0ac0f7a7c0e..5df984bde20 100644
--- devel/libtool/Makefile
+++ devel/libtool/Makefile
@@ -3,7 +3,7 @@
COMMENT-main= generic shared library support script
COMMENT-ltdl= GNU libtool system independent dlopen wrapper
-VERSION= 2.4.2
+VERSION= 2.4.6
DISTNAME= libtool-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-ltdl= libltdl-${VERSION}
@@ -22,7 +22,8 @@ MAINTAINER= Brad Smith
PERMIT_PACKAGE= Yes
AUTOCONF_VERSION= 2.67
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS}
+AUTOMAKE_VERSION= 1.15
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} ${MODGNU_AUTOMAKE_DEPENDS} devel/m4
MAKE_ENV+= ${_lt_libs}
MAKE_FLAGS+= ${_lt_libs}
diff --git devel/libtool/distinfo devel/libtool/distinfo
index 3c3ff5143ee..051bc346304 100644
--- devel/libtool/distinfo
+++ devel/libtool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libtool-2.4.2.tar.gz) = s43kSGKphyk809jfrhxAnVFLbE55TryTZI/r+a/DiRg=
-SIZE (libtool-2.4.2.tar.gz) = 2632347
+SHA256 (libtool-2.4.6.tar.gz) = 471NXT0CWjbCHdavfqgYoq/NTfwepaF7OdeFS80MBuM=
+SIZE (libtool-2.4.6.tar.gz) = 1806697
diff --git devel/libtool/patches/patch-libltdl_config_ltmain_sh devel/libtool/patches/patch-build-aux_ltmain_sh
similarity index 77%
rename from devel/libtool/patches/patch-libltdl_config_ltmain_sh
rename to devel/libtool/patches/patch-build-aux_ltmain_sh
index 848d5a0278e..684c09fe360 100644
--- devel/libtool/patches/patch-libltdl_config_ltmain_sh
+++ devel/libtool/patches/patch-build-aux_ltmain_sh
@@ -1,9 +1,11 @@
-$OpenBSD: patch-libltdl_config_ltmain_sh,v 1.2 2011/11/01 16:07:31 jasper Exp $
libltdl/config/ltmain.sh.orig Mon Oct 17 06:19:35 2011
-+++ libltdl/config/ltmain.sh Sat Oct 29 07:05:47 2011
-@@ -2714,51 +2714,6 @@ func_mode_finish ()
+$OpenBSD$
+
+Index: build-aux/ltmain.sh
+--- build-aux/ltmain.sh.orig
build-aux/ltmain.sh
+@@ -4033,51 +4033,6 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
+ $opt_quiet && exit $EXIT_SUCCESS
-if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- echo "--"
@@ -14,27 +16,27 @@ $OpenBSD: patch-libltdl_config_ltmain_sh,v 1.2 2011/11/01 16:07:31 jasper Exp $
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
-- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+- echo "specify the full pathname of the library, or use the '-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
-- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+- echo " - add LIBDIR to the '$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
-- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+- echo " - add LIBDIR to the '$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
-- $ECHO " - use the \`$flag' linker flag"
+- $ECHO " - use the '$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $ECHO " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
-- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+- echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
- fi
- echo
-
@@ -53,7 +55,7 @@ $OpenBSD: patch-libltdl_config_ltmain_sh,v 1.2 2011/11/01 16:07:31 jasper Exp $
exit $EXIT_SUCCESS
}
-@@ -2851,6 +2806,10 @@ func_mode_install ()
+@@ -4172,6 +4127,10 @@ func_mode_install ()
fi
func_append install_shared_prog " $func_quote_for_eval_result"
done
@@ -64,25 +66,25 @@ $OpenBSD: patch-libltdl_config_ltmain_sh,v 1.2
update devel/py-attrs
Here's an update for py-attrs. I have a port for airflow 1.10.14, and it
needs py-attrs to be at version 20.x (but not newer).
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/py-attrs/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- Makefile3 Jul 2020 21:12:40 - 1.8
+++ Makefile15 Feb 2021 21:33:26 -
@@ -2,11 +2,10 @@
COMMENT = classes without boilerplate
-MODPY_EGG_VERSION =19.3.0
+MODPY_EGG_VERSION =20.1.0
DISTNAME = attrs-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-attrs/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo6 Jan 2020 18:12:09 - 1.4
+++ distinfo15 Feb 2021 21:33:26 -
@@ -1,2 +1,2 @@
-SHA256 (attrs-19.3.0.tar.gz) = 97fOFlcP6ZZazW0wEBoo9i+0p/npJrO7ybYfiwQkfnI=
-SIZE (attrs-19.3.0.tar.gz) = 132477
+SHA256 (attrs-20.1.0.tar.gz) = DvlyOIVkMNz5Io4H8xau/Bfok5/IUH4YxlAbdh7xpCo=
+SIZE (attrs-20.1.0.tar.gz) = 160766
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-attrs/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- pkg/PLIST 6 Jan 2020 18:12:09 - 1.4
+++ pkg/PLIST 15 Feb 2021 21:33:26 -
@@ -8,15 +8,18 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_next_gen.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_version_info.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}setters.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/attr/_compat.py
lib/python${MODPY_VERSION}/site-packages/attr/_config.py
lib/python${MODPY_VERSION}/site-packages/attr/_funcs.py
lib/python${MODPY_VERSION}/site-packages/attr/_make.py
+lib/python${MODPY_VERSION}/site-packages/attr/_next_gen.py
lib/python${MODPY_VERSION}/site-packages/attr/_version_info.py
lib/python${MODPY_VERSION}/site-packages/attr/_version_info.pyi
lib/python${MODPY_VERSION}/site-packages/attr/converters.py
@@ -26,6 +29,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/attr/filters.py
lib/python${MODPY_VERSION}/site-packages/attr/filters.pyi
lib/python${MODPY_VERSION}/site-packages/attr/py.typed
+lib/python${MODPY_VERSION}/site-packages/attr/setters.py
+lib/python${MODPY_VERSION}/site-packages/attr/setters.pyi
lib/python${MODPY_VERSION}/site-packages/attr/validators.py
lib/python${MODPY_VERSION}/site-packages/attr/validators.pyi
lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/15 14:35:58 Modified files: net/libsignal-protocol-c: Makefile Added files: net/libsignal-protocol-c/patches: patch-src_key_helper_c patch-src_sender_key_record_c patch-src_sender_key_state_c patch-src_session_record_c patch-src_session_state_c patch-src_signal_utarray_h patch-tests_test_common_c patch-tests_test_utarray_h Log message: net/libsignal-protocol-c: do not pick up incompatible devel/uthash Always build against the included copy of uthash and don't pick up the incompatible newer version from the devel/uthash port if installed. >From maintainer Alex Holst.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/15 14:30:16 Modified files: net/py-ripe.atlas.cousteau: Makefile net/py-ripe.atlas.sagan: Makefile Log message: missed bumps
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/15 14:28:12 Modified files: x11/py-qtawesome: distinfo x11/py-qtawesome/pkg: PLIST Log message: not sure what happened but these didn't get committed somehow. reported by naddy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/15 14:27:26 Modified files: devel/kdevelop : Makefile Log message: Switch to python 3 and disable python build dependency
audio/audacious: Add FLAVOR for QT5 GUI
Hi,
This diff is a team effort between bket@ and myself to add a QT5 FLAVOR
to audacious.
I've been using it the last few days, and it seems to work fine.
Looks like this:
https://theunixzoo.co.uk/random/audacious1.png
Note that sadly we cannot MULTI_PACKAGE it [0], hence FLAVORs.
Comments / OK?
[0] https://redmine.audacious-media-player.org/issues/1071
Index: meta/audacious/Makefile
===
RCS file: /cvs/ports/meta/audacious/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- meta/audacious/Makefile 3 Feb 2021 21:44:37 - 1.6
+++ meta/audacious/Makefile 15 Feb 2021 16:43:00 -
@@ -7,7 +7,15 @@ PKGNAME = audacious-${VERSION}
MAINTAINER = Bjorn Ketelaars
-RUN_DEPENDS= audio/audacious/player>=${VERSION} \
- audio/audacious/plugins>=${VERSION}
+FLAVORS = qt5
+FLAVOR ?=
+
+.if ${FLAVOR:Mqt5}
+RUN_DEPENDS = audio/audacious/player,qt5>=${VERSION} \
+ audio/audacious/plugins,qt5>=${VERSION}
+.else
+RUN_DEPENDS = audacious-player->=${VERSION}-!qt5:audio/audacious/player \
+ audacious-plugins->=${VERSION}-!qt5:audio/audacious/plugins
+.endif
.include
Index: audio/audacious/Makefile
===
RCS file: /cvs/ports/audio/audacious/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- audio/audacious/Makefile15 Apr 2020 15:50:15 - 1.64
+++ audio/audacious/Makefile15 Feb 2021 16:27:02 -
@@ -2,6 +2,8 @@
SUBDIR =
SUBDIR += player
+ SUBDIR += player,qt5
SUBDIR += plugins
+ SUBDIR += plugins,qt5
.include
Index: audio/audacious/Makefile.inc
===
RCS file: /cvs/ports/audio/audacious/Makefile.inc,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.inc
--- audio/audacious/Makefile.inc3 Feb 2021 21:44:37 - 1.6
+++ audio/audacious/Makefile.inc15 Feb 2021 16:27:02 -
@@ -17,12 +17,24 @@ COMPILER = base-clang ports-gcc
FIX_EXTRACT_PERMISSIONS = Yes
BUILD_DEPENDS += devel/gettext,-tools
+
+# Although at fist glance it may appear that we could MULTI_PACKAGE audacious,
+# actually we can't. Some core libraries will link qt5 if we build with both
+# toolkits. So we use FLAVORS instead.
+# https://redmine.audacious-media-player.org/issues/1071
+
+.if ${FLAVOR:Mqt5}
+MODULES += x11/qt5
+CONFIGURE_ARGS += --disable-gtk \
+ --enable-qt
+.else
LIB_DEPENDS += x11/gtk+2
+CONFIGURE_ARGS += --disable-qt \
+ --enable-gtk
+.endif
USE_GMAKE =Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --disable-qt \
- --enable-gtk
NO_TEST = Yes
Index: audio/audacious/player/Makefile
===
RCS file: /cvs/ports/audio/audacious/player/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- audio/audacious/player/Makefile 3 Feb 2021 21:44:37 - 1.4
+++ audio/audacious/player/Makefile 15 Feb 2021 16:27:02 -
@@ -5,24 +5,38 @@ COMMENT = graphical audio player which
DISTNAME = audacious-${VERSION}
PKGNAME = audacious-player-${VERSION}
+FLAVORS = qt5
+FLAVOR ?=
+
SHARED_LIBS += audcore 5.2 # 5.3
SHARED_LIBS += audgui 4.1 # 5.1
SHARED_LIBS += audtag 3.0 # 3.0
+SHARED_LIBS += audqt 0.0 # 2.3
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
-WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 z
+WANTLIB += ${COMPILER_LIBCXX} c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += iconv intl m
+
+.if ${FLAVOR:Mqt5}
+WANTLIB += Qt5Core Qt5Gui Qt5Widgets
+.else
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
+WANTLIB += gdk_pixbuf-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 z
+.endif
+
+RUN_DEPENDS = devel/desktop-file-utils
-RUN_DEPENDS = devel/desktop-file-utils \
- x11/gtk+3,-guic
+.if !${FLAVOR:Mqt5}
+RUN_DEPENDS += x11/gtk+3,-guic
+.endif
MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \
LIBaudgui_VERSION=${LIBaudgui_VERSION} \
- LIBaudtag_VERSION=${LIBaudtag_VERSION}
+ LIBaudtag_VERSION=${LIBaudtag_VERSION} \
+ LIBaudqt_VERSION=${LIBaudqt_VERSION}
.include
Index:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/15 12:52:56 Modified files: net/irssi : Makefile Log message: Drop myself as MAINTAINER
Re: [PATCH] Use erlang21 for net/rabbitmq
Hi, Am Sonntag, Februar 14, 2021 23:01 CET, schrieb Stuart Henderson : > On 2021/02/08 20:59, Greg Steuck wrote: > > The other victim of my quest to get rid of erlang19 which is not > > -fno-common friendly. > > > > The package builds fine, but once installed it fails to start due to > > "Error when reading /var/rabbitmq/.erlang.cookie: eacces" when launched > > with `/etc/rc.d/rabbitmq -d start`. The cookie file is for some reason > > owned by root so a manual fixup of `chown _rabbitmq > > /var/rabbitmq/.erlang.cookie` makes the daemon runnable. > > > > I don't know what else to test and never heard of rabbitmq until today. > > > > If somebody feels this is enough, OK? > > > > diff --git net/rabbitmq/Makefile net/rabbitmq/Makefile > > index 5003dcf1bfe..e6b95d3eb66 100644 > > --- net/rabbitmq/Makefile > > +++ net/rabbitmq/Makefile > > @@ -3,7 +3,7 @@ > > COMMENT = highly reliable Enterprise Messaging System > > > > V =3.6.15 > > -REVISION = 2 > > +REVISION = 3 > > DISTNAME = rabbitmq-server-$V > > PKGNAME = rabbitmq-$V > > CATEGORIES = net > > @@ -20,7 +20,7 @@ EXTRACT_SUFX =.tar.xz > > > > MODULES = lang/erlang \ > > lang/python > > -MODERL_VERSION = 19 > > +MODERL_VERSION = 21 > > > > USE_GMAKE =Yes > > CONFIGURE_STYLE = none > > -- > > 2.30.0 > > > > Upstream says "Maximum supported Erlang/OTP: 20.3.x" for 3.6.15. > Please just mark it BROKEN. > > Sebastian, if you don't want to maintain the port, please drop > the MAINTAINER line. > sorry for the late reply, I only read ports@ ocassionally, and when I'm only CC: instead of TO: it doesn't end up in my inbox catching my attention, but gets filtered to the ports subfolder. In any case, I still have it running, but probably should not. I marked it BROKEN, and dropped MAINTAINER. Sebastian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2021/02/15 12:30:49 Modified files: net/rabbitmq : Makefile Log message: Mark as broken, security issues, and needs an update to work with newer versions of Erlang Drop MAINTAINER
Re: NEW: www/py-html5-parser
On Mon, 15 Feb 2021, Rafael Sadowski wrote: > Please find attached a new dependency for an possible calibre update. > I think it needs dependencies on at least: - py-lxml - py-chardet - py-beautifulsoup4 maybe more things too, but that's as far as I got.
Re: NEW: textproc/py-regex
On Mon, 15 Feb 2021, Rafael Sadowski wrote: > Please find attached a new dependency for a possible calibre update. > I need this too. I don't feel too strongly about any of these, so up to you what you want to change. - move from textproc to devel, like all other regex modules - remove the comma and full stop in COMMENT - I think we should point HOMEPAGE to the bitbucket page rather than pypi - we don't have a lot of consistency for the license marker but I think "Apache 2.0" is more common in the tree - tests need more work, just add NO_TESTS (or fix if you really want) ok daniel@ to import after you decide about the above.
Re: [update] net/snort 2.9.17, fix for -fno-common
ping
On Tue, Feb 09, 2021 at 11:51:25PM +0100, Markus Lude wrote:
> Hello,
>
> attached is an update to snort 2.9.17. The new version includes fixes
> for gcc-10. Tested on amd64.
>
> Please test and eventually commit. Thanks.
>
> Regards,
> Markus
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.107
diff -u -p -u -p -r1.107 Makefile
--- Makefile27 May 2020 02:32:10 - 1.107
+++ Makefile9 Feb 2021 22:46:07 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.16
-RULESV = 29160
+DISTNAME = snort-2.9.17
+RULESV = 29170
SUBST_VARS = RULESV
CATEGORIES = net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 distinfo
--- distinfo27 May 2020 02:32:10 - 1.43
+++ distinfo9 Feb 2021 22:46:07 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.16.tar.gz) = lojY7fHaCd7GV0AA+zwOYvmcVkKFh2FuF8YBA8C8utc=
-SIZE (snort-2.9.16.tar.gz) = 6948498
+SHA256 (snort-2.9.17.tar.gz) = w7I0w5IqCbA2i4R9240fo3G3QfAy9Cqpq1PWe0KNxkg=
+SIZE (snort-2.9.17.tar.gz) = 6983018
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-src_decode_h
--- patches/patch-src_decode_h 27 May 2020 02:32:10 - 1.12
+++ patches/patch-src_decode_h 9 Feb 2021 22:46:07 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_decode_h,v 1.12 2020
Index: src/decode.h
--- src/decode.h.orig
+++ src/decode.h
-@@ -837,9 +837,9 @@ typedef struct _SLLHdr {
+@@ -839,9 +839,9 @@ typedef struct _SLLHdr {
* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-preprocessors_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 27 May 2020 02:32:10
- 1.21
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 9 Feb 2021 22:46:07
-
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/Makefile.in
--- src/dynamic-preprocessors/Makefile.in.orig
+++ src/dynamic-preprocessors/Makefile.in
-@@ -1649,19 +1649,8 @@ clean-local:
+@@ -1650,19 +1650,8 @@ clean-local:
rm -rf include build
install-data-local:
Index: patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
===
RCS file: patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
diff -N patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_dynamic-preprocessors_s7commplus_Makefile_in 9 Feb
2021 22:46:07 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/dynamic-preprocessors/s7commplus/Makefile.in
+--- src/dynamic-preprocessors/s7commplus/Makefile.in.orig
src/dynamic-preprocessors/s7commplus/Makefile.in
+@@ -344,7 +344,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_s7commplus_preproc.la
+-libsf_s7commplus_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
++libsf_s7commplus_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
+ @SO_WITH_STATIC_LIB_TRUE@libsf_s7commplus_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
+ @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_s7commplus_preproc_la_SOURCES = \
+ @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
+@@ -546,7 +546,7 @@ distdir-am: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) all-local
++all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_log_c
===
RCS file: /cvs/ports/net/snort/patches/patch-src_log_c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-src_log_c
--- patches/patch-src_log_c 1 Dec 2019 03:19:10 - 1.8
+++ patches/patch-src_log_c 9 Feb 2021 22:46:07 -
@@ -11,7 +11,7 @@ Index: src/log.c
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
-@@ -1971,7 +1971,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
+@@ -1975,7 +1975,7 @@ void
NEW: textproc/py-regex
Please find attached a new dependency for a possible calibre update. Information for inst:py3-regex-2020.11.13 Comment: alternative regular expression module, to replace re. Description: This regex implementation is backwards-compatible with the standard re module, but offers additional functionality. Maintainer: The OpenBSD ports mailing-list WWW: https://pypi.python.org/pypi/regex py3-regex-2020.11.13.tar.gz Description: Binary data
NEW: www/py-html5-parser
Please find attached a new dependency for an possible calibre update. Information for inst:py3-html5-parser-0.4.9 Comment: fast C based HTML 5 parsing for python Description: A fast implementation of the HTML 5 parsing spec for Python. Parsing is done in C using a variant of the gumbo parser. The gumbo parse tree is then transformed into an lxml tree, also in C, yielding parse times that can be a thirtieth of the html5lib parse times. Maintainer: The OpenBSD ports mailing-list WWW: https://pypi.python.org/pypi/html5-parser py3-html5-parser-0.4.9.tar.gz Description: Binary data
[new] devel/py-toolz
Here's a port for py-toolz, needed for a few upcoming ports. ok to import? Information for inst:py3-toolz-0.11.1 Comment: utility functions similar to itertools and functools Description: py-toolz provides a set of utility functions for iterators, functions, and dictionaries. These functions interoperate well and form the building blocks of common data analytic operations. They extend the standard libraries itertools and functools and borrow heavily from the standard libraries of contemporary functional languages. Maintainer: The OpenBSD ports mailing-list WWW: https://toolz.readthedocs.io/ py-toolz.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/15 10:13:29 Modified files: graphics/ksnip : Makefile distinfo Added files: graphics/ksnip/patches: patch-src_common_provider_ScaledSizeProvider_cpp Removed files: graphics/ksnip/patches: patch-src_CMakeLists_txt patch-src_backend_config_KsnipConfigProvider_cpp patch-src_backend_config_KsnipConfigProvider_h patch-src_backend_imageGrabber_ImageGrabberFactory_cpp patch-src_backend_imageGrabber_ImageGrabberFactory_h patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_cpp patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_h patch-src_common_helper_FileUrlHelper_cpp patch-src_common_platform_HdpiScaler_cpp patch-src_common_platform_HdpiScaler_mm patch-src_gui_desktopService_DesktopServiceAdapter_cpp patch-src_gui_desktopService_DesktopServiceAdapter_h patch-src_gui_globalHotKeys_KeyHandlerFactory_cpp patch-src_gui_globalHotKeys_KeyHandlerFactory_h patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_cpp patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_h Log message: Update ksnip to 1.8.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/15 10:11:39 Modified files: graphics/kimageannotator: Makefile distinfo graphics/kimageannotator/pkg: PLIST Log message: Update kimageannotator to 0.4.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/15 09:47:31 Modified files: games/sdlroids : Makefile Added files: games/sdlroids/patches: patch-getargs_h Log message: games/sdlroids: fix build with -fno-common
Re: [New] libva-intel-media-driver port
Hopefuly, I'll have some spare time soon. I'll see how best to integrate it. 6.9 is closing on us =) -- Eugene Moz.
Re: Update node_exporter v1.1.1
On Mon, Feb 15, 2021 at 09:19:16AM -0700, Aaron Bieber wrote:
>
> Claudio Jeker writes:
>
> > This is my attempt to update node_exporter.
> > Since prometheus switched to go mod I decided to switch the port to.
> >
> > Now I did not want to fight with the lang/go module and dropped building
> > the port with promu. Now this works fine the only issue is that the
> > version and build info is missing in node_exporter --version.
>
> FWIW you can set the version by adding the below to the Makefile:
>
> MODGO_LDFLAGS =-X
> github.com/prometheus/common/version.Version=${MODGO_VERSION}
>
I added something similar that also sets the builduser.
> >
> > For a simple system info collector the amount of dependencies required is
> > just insane. If this is the future of golang then I will move back under
> > my rock.
>
> Ya, it's unfortunate that people are so quick to reach for
> dependencies. It's defiantly not a unique-to-golang thing though!
>
> Anyway - this works on my machine just fine so OK abieber@
One issue I found is that for amd64 node_memory_cache_bytes is always 0.
This is because for amd64 node_exporter no longer uses cgo and just fails
to load the needed data for the size of the buffer cache.
--
:wq Claudio
Re: Update node_exporter v1.1.1
Claudio Jeker writes:
> This is my attempt to update node_exporter.
> Since prometheus switched to go mod I decided to switch the port to.
>
> Now I did not want to fight with the lang/go module and dropped building
> the port with promu. Now this works fine the only issue is that the
> version and build info is missing in node_exporter --version.
FWIW you can set the version by adding the below to the Makefile:
MODGO_LDFLAGS =-X
github.com/prometheus/common/version.Version=${MODGO_VERSION}
>
> For a simple system info collector the amount of dependencies required is
> just insane. If this is the future of golang then I will move back under
> my rock.
Ya, it's unfortunate that people are so quick to reach for
dependencies. It's defiantly not a unique-to-golang thing though!
Anyway - this works on my machine just fine so OK abieber@
FIX: comms/xastir -fno-common
Hello ports,
I have a port for the more up to date version 2.1.6 in my own tree,
however this would need more testing; so for now here is just a fix for
version 2.0.6 with -fno-common.
Tested on amd64.
Index: Makefile
===
RCS file: /cvs/ports/comms/xastir/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- Makefile16 Jan 2021 17:26:16 - 1.41
+++ Makefile15 Feb 2021 16:04:56 -
@@ -3,7 +3,7 @@
COMMENT= X amateur station tracking and info reporting
DISTNAME= xastir-2.0.6
-REVISION= 5
+REVISION= 6
CATEGORIES=comms hamradio geo
Index: patches/patch-src_objects_h
===
RCS file: patches/patch-src_objects_h
diff -N patches/patch-src_objects_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_objects_h 15 Feb 2021 16:04:56 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/objects.h
+--- src/objects.h.orig
src/objects.h
+@@ -97,7 +97,7 @@ if (debug_level & 4) { fprintf(stderr, "Changing euid
+ //
+ // number_of_predefined_objects holds the actual number of predefined
+ // objects available to display on the Create/Move popup menu.
+-int number_of_predefined_objects;
++extern int number_of_predefined_objects;
+ // File name of ~/.xastir/config file containing definitions for
+ // a predefined object menu.
+ extern char predefined_object_definition_filename[256];
Index: patches/patch-src_x_spider_h
===
RCS file: patches/patch-src_x_spider_h
diff -N patches/patch-src_x_spider_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_x_spider_h15 Feb 2021 16:04:56 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/x_spider.h
+--- src/x_spider.h.orig
src/x_spider.h
+@@ -32,7 +32,7 @@
+ #define SERV_UDP_PORT 2023
+
+
+-char *pname;
++extern char *pname;
+ extern int pipe_xastir_to_tcp_server;
+ extern int pipe_tcp_server_to_xastir;
+ extern int pipe_xastir_to_udp_server;
Index: patches/patch-src_xa_config_c
===
RCS file: patches/patch-src_xa_config_c
diff -N patches/patch-src_xa_config_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_xa_config_c 15 Feb 2021 16:04:56 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/xa_config.c
+--- src/xa_config.c.orig
src/xa_config.c
+@@ -66,8 +66,7 @@
+
+ #define MAX_VALUE 300
+
+-//extern char xa_config_dir[];
+-
++char xa_config_dir[1000];
+
+
+ void store_string(FILE * fout, char *option, char *value) {
Index: patches/patch-src_xa_config_h
===
RCS file: patches/patch-src_xa_config_h
diff -N patches/patch-src_xa_config_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_xa_config_h 15 Feb 2021 16:04:56 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: src/xa_config.h
+--- src/xa_config.h.orig
src/xa_config.h
+@@ -32,4 +32,4 @@ char *get_data_base_dir(char *dir);
+ void save_data(void);
+ void load_data_or_default(void);
+
+-char xa_config_dir[1000]; /* cmdline option user config dir */
++extern char xa_config_dir[1000]; /* cmdline option user config dir */
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/15 08:56:40 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm graphics : Makefile Removed files: graphics/enjoympeg: Makefile distinfo graphics/enjoympeg/pkg: DESCR PLIST Log message: remove graphics/enjoympeg MPEG-1 video (Video CD) is laughably obsolete. FFmpeg etc. can still handle it if somebody is really sitting on an archive of VHS-quality videos. Noticed because of failure to build with -fno-common. ok kmos@ kn@
Remove comms/scmxx?
comms/scmxx fails to build with -fno-common. There is actually a slightly newer version 0.9.0 from 2006 available, which will presumably need the same fix. "data exchange utility for Siemens mobile phones" Hmm. Siemens Mobile folded 15 years ago. I guess it's _possible_ that somebody still uses a cellphone from back then in those countries that haven't yet switched off GSM... Still, maybe it's time to bury this piece of history. -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2021/02/15 08:08:34 Modified files: www/openradtool: Makefile distinfo www/openradtool/pkg: PLIST Log message: Update openradtool to 0.11.11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2021/02/15 06:07:39 Modified files: www/logswan: Makefile distinfo Log message: Update logswan to 2.1.10.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2021/02/15 05:51:07 Modified files: sysutils/psftools: Makefile distinfo sysutils/psftools/pkg: PLIST Log message: Update psftools to 1.1.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2021/02/15 05:50:21 Modified files: graphics/ansilove: Makefile distinfo Log message: Update ansilove to 4.1.5.
[mar...@nazgul.ch: Re: Back-out USB data toggle fix]
OK?
- Forwarded message from Marcus Glocker -
From: Marcus Glocker
To: Stuart Henderson
Cc: t...@openbsd.org
Date: Sun, 14 Feb 2021 20:26:48 +0100
Subject: Re: Back-out USB data toggle fix
On Sun, Feb 14, 2021 at 04:43:17PM +, Stuart Henderson wrote:
> On 2021/02/14 15:22, Marcus Glocker wrote:
> > Unfortunately I'm seeing more and more USB device breakages reported
> > the last few days related to the USB data toggle fix which we did
> > commit 2-3 weeks ago.
>
> Do you think this could this be implicated in a keyboard with 'stuck'
> keys i.e. keep repeating? I've hit it a few times recently, but didn't
> look that far back. (Nothing amiss in logs when it happens).
I don't think so since the issue also has been reported for some fido(4)
devices.
> > +/*
> > + * Workaround for OpenBSD <=6.6-current (as of 201910) bug that loses
> > + * sync of DATA0/DATA1 sequence bit across uhid open/close.
> > + * Send pings until we get a response - early pings with incorrect
> > + * sequence bits will be ignored as duplicate packets by the device.
> > + */
> > +static int
> > +terrible_ping_kludge(struct hid_openbsd *ctx)
>
> it will need to be put back in chromium too (and port revision will
> need to be bumped)
Right, the chromium diff was included, but I did forget to bump.
Index: www/chromium/Makefile
===
RCS file: /cvs/ports/www/chromium/Makefile,v
retrieving revision 1.546
diff -u -p -u -p -r1.546 Makefile
--- www/chromium/Makefile 6 Feb 2021 07:33:27 - 1.546
+++ www/chromium/Makefile 14 Feb 2021 19:24:08 -
@@ -18,6 +18,7 @@ COMMENT= Chromium browser
V= 88.0.4324.150
DISTNAME= chromium-${V}
+REVISION= 0
DISTFILES+=chromium-${V}${EXTRACT_SUFX}
Index: www/chromium/files/hid_service_fido.cc
===
RCS file: /cvs/ports/www/chromium/files/hid_service_fido.cc,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 hid_service_fido.cc
--- www/chromium/files/hid_service_fido.cc 6 Feb 2021 05:05:04 -
1.4
+++ www/chromium/files/hid_service_fido.cc 14 Feb 2021 19:24:09 -
@@ -11,7 +11,10 @@
#include
#include
+// TODO: remove once the missing guard in fido.h is fixed upstream.
+extern "C" {
#include
+}
#include
#include
@@ -72,6 +75,55 @@ void FinishOpen(std::unique_ptr params) {
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
base::BlockingType::MAY_BLOCK);
@@ -85,6 +137,11 @@ void OpenOnBlockingThread(std::unique_pt
if (!device_file.IsValid()) {
HID_LOG(EVENT) << "Failed to open '" << device_node << "': "
<< base::File::ErrorToString(device_file.error_details());
+task_runner->PostTask(FROM_HERE,
base::BindOnce(std::move(params->callback), nullptr));
+return;
+ }
+ if (!terrible_ping_kludge(device_file.GetPlatformFile(), device_node)) {
+HID_LOG(EVENT) << "Failed to ping " << device_node;
task_runner->PostTask(FROM_HERE,
base::BindOnce(std::move(params->callback), nullptr));
return;
}
- End forwarded message -
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: feine...@cvs.openbsd.org2021/02/15 03:43:19 Modified files: math/R : Makefile distinfo math/R/patches : patch-configure math/R/pkg : PLIST Log message: Update to R 4.0.4
py-rcsparse for Python3
Hi,
I'm working on supporting Python3 for cvs2gitdump and tested
py3-rcsparse. It's needed to be done following 2 things.
- Fix rcsparse to accept a str as an argument for sym2rev() or revs[]
by using PyUnicode_AsUTF8AndSize(). The str is converted into an
UTF-8 encoded byte array. This fixes "print s['RELENG_4']" test.
- Use a bytes object for the result of "log" or "checkout" instead of
a str object since it is needed to keep the original encoding
(utf-8, latin-1, euc-jp and so on).
ok?
As for cvs2gitdump, it already working with Python3 and I'm testing it.
https://github.com/yasuoka/cvs2gitdump/tree/WIP
Index: devel/py-rcsparse/Makefile
===
RCS file: /disk/cvs/openbsd/ports/devel/py-rcsparse/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- devel/py-rcsparse/Makefile 16 Jan 2021 13:56:09 - 1.21
+++ devel/py-rcsparse/Makefile 15 Feb 2021 09:59:13 -
@@ -8,7 +8,7 @@ GH_COMMIT= 206bca0b90f5780815c0b6c6cbcc
DISTNAME= rcsparse-20151027
PKGNAME= py-${DISTNAME}
-REVISION= 0
+REVISION= 1
CATEGORIES=devel
Index: devel/py-rcsparse/patches/patch-py-rcsparse_c
===
RCS file:
/disk/cvs/openbsd/ports/devel/py-rcsparse/patches/patch-py-rcsparse_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-py-rcsparse_c
--- devel/py-rcsparse/patches/patch-py-rcsparse_c 16 Jan 2021 13:56:09
- 1.3
+++ devel/py-rcsparse/patches/patch-py-rcsparse_c 15 Feb 2021 09:58:46
-
@@ -3,21 +3,27 @@ $OpenBSD: patch-py-rcsparse_c,v 1.3 2021
Index: py-rcsparse.c
--- py-rcsparse.c.orig
+++ py-rcsparse.c
-@@ -25,6 +25,13 @@
+@@ -25,6 +25,19 @@
#include "rcsparse.h"
+#if PY_MAJOR_VERSION >= 3
-+#define PyString_AsStringAndSize PyBytes_AsStringAndSize
++#define PyString_AsStringAndSize _PyUnicode_AsUTF8AndSize
+#define PyString_CheckExact PyUnicode_CheckExact
+#define PyString_FromString PyUnicode_FromString
+#define PyString_FromStringAndSizePyUnicode_FromStringAndSize
+#endif
+
++static void
++_PyUnicode_AsUTF8AndSize(PyObject *obj, char **strp, Py_ssize_t *sizep)
++{
++ *strp = PyUnicode_AsUTF8AndSize(obj, sizep);
++}
++
static PyObject *
rcstoken2pystr(struct rcstoken *tok)
{
-@@ -124,7 +131,11 @@ rcsrev2py(struct rcsrev *rev)
+@@ -124,7 +137,11 @@ rcsrev2py(struct rcsrev *rev)
return Py_BuildValue("NNN",
rcstoken2pystr(rev->rev),
@@ -29,7 +35,7 @@ Index: py-rcsparse.c
rcstoken2pystr(rev->author),
rcstoken2pystr(rev->state),
rcstoklist2py(>branches),
-@@ -275,7 +286,7 @@ static void
+@@ -275,7 +292,7 @@ static void
pyrcsrevtree_dealloc(struct pyrcsrevtree *self)
{
Py_DECREF((PyObject *)self->pyrcs);
@@ -38,7 +44,7 @@ Index: py-rcsparse.c
}
static PyMappingMethods pyrcsrevtree_mapmethods = {
-@@ -300,7 +311,7 @@ static PyMethodDef pyrcsrevtree_methods[] = {
+@@ -300,7 +317,7 @@ static PyMethodDef pyrcsrevtree_methods[] = {
};
static PyTypeObject pyrcsrevtree_type = {
@@ -47,7 +53,7 @@ Index: py-rcsparse.c
.tp_name= "rcsparse.rcsrevtree",
.tp_basicsize= sizeof(struct pyrcsrevtree),
.tp_dealloc=(destructor)pyrcsrevtree_dealloc,
-@@ -496,7 +507,7 @@ static void
+@@ -496,7 +513,7 @@ static void
pyrcstokmap_dealloc(struct pyrcstokmap *self)
{
Py_DECREF((PyObject *)self->pyrcs);
@@ -56,7 +62,7 @@ Index: py-rcsparse.c
}
static PyMappingMethods pyrcstokmap_mapmethods = {
-@@ -521,7 +532,7 @@ static PyMethodDef pyrcstokmap_methods[] = {
+@@ -521,7 +538,7 @@ static PyMethodDef pyrcstokmap_methods[] = {
};
static PyTypeObject pyrcstokmap_type = {
@@ -65,7 +71,31 @@ Index: py-rcsparse.c
.tp_name= "rcsparse.rcstokmap",
.tp_basicsize= sizeof(struct pyrcstokmap),
.tp_dealloc=(destructor)pyrcstokmap_dealloc,
-@@ -720,7 +731,7 @@ pyrcsfile_dealloc(struct pyrcsfile *self)
+@@ -645,7 +662,11 @@ pyrcsfile_checkout(struct pyrcsfile *self, PyObject *a
+ if (buf == NULL)
+ return PyErr_Format(PyExc_RuntimeError, "Error parsing");
+
++#if PY_MAJOR_VERSION >= 3
++ o = PyBytes_FromStringAndSize(buf, len);
++#else
+ o = PyString_FromStringAndSize(buf, len);
++#endif
+ free(buf);
+ return o;
+ }
+@@ -664,7 +685,11 @@ pyrcsfile_getlog(struct pyrcsfile *self, PyObject *arg
+ if (buf == NULL)
+ return PyErr_Format(PyExc_RuntimeError, "Error parsing");
+
++#if PY_MAJOR_VERSION >= 3
++ o = PyBytes_FromString(buf);
++#else
+ o = PyString_FromString(buf);
++#endif
+ free(buf);
+ return o;
+ }
+@@ -720,7 +745,7 @@ pyrcsfile_dealloc(struct pyrcsfile *self)
if
Re: undefined symbol error while building openimageio
On 2021/02/15 03:03, Dimitri Karamazov wrote: > I get an undefined symbol error during the linking > process even though it is defined in libOpenImageIO.so. > > Don't know what to make of this. Any help will be > appreciated. The full build log is below the update diff. If you have the old version installed, remove it and try again > -SHARED_LIBS += OpenImageIO 8.0 # 2.2.10 > -SHARED_LIBS += OpenImageIO_Util4.0 # 2.2.10 > +#SHARED_LIBS += OpenImageIO 9.0 # 2.2.11 > +#SHARED_LIBS += OpenImageIO_Util5.0 # 2.2.11 Better to not comment those out during an update, especially in a cmake port
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/15 02:34:19 Modified files: www/squid : Makefile distinfo Log message: update to squid-4.14
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/15 02:20:33 Modified files: x11: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: x11/driftnet : Makefile distinfo x11/driftnet/patches: patch-Makefile_in patch-configure_ac patch-src_display_gif_c patch-src_display_img_h patch-src_display_png_c patch-src_layer2_c patch-src_layer3_c patch-src_packetcapture_c patch-src_packetcapture_h patch-src_tmpdir_c patch-src_tmpdir_h x11/driftnet/pkg: DESCR PLIST Log message: Remove x11/driftnet This tool segfaults when 1. ran without any arguments 2. passing "--help" instead of "-h" 3. passing an invalid pcap-filter(5) expression, e.g. "foo" Running it and opening HOMEPAGE in a browser shows HTTP traffic to the site but the tool fails to do its job entirely, i.e. it cannot detect/show/etc. the JPEG image http://www.ex-parrot.com/~chris/driftnet/screenshot.jpg as requested by the browser. OK claudio
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: clau...@cvs.openbsd.org 2021/02/15 02:19:45 Added files: sysutils/prometheus/patches: patch-Makefile Log message: Update prometheus to v2.24.1. This port needs an extra react web UI package that I provide. Building react is a nightmare and to complicated for bulk builds. Also embedding the web UI into the go binary makes it hard to extract it from other offical builds. OK rsadowski@ sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: clau...@cvs.openbsd.org 2021/02/15 02:18:37 Modified files: sysutils/prometheus/pkg: PLIST sysutils/prometheus/patches: patch-Makefile_common patch-_promu_yml Log message: Update prometheus to v2.24.1. This port needs an extra react web UI package that I provide. Building react is a nightmare and to complicated for bulk builds. Also embedding the web UI into the go binary makes it hard to extract it from other offical builds. OK rsadowski@ sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: clau...@cvs.openbsd.org 2021/02/15 01:56:57 Modified files: devel/promu: Makefile distinfo Log message: Update promu to v0.7.0 OK sthen@
Re: UPDATE: graphics/ksnip
Rafael Sadowski writes: > Update ksnip and dependency to the last version. This update drops a lot > of upstreamed patches. > > Tests and feedback welcome. Builds and works fine here. Thanks for the update :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/15 01:44:05 Modified files: net/telepathy/telepathy-logger: Makefile Added files: net/telepathy/telepathy-logger/patches: patch-tools_c-constants-gen_py patch-tools_glib-client-gen_py patch-tools_glib-client-marshaller-gen_py patch-tools_glib-ginterface-gen_py patch-tools_glib-gtypes-generator_py patch-tools_glib-interfaces-gen_py patch-tools_libglibcodegen_py patch-tools_libtpcodegen_py patch-tools_xincludator_py Log message: telepathy-logger: use python 3, ok jasper@ patches from upstream
Re: Update to x11/driftnet
On Sun, Feb 14, 2021 at 12:42:12PM +0100, Klemens Nanni wrote:
> On Sun, Feb 14, 2021 at 09:32:06AM +0100, Claudio Jeker wrote:
> > Here is an update to x11/driftnet. Switch to a github repo that seems to
> > include some of our fixes and is a bit more current. Drop maintainer since
> > I don't think this program is that useful anymore. Most websites are
> > using secure transport now and so driftnet is rather useless.
> >
> > What do other people think?
> Regarding content extraction modulo pretty display functions, does this
> port do anything which Wireshark cannot do?
>
> I've applied your diff an ran `make install' on my X230 to test the
> program:
>
> $ driftnet
> Sun Feb 14 12:26:29 2021 [driftnet] error: pcap_activate: You don't
> have permission to capture on that device
> Segmentation fault (core dumped)
>
> $ egdb --quiet -batch -ex bt driftnet ./driftnet.core
> [New process 324491]
> Core was generated by `driftnet'.
> Program terminated with signal SIGSEGV, Segmentation fault.
> #0 pthread_cancel (thread=0x0) at /usr/src/lib/librthread/rthread.c:430
> 430 struct tib *tib = thread->tib;
> #0 pthread_cancel (thread=0x0) at /usr/src/lib/librthread/rthread.c:430
> #1 0x0f1078010e5a in ?? ()
> #2 0x0f1078009d61 in ?? ()
> #3 0x0f107800af7f in ?? ()
> #4 0x0f1078009dec in ?? ()
> #5 0x0f1078009371 in ?? ()
> #6 0x in ?? ()
>
> Even `driftnet --help' dumps core (only `-h' is recognised).
>
> Dropping to an unprivileged user as per `-Z' only works if that user is
> also able to use X:
>
> $ doas driftnet -v -i trunk0 -Z _tcpdump
> Sun Feb 14 12:36:00 2021 [driftnet] info: listening on trunk0 in
> promiscuous mode
> Sun Feb 14 12:36:00 2021 [driftnet] info: dropped privileges to user
> _tcpdump
> Sun Feb 14 12:36:00 2021 [driftnet] info: using temporary file
> directory /tmp//driftnet-8Idoys
> Sun Feb 14 12:36:00 2021 [driftnet] info: started display child, pid
> 90930
> No protocol specified
>
> (driftnet:90930): Gtk-WARNING **: 12:36:00.501: cannot open display: :0
> Sun Feb 14 12:36:01 2021 [driftnet] info: child process 90930 exited
> with status 1
>
> It also shits its pants on invalid filters:
>
> $ doas driftnet -v -i trunk0 -Z _tcpdump foo
> Sun Feb 14 12:41:01 2021 [driftnet] error: pcap_compile: syntax error
> in filter expression
> Segmentation fault
>
>
> This is the log from opening http://www.ex-parrot.com/~chris/driftnet/
> and http://www.ex-parrot.com/~chris/driftnet/screenshot.jpg directly in
> a browser; I fail to see the JPEG image being extracted/displayed/etc.
>
> $ doas driftnet -v -i trunk0 -Z kn
> Sun Feb 14 12:32:15 2021 [driftnet] info: listening on trunk0 in
> promiscuous mode
> Sun Feb 14 12:32:15 2021 [driftnet] info: using temporary file
> directory /tmp//driftnet-pySkMn
> Sun Feb 14 12:32:15 2021 [driftnet] info: started display child, pid
> 42009
> Sun Feb 14 12:32:24 2021 [driftnet] info: new connection:
> 192.168.2.199:23160 -> 93.93.130.166:80
> Sun Feb 14 12:32:24 2021 [driftnet] info: new connection:
> 93.93.130.166:80 -> 192.168.2.199:23160
> Sun Feb 14 12:32:29 2021 [driftnet] info: connection closing:
> 93.93.130.166:80 -> 192.168.2.199:23160, 214 bytes transferred
> ^C
> Sun Feb 14 12:32:46 2021 [driftnet] info: caught signal 2
>
> How about you just remove this port? OK kn to do so, but I'll gladly
> take care of this myself with your OK as well.
Yes, driftnet is built around the assumption that every image is sent in a
seperate HTTP connection, it does not handle pipelining or embedded images
and the world moved on since the early 2000. Also not surprised about all
the crashes, it was not build to be a solid network sniffer.
I wont miss this gimmick tool and happy to remove it.
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/driftnet/Makefile,v
> > retrieving revision 1.16
> > diff -u -p -r1.16 Makefile
> > --- Makefile12 Jul 2019 20:51:09 - 1.16
> > +++ Makefile14 Feb 2021 08:26:07 -
> > @@ -1,36 +1,35 @@
> > # $OpenBSD: Makefile,v 1.16 2019/07/12 20:51:09 sthen Exp $
> >
> > -COMMENT= network sniffer that grabs and displays images
> > +COMMENT = network sniffer that grabs and displays images
> >
> > -VERSION = 1.0
> > -DISTNAME= driftnet_${VERSION}.orig
> > -PKGNAME= driftnet-${VERSION}
> > -REVISION= 1
> > -CATEGORIES=x11
> > +VERSION = 1.2.0
> > +DISTNAME = driftnet-${VERSION}
> >
> > -HOMEPAGE= http://www.ex-parrot.com/~chris/driftnet/
> > +GH_ACCOUNT = deiv
> > +GH_PROJECT = driftnet
> > +GH_TAGNAME = v1.2.0
> There is https://github.com/deiv/driftnet/releases/tag/v1.3.0 available.
>
> >
