CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/01/21 00:55:56 Modified files: math/gnumeric : Makefile distinfo Log message: Update to gnumeric-1.12.51.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/01/21 00:55:41 Modified files: devel/goffice : Makefile distinfo Log message: Update to goffice-0.10.51.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2022/01/21 00:20:20 Modified files: lang/rust : Makefile distinfo Log message: update lang/rust to 1.58.1 ChangeLog: https://blog.rust-lang.org/2022/01/20/Rust-1.58.1.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2022/01/21 00:10:54 Modified files: x11/gnome/mutter: Makefile Added files: x11/gnome/mutter/patches: patch-src_backends_meta-stage-impl_c Log message: add a hack to unbreak on amdgpu because mutter hangs on anything that is running amdgpu and non-glibc; the issue has been reported upstream ok aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/01/21 00:09:33 Modified files: graphics/sane-backends: Makefile distinfo graphics/sane-backends/patches: patch-backend_genesys_low_cpp patch-doc_saned_man graphics/sane-backends/pkg: PLIST Added files: graphics/sane-backends/patches: patch-acinclude_m4 patch-backend_Makefile_am patch-configure_ac Removed files: graphics/sane-backends/patches: patch-backend_Makefile_in patch-backend_epsonds_c patch-configure Log message: Update to sane-backends-1.1.1.
UPDATE archivers/zstd-1.5.2
zstd-1.5.2 is a bug-fix release. From https://github.com/facebook/zstd/releases/tag/v1.5.2: - As a side-effect of the inclusion of assembly code in our source tree, binary artifacts were being marked as needing an executable stack on non-amd64 architectures. This release corrects that issue. More context is available in #2963. - This release also corrects a performance regression that was introduced in v1.5.0 that slows down compression of very small data when using the streaming API. Issue #2966 tracks that topic. - In addition there are a number of smaller improvements and fixes. There seem to be *no* dynamic export changes for the shared library. 'make test' runs successfully, and works for me on amd64. OK? diff --git Makefile Makefile index 9c9e26b1911..edc7e0bbb80 100644 --- Makefile +++ Makefile @@ -2,7 +2,7 @@ COMMENT = zstandard fast real-time compression algorithm -V =1.5.1 +V =1.5.2 DISTNAME = zstd-${V} SHARED_LIBS = zstd6.1 # 1.5.1 diff --git distinfo distinfo index a4aad9aef0e..25b30205e17 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (zstd-1.5.1.tar.gz) = 4osvLtVxDqDToeysP2qUegFrlyud0wJCNpAQ5fU9cAI= -SIZE (zstd-1.5.1.tar.gz) = 1934669 +SHA256 (zstd-1.5.2.tar.gz) = fELVb6wSaSmmqF28c/8dskEdBPEE+um96lEwVmOoP9A= +SIZE (zstd-1.5.2.tar.gz) = 1936664 diff --git patches/patch-lib_libzstd_mk patches/patch-lib_libzstd_mk index 1cf669345a6..2315ee5be1b 100644 --- patches/patch-lib_libzstd_mk +++ patches/patch-lib_libzstd_mk @@ -6,16 +6,16 @@ Some compilers don't have -Wvla. Index: lib/libzstd.mk --- lib/libzstd.mk.orig +++ lib/libzstd.mk -@@ -79,7 +79,7 @@ endif +@@ -81,7 +81,7 @@ endif CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \ -DDYNAMIC_BMI2=0 -DNDEBUG else -- CFLAGS += -O3 -+ CFLAGS += +- CFLAGS ?= -O3 ++ CFLAGS ?= endif DEBUGLEVEL ?= 0 -@@ -90,7 +90,7 @@ endif +@@ -92,7 +92,7 @@ endif DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \ -Wstrict-prototypes -Wundef -Wpointer-arith \ @@ -23,4 +23,4 @@ Index: lib/libzstd.mk +-Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \ -Wredundant-decls -Wmissing-prototypes -Wc++-compat CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) - LDFLAGS += $(MOREFLAGS) + ASFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) $(CFLAGS)
FYI - On the subject of non-OpenBSD developers asking "ok?"
Generally only folks who can commit to CVS should be asking "ok?" It signals to others that you are also an OpenBSD dev. One might think that doing this may get you quicker reivew attention, except it may also mean that you get an ok and your work never gets committed. Why? Because we'll assume you can do so yourself. We try not to "steal" other developer's commits. So you may get "ok" as an answer and no one will follow up on it. So it's not that I'm saying "you're not part of the club, don't use our secret handshake", it's more that by using the secret handshake you may end up hurting yourself. :) --Kurt (kmos@)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/01/20 21:25:12 Modified files: lang/python/3.9: Makefile distinfo lang/python/3.9/patches: patch-Modules__hashopenssl_c patch-configure_ac patch-setup_py lang/python/3.9/pkg: PLIST-main Log message: https://docs.python.org/release/3.9.10/whatsnew/changelog.html No security fixes that I see ok daniel@
Re: rox-filer on -current has been slow for a week or so.
On Thu, 20 Jan 2022 08:44:22 + Stuart Henderson wrote: > On 2022/01/19 08:27, Ed Ahlsen-Girard wrote: > [...] > [...] > [...] > > If you run a base system build as root, it automatically drops to the > "build" user. So either /usr/obj needs to be writable by "build", or > don't run it as root. > OK, compiled, installed, and booted. rox-filer is much, much snappier now, so your hypothesis regarding an uncommitted diff being tested remains open. -- Edward Ahlsen-Girard Ft Walton Beach, FL
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/01/20 17:41:29 Modified files: audio/mumble : Makefile Log message: Enable Xinput2 support Spotted through this warning on startup: "GlobalShortcutX: No XInput support, falling back to polled input. This wastes a lot of CPU resources, so please enable one of the other methods."
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/01/20 16:56:20 Modified files: x11/qt5/qtwebengine: Makefile Log message: No point for RDEP on x11/gtk+3,-cups ok rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2022/01/20 15:11:37 Modified files: net/mattermost-server: Makefile distinfo net/mattermost-server/patches: patch-config_config_json net/mattermost-server/pkg: PLIST Log message: Update mattermost-server 6.2.1 -> 6.3.0 Changelog: https://docs.mattermost.com/install/self-managed-changelog.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2022/01/20 15:10:31 Modified files: www/gitea : Makefile distinfo Log message: Update gitea 1.15.9 -> 1.15.10 Changelog: https://github.com/go-gitea/gitea/blob/main/CHANGELOG.md
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2022/01/20 15:08:17 Modified files: sysutils/ansible: Makefile distinfo sysutils/ansible/pkg: PLIST Log message: Update ansible 5.1.0 -> 5.2.0 Changelog: https://github.com/ansible-community/ansible-build-data/blob/main/5/CHANGELOG-v5.rst#v5-2-0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2022/01/20 12:27:09 Modified files: security/p5-Net-SSLeay: Makefile security/p5-Net-SSLeay/patches: patch-SSLeay_xs Log message: Change the local patch for RSA_generate_key() to the code that has been commited upstream. OK tb@
[maintainer update] Python 3.9.10
https://docs.python.org/release/3.9.10/whatsnew/changelog.html I don't see any security issues fixed here, but numerous bug fixes. Test suite passes mostly equivalent on amd64. test_poplib is an additional test failure. Which is their pop3 library test. Since I run PORTS_PRIVSEP I'm not surprised it would fail. I'm more surprised it doesn't on 3.9.9 ok? --Kurt Index: Makefile === RCS file: /cvs/ports/lang/python/3.9/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile24 Nov 2021 15:35:20 - 1.17 +++ Makefile20 Jan 2022 18:20:13 - @@ -6,7 +6,7 @@ # Python itself. VERSION = 3.9 -PATCHLEVEL = .9 +PATCHLEVEL = .10 SHARED_LIBS = python3.9 0.0 VERSION_SPEC = >=3.9,<3.10 Index: distinfo === RCS file: /cvs/ports/lang/python/3.9/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo24 Nov 2021 15:35:20 - 1.7 +++ distinfo20 Jan 2022 18:20:13 - @@ -1,2 +1,2 @@ -SHA256 (Python-3.9.9.tgz) = LMe2fB8/ZsVxrMQkec32kdjta0e+4SybaEMEE6F6ROo= -SIZE (Python-3.9.9.tgz) = 25787134 +SHA256 (Python-3.9.10.tgz) = GqnAcC7bro9qLJX3CknahCCqp2t4idNBnBhr/IwOVx4= +SIZE (Python-3.9.10.tgz) = 25800844 Index: patches/patch-Modules__hashopenssl_c === RCS file: /cvs/ports/lang/python/3.9/patches/patch-Modules__hashopenssl_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-Modules__hashopenssl_c --- patches/patch-Modules__hashopenssl_c12 Jun 2021 04:00:22 - 1.2 +++ patches/patch-Modules__hashopenssl_c20 Jan 2022 18:20:13 - @@ -3,7 +3,7 @@ $OpenBSD: patch-Modules__hashopenssl_c,v Index: Modules/_hashopenssl.c --- Modules/_hashopenssl.c.orig +++ Modules/_hashopenssl.c -@@ -38,7 +38,8 @@ +@@ -43,7 +43,8 @@ # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" #endif Index: patches/patch-configure_ac === RCS file: /cvs/ports/lang/python/3.9/patches/patch-configure_ac,v retrieving revision 1.6 diff -u -p -r1.6 patch-configure_ac --- patches/patch-configure_ac 24 Nov 2021 15:35:20 - 1.6 +++ patches/patch-configure_ac 20 Jan 2022 18:20:13 - @@ -27,16 +27,15 @@ Index: configure.ac #elif defined(__linux__) # if defined(__x86_64__) && defined(__LP64__) x86_64-linux-gnu -@@ -883,7 +883,7 @@ fi - rm -f conftest.c conftest.out - - if test x$PLATFORM_TRIPLET != xdarwin; then -- MULTIARCH=$($CC --print-multiarch 2>/dev/null) -+ MULTIARCH=$(false) - fi - AC_SUBST(MULTIARCH) - -@@ -2860,18 +2860,7 @@ AC_CHECK_LIB(dl, dlopen)# Dynamic linking for SunOS/S +@@ -886,6 +886,7 @@ AC_MSG_CHECKING([for multiarch]) + AS_CASE([$ac_sys_system], + [Darwin*], [MULTIARCH=""], + [FreeBSD*], [MULTIARCH=""], ++ [OpenBSD*], [MULTIARCH=""], + [MULTIARCH=$($CC --print-multiarch 2>/dev/null)] + ) + AC_SUBST([MULTIARCH]) +@@ -2865,18 +2866,7 @@ AC_CHECK_LIB(dl, dlopen)# Dynamic linking for SunOS/S AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX # checks for uuid.h location Index: patches/patch-setup_py === RCS file: /cvs/ports/lang/python/3.9/patches/patch-setup_py,v retrieving revision 1.4 diff -u -p -r1.4 patch-setup_py --- patches/patch-setup_py 24 Nov 2021 15:35:20 - 1.4 +++ patches/patch-setup_py 20 Jan 2022 18:20:13 - @@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.4 2021/11/2 Index: setup.py --- setup.py.orig +++ setup.py -@@ -1046,6 +1046,8 @@ class PyBuildExt(build_ext): +@@ -1049,6 +1049,8 @@ class PyBuildExt(build_ext): 'termcap'): readline_libs.append('termcap') self.add(Extension('readline', ['readline.c'], @@ -12,7 +12,7 @@ Index: setup.py library_dirs=['/usr/lib/termcap'], extra_link_args=readline_extra_link_args, libraries=readline_libs)) -@@ -1773,7 +1775,7 @@ class PyBuildExt(build_ext): +@@ -1776,7 +1778,7 @@ class PyBuildExt(build_ext): uuid_h = sysconfig.get_config_var("HAVE_UUID_H") uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H") if uuid_h or uuid_uuid_h: Index: pkg/PLIST-main === RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-main,v retrieving revision 1.14 diff -u -p -r1.14 PLIST-main --- pkg/PLIST-main 24 Nov 2021 15:35:20 - 1.14 +++ pkg/PLIST-main 20 Jan 2022 18:20:13 - @@ -2052,9 +2052,9 @@ lib/python3.9/lib-dynload/ @so lib/python3.9/lib-dynload/zlib.cpython-39.so lib/python3.9/lib2to3/ lib/python3.9/lib2to3/Grammar.txt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/01/20 11:56:01 Modified files: sysutils/czkawka: Makefile crates.inc distinfo Log message: sysutils/czkawka: update to 4.0.0 change log: https://github.com/qarmin/czkawka/releases/tag/4.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2022/01/20 11:12:10 Modified files: www/chromium : Makefile distinfo Log message: update to 97.0.4692.99
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/01/20 11:03:18 Modified files: audio/mumble : Makefile distinfo audio/mumble/patches: patch-scripts_murmur_ini patch-src_mumble_AudioWizard_cpp patch-src_mumble_Settings_cpp audio/mumble/pkg: PLIST-main PLIST-server Removed files: audio/mumble/patches: patch-src_mumble_AudioInput_cpp Log message: Update to mumble 1.4.230 https://www.mumble.info/blog/mumble-1.4.230/ Lots of cool changes! qmake was replaced with cmake and upstream already merged a few handful fixes I sent during 1.4.0rc1 tests (they should land in the next 1.4.x release).
Re: qtwebengine dependency on x11/gtk+3,-cups
On Wed, Jan 19, 2022 at 04:15:51PM +0100, Antoine Jacoutot wrote: > Hi. > > Is there any reason why x11/qt5/qtwebengine RUN_DEPENDS on x11/gtk+3,-cups? > Should we remove it? Anyone? > > Index: Makefile > === > RCS file: /cvs/ports/x11/qt5/qtwebengine/Makefile,v > retrieving revision 1.22 > diff -u -p -r1.22 Makefile > --- Makefile 10 Sep 2021 05:35:58 - 1.22 > +++ Makefile 19 Jan 2022 15:15:25 - > @@ -14,7 +14,7 @@ COMMENT = Chromium-based web engine for > > # Many parts are copied from www/chromium port, so keep in sync > QT5NAME =QtWebEngine > -REVISION = 4 > +REVISION = 5 > > CATEGORIES = www > > @@ -49,7 +49,6 @@ RUN_DEPENDS = devel/desktop-file-utils \ > devel/xdg-utils \ > fonts/noto/fonts \ > graphics/libexif \ > - x11/gtk+3,-cups \ > x11/gtk+3,-guic > > BUILD_DEPENDS = archivers/bzip2 \ > > > -- > Antoine > -- Antoine
Re: net/openfire update to 4.6.7 fix log4shell CVE-2021-44832
On Wed, Jan 19, 2022 at 12:51:49PM -0500, Ian Darwin wrote: > Update to 4.6.7, which uses log4j 2.1.7. Use modern Java runtime. Drop > some trivial sampled files. Use provided class files instead > of compiling, to speed build. Take Maintainer in case I'm the only > one still using it :-). > Just for clarity, I have been running this in production for a while, and did not have any issues moving from the 4.2.3 in ports to this release. It not only fixes CVE-2021-44832 but removes the old log4j v1 completely. Any OKs or cluebats? Thx > > And yes, I know they released 4.7.0 an hour ago, but (a) it's a brand new > major release, not tested, and (b) I'd like to get this out ASAP due to log4j. > > Index: Makefile > === > RCS file: /cvs/ports/net/openfire/Makefile,v > retrieving revision 1.54 > diff -u -p -r1.54 Makefile > --- Makefile 23 Sep 2019 15:14:25 - 1.54 > +++ Makefile 19 Jan 2022 17:47:22 - > @@ -1,9 +1,8 @@ > # $OpenBSD: Makefile,v 1.54 2019/09/23 15:14:25 kurt Exp $ > > COMMENT= XMPP real time collaboration server > -V= 4.2.3 > -REVISION=1 > -DISTNAME=openfire_src_${V:S/./_/g} > +V= 4.6.7 > +DISTNAME=openfire_${V:S/./_/g} > PKGNAME= openfire-$V > CATEGORIES= net > > @@ -11,46 +10,44 @@ MASTER_SITES= https://www.igniterealtime > > HOMEPAGE=https://www.igniterealtime.org/projects/openfire/index.jsp > > +MAINTAINER= Ian Darwin > + > # ASL 2.0 > PERMIT_PACKAGE= Yes > > +NO_BUILD=yes > NO_TEST= yes > > MODULES= java > -MODJAVA_VER= 1.8 > +MODJAVA_VER= 17 > MODJAVA_JRE= Yes > -MODJAVA_BUILD= ant > > RUN_DEPENDS= java/javaPathHelper > > -WRKDIST= ${WRKDIR}/openfire_src > -WRKSRC= ${WRKDIST}/build > +WRKDIST= ${WRKDIR}/openfire > > OPENFIREDEST=${PREFIX}/openfire > -DATADIRS=lib logs plugins resources > - > -pre-install: > - rm -rf ${WRKDIST}/target/openfire/resources/nativeAuth > - mv ${WRKDIST}/target/openfire/resources/security ${WRKBUILD} > +DATADIRS=lib plugins resources > +DOCDIRS= documentation > > do-install: > - cd ${WRKDIST}/target/openfire && \ > + rm -rf ${WRKDIST}/resources/nativeAuth > + cd ${WRKDIST} && \ > find ${DATADIRS} -type d \ > -exec ${INSTALL_DATA_DIR} ${OPENFIREDEST}/{} \; && \ > find ${DATADIRS} ! -type d \ > -exec ${INSTALL_DATA} -m 644 {} ${OPENFIREDEST}/{} \; > - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openfire > - ${INSTALL_DATA} ${WRKDIST}/documentation/docs/*-guide.html \ > - ${PREFIX}/share/doc/openfire > - ${INSTALL_DATA} ${WRKDIST}/documentation/docs/database.html \ > - ${PREFIX}/share/doc/openfire > - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security > + cd ${WRKDIST} && \ > + find ${DOCDIRS} -type d \ > + -exec ${INSTALL_DATA_DIR} > ${PREFIX}/share/doc/openfire/{} \; && \ > + find ${DOCDIRS}/* ! -type d \ > + -exec ${INSTALL_DATA} -m 644 {} > ${PREFIX}/share/doc/openfire \; > + ${INSTALL_DATA_DIR} ${OPENFIREDEST}/logs > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/ > - ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/openfire.xml \ > + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openfire/security > + ${INSTALL_DATA} ${WRKDIST}/conf/openfire.xml \ > ${PREFIX}/share/examples/openfire/ > - ${INSTALL_DATA} ${WRKDIST}/target/openfire/conf/security.xml \ > + ${INSTALL_DATA} ${WRKDIST}/conf/security.xml \ > ${PREFIX}/share/examples/openfire/ > - ${INSTALL_DATA} ${WRKBUILD}/security/* \ > - ${PREFIX}/share/examples/openfire/security > > .include > Index: distinfo > === > RCS file: /cvs/ports/net/openfire/distinfo,v > retrieving revision 1.19 > diff -u -p -r1.19 distinfo > --- distinfo 1 Oct 2018 20:08:53 - 1.19 > +++ distinfo 19 Jan 2022 17:47:22 - > @@ -1,2 +1,2 @@ > -SHA256 (openfire_src_4_2_3.tar.gz) = > mpAbzQaSDMtbQXUX2wKaSiC3ddSao52RipltSq9HQww= > -SIZE (openfire_src_4_2_3.tar.gz) = 113557155 > +SHA256 (openfire_4_6_7.tar.gz) = ayunxJdtvTYkkmmkU+sXbXGh5/gFdZUc3Rc9DsQkcFY= > +SIZE (openfire_4_6_7.tar.gz) = 48681460 > Index: pkg/PLIST > === > RCS file: /cvs/ports/net/openfire/pkg/PLIST,v > retrieving revision 1.12 > diff -u -p -r1.12 PLIST > --- pkg/PLIST 1 Oct 2018 20:08:53 - 1.12 > +++ pkg/PLIST 19 Jan 2022 17:47:22 - > @@ -13,20 +13,116 @@ openfire/ > @owner > @group > openfire/lib/ > -openfire/lib/bcpg-jdk15on.jar > -openfire/lib/bcpkix-jdk15on.jar > -openfire/lib/bcprov-jdk15on.jar > -openfire/lib/hsqldb.jar > -openfire/lib/javax.websocket-api.jar > -openfire/lib/jtds.jar >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2022/01/20 10:15:48 Modified files: security : Makefile Log message: + gosec
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2022/01/20 10:15:11 Log message: Import gosec 2.9.6: a tool to inspect go source code for security problems. OK op@ Status: Vendor Tag: abieber Release Tags: abieber_20220120 N ports/security/gosec/Makefile N ports/security/gosec/distinfo N ports/security/gosec/modules.inc N ports/security/gosec/pkg/DESCR N ports/security/gosec/pkg/PLIST No conflicts created by this import
Re: net/gophernicus: update 3.0.1 -> 3.1.1
On Thu, Jan 20, 2022 at 05:34:42PM +0100, Omar Polo wrote: > Tracey Emery writes: > > > How about this for the README? > > way better, thanks! > > Here's a revised diff with your tweaks to the README and > FIX_EXTRACT_PERMISSIONS. I don't remember why, my user was in the > _pbuild group... Thanks semarie for the help! Alright. Packages fine. I'll trust you that it runs. :) ok > > > Index: Makefile > === > RCS file: /home/cvs/ports/net/gophernicus/Makefile,v > retrieving revision 1.20 > diff -u -p -r1.20 Makefile > --- Makefile 13 Feb 2021 14:13:37 - 1.20 > +++ Makefile 20 Jan 2022 16:26:11 - > @@ -1,11 +1,9 @@ > # $OpenBSD: Makefile,v 1.20 2021/02/13 14:13:37 bcallah Exp $ > > COMMENT= modern gopher server > -REVISION = 0 > > -GH_ACCOUNT= gophernicus > -GH_PROJECT= gophernicus > -GH_TAGNAME= v3.0.1 > +V= 3.1.1 > +DISTNAME=gophernicus-${V} > > CATEGORIES= net > > @@ -14,19 +12,27 @@ HOMEPAGE= gopher://gophernicus.org/ > # BSD > PERMIT_PACKAGE= Yes > > +# uses pledge > +# uses unveil > WANTLIB += c > > +MASTER_SITES= > https://github.com/gophernicus/gophernicus/releases/download/${V}/ > +FIX_EXTRACT_PERMISSIONS= yes > + > +CONFIGURE_STYLE= simple > +CONFIGURE_ARGS= --listener=inetd > + > MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" > NO_TEST= Yes > > do-install: > - ${INSTALL_PROGRAM} ${WRKSRC}/gophernicus > ${PREFIX}/libexec/in.gophernicus > + ${INSTALL_PROGRAM} ${WRKSRC}/src/gophernicus > ${PREFIX}/libexec/in.gophernicus > + ${INSTALL_MAN} ${WRKSRC}/gophernicus.8 ${PREFIX}/man/man8 > ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gophernicus > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gophernicus > - cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README INSTALL.md \ > - TODO README.Gophermap gophertag \ > - ${PREFIX}/share/doc/gophernicus/ > - cd ${WRKSRC} && ${INSTALL_DATA} gophermap \ > - ${PREFIX}/share/examples/gophernicus/ > + cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README.md README.gophermap \ > + gophertag ${PREFIX}/share/doc/gophernicus/ > + ${INSTALL_DATA} ${WRKSRC}/gophermap.sample \ > + ${PREFIX}/share/examples/gophernicus/gophermap > > .include > Index: distinfo > === > RCS file: /home/cvs/ports/net/gophernicus/distinfo,v > retrieving revision 1.10 > diff -u -p -r1.10 distinfo > --- distinfo 6 Feb 2020 18:06:10 - 1.10 > +++ distinfo 20 Jan 2022 15:58:58 - > @@ -1,2 +1,2 @@ > -SHA256 (gophernicus-3.0.1.tar.gz) = > Fl/SrU+wY430FHFJa7rGgiA6FdBdX3RhiFhYFyE4vJY= > -SIZE (gophernicus-3.0.1.tar.gz) = 52525 > +SHA256 (gophernicus-3.1.1.tar.gz) = > p4ROSqLhry9C0Z5bM+vswcK0ehnUvVkeddKVdSVL97Q= > +SIZE (gophernicus-3.1.1.tar.gz) = 55234 > Index: patches/patch-gophernicus_c > === > RCS file: patches/patch-gophernicus_c > diff -N patches/patch-gophernicus_c > --- patches/patch-gophernicus_c 13 Feb 2021 14:13:37 - 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,16 +0,0 @@ > -$OpenBSD: patch-gophernicus_c,v 1.1 2021/02/13 14:13:37 bcallah Exp $ > - > -We don't have libwrap, and these cause issues with -fno-common > - > -Index: gophernicus.c > gophernicus.c.orig > -+++ gophernicus.c > -@@ -30,8 +30,6 @@ > - * Libwrap needs these defined > - */ > - #ifdef HAVE_LIBWRAP > --int allow_severity = LOG_DEBUG; > --int deny_severity = LOG_ERR; > - #endif > - > - > Index: pkg/PLIST > === > RCS file: /home/cvs/ports/net/gophernicus/pkg/PLIST,v > retrieving revision 1.4 > diff -u -p -r1.4 PLIST > --- pkg/PLIST 6 Feb 2020 18:06:10 - 1.4 > +++ pkg/PLIST 20 Jan 2022 09:38:57 - > @@ -2,12 +2,11 @@ > @newgroup _gophernicus:704 > @newuser _gophernicus:704:704:daemon:Gophernicus Gopher > Server:/nonexistent:/sbin/nologin > @bin libexec/in.gophernicus > +@man man/man8/gophernicus.8 > share/doc/gophernicus/ > -share/doc/gophernicus/INSTALL.md > share/doc/gophernicus/LICENSE > -share/doc/gophernicus/README > -share/doc/gophernicus/README.Gophermap > -share/doc/gophernicus/TODO > +share/doc/gophernicus/README.gophermap > +share/doc/gophernicus/README.md > share/doc/gophernicus/gophertag > @mode 755 > @owner root > Index: pkg/README > === > RCS file: /home/cvs/ports/net/gophernicus/pkg/README,v > retrieving revision 1.5 > diff -u -p -r1.5 README > --- pkg/README4 Sep 2018 12:46:17 - 1.5 > +++ pkg/README20 Jan 2022 16:39:55 - > @@ -4,23 +4,22 @@ $OpenBSD: README,v 1.5 2018/09/04 12:46: > | Running ${PKGSTEM} on OpenBSD > +--- > > -Setting up a gopher site > - > - >
Re: net/gophernicus: update 3.0.1 -> 3.1.1
Tracey Emery writes: > How about this for the README? way better, thanks! Here's a revised diff with your tweaks to the README and FIX_EXTRACT_PERMISSIONS. I don't remember why, my user was in the _pbuild group... Thanks semarie for the help! Index: Makefile === RCS file: /home/cvs/ports/net/gophernicus/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile13 Feb 2021 14:13:37 - 1.20 +++ Makefile20 Jan 2022 16:26:11 - @@ -1,11 +1,9 @@ # $OpenBSD: Makefile,v 1.20 2021/02/13 14:13:37 bcallah Exp $ COMMENT= modern gopher server -REVISION = 0 -GH_ACCOUNT=gophernicus -GH_PROJECT=gophernicus -GH_TAGNAME=v3.0.1 +V= 3.1.1 +DISTNAME= gophernicus-${V} CATEGORIES=net @@ -14,19 +12,27 @@ HOMEPAGE= gopher://gophernicus.org/ # BSD PERMIT_PACKAGE=Yes +# uses pledge +# uses unveil WANTLIB += c +MASTER_SITES= https://github.com/gophernicus/gophernicus/releases/download/${V}/ +FIX_EXTRACT_PERMISSIONS= yes + +CONFIGURE_STYLE= simple +CONFIGURE_ARGS=--listener=inetd + MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS}" NO_TEST= Yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gophernicus ${PREFIX}/libexec/in.gophernicus + ${INSTALL_PROGRAM} ${WRKSRC}/src/gophernicus ${PREFIX}/libexec/in.gophernicus + ${INSTALL_MAN} ${WRKSRC}/gophernicus.8 ${PREFIX}/man/man8 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gophernicus ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gophernicus - cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README INSTALL.md \ - TODO README.Gophermap gophertag \ - ${PREFIX}/share/doc/gophernicus/ - cd ${WRKSRC} && ${INSTALL_DATA} gophermap \ - ${PREFIX}/share/examples/gophernicus/ + cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README.md README.gophermap \ + gophertag ${PREFIX}/share/doc/gophernicus/ + ${INSTALL_DATA} ${WRKSRC}/gophermap.sample \ + ${PREFIX}/share/examples/gophernicus/gophermap .include Index: distinfo === RCS file: /home/cvs/ports/net/gophernicus/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo6 Feb 2020 18:06:10 - 1.10 +++ distinfo20 Jan 2022 15:58:58 - @@ -1,2 +1,2 @@ -SHA256 (gophernicus-3.0.1.tar.gz) = Fl/SrU+wY430FHFJa7rGgiA6FdBdX3RhiFhYFyE4vJY= -SIZE (gophernicus-3.0.1.tar.gz) = 52525 +SHA256 (gophernicus-3.1.1.tar.gz) = p4ROSqLhry9C0Z5bM+vswcK0ehnUvVkeddKVdSVL97Q= +SIZE (gophernicus-3.1.1.tar.gz) = 55234 Index: patches/patch-gophernicus_c === RCS file: patches/patch-gophernicus_c diff -N patches/patch-gophernicus_c --- patches/patch-gophernicus_c 13 Feb 2021 14:13:37 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,16 +0,0 @@ -$OpenBSD: patch-gophernicus_c,v 1.1 2021/02/13 14:13:37 bcallah Exp $ - -We don't have libwrap, and these cause issues with -fno-common - -Index: gophernicus.c gophernicus.c.orig -+++ gophernicus.c -@@ -30,8 +30,6 @@ - * Libwrap needs these defined - */ - #ifdef HAVE_LIBWRAP --int allow_severity = LOG_DEBUG; --int deny_severity = LOG_ERR; - #endif - - Index: pkg/PLIST === RCS file: /home/cvs/ports/net/gophernicus/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 6 Feb 2020 18:06:10 - 1.4 +++ pkg/PLIST 20 Jan 2022 09:38:57 - @@ -2,12 +2,11 @@ @newgroup _gophernicus:704 @newuser _gophernicus:704:704:daemon:Gophernicus Gopher Server:/nonexistent:/sbin/nologin @bin libexec/in.gophernicus +@man man/man8/gophernicus.8 share/doc/gophernicus/ -share/doc/gophernicus/INSTALL.md share/doc/gophernicus/LICENSE -share/doc/gophernicus/README -share/doc/gophernicus/README.Gophermap -share/doc/gophernicus/TODO +share/doc/gophernicus/README.gophermap +share/doc/gophernicus/README.md share/doc/gophernicus/gophertag @mode 755 @owner root Index: pkg/README === RCS file: /home/cvs/ports/net/gophernicus/pkg/README,v retrieving revision 1.5 diff -u -p -r1.5 README --- pkg/README 4 Sep 2018 12:46:17 - 1.5 +++ pkg/README 20 Jan 2022 16:39:55 - @@ -4,23 +4,22 @@ $OpenBSD: README,v 1.5 2018/09/04 12:46: | Running ${PKGSTEM} on OpenBSD +--- -Setting up a gopher site - - After installing the gophernicus package, edit /etc/inetd.conf and add the following, all on one line: -gopher stream tcp nowait _gophernicus ${TRUEPREFIX}/libexec/in.gophernicus in.gophernicus -h "hostname" +gopher stream tcp nowait _gophernicus ${TRUEPREFIX}/libexec/in.gophernicus in.gophernicus -h "hostname" -nm -nu -nx + +Replace "hostname"
UPDATE: Axel-2.17.11
Hi, Update for Axel to 2.17.11: https://github.com/axel-download-accelerator/axel/releases/tag/v2.17.11 OK? Comments? Cheers.- -- %gonzalo Index: Makefile === RCS file: /cvs/ports/net/axel/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile3 Dec 2020 09:32:30 - 1.15 +++ Makefile20 Jan 2022 16:20:16 - @@ -2,7 +2,7 @@ COMMENT= tiny download accelerator -V= 2.17.10 +V= 2.17.11 DISTNAME= axel-$V CATEGORIES=net Index: distinfo === RCS file: /cvs/ports/net/axel/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo3 Dec 2020 09:32:30 - 1.6 +++ distinfo20 Jan 2022 16:20:16 - @@ -1,2 +1,2 @@ -SHA256 (axel-2.17.10.tar.gz) = da8dMKAFk5IF/PYjm6k9ZCJ9Kj5hf9W7R3e321Tq204= -SIZE (axel-2.17.10.tar.gz) = 374737 +SHA256 (axel-2.17.11.tar.gz) = 8SaC+YHIPzdLgrBmjyX2lKIEK2F7I27m+wV+VHPFTjE= +SIZE (axel-2.17.11.tar.gz) = 377920
Re: [new] security/gosec - a tool for scanning Go source code for sec issues
Omar Polo writes: > Aaron Bieber writes: > >> Hi! >> >> Here is a handy tool that can be used to find common issues in Go code. >> >> I recently used it on security/ogvt with great success! >> >> Information for inst:gosec-2.9.5 >> >> Comment: >> security checker for Go projects >> >> Description: >> Inspects source code for security problems by scanning the Go AST. >> >> Maintainer: The OpenBSD ports mailing-list >> >> WWW: https://securego.io/ >> >> OK to import? >> >> [2. application/octet-stream; gosec.tgz]... > > port looks fine, i've played a bit with it on some go projects and seems > to find stuff. > > I'd just set MODGO_LDFLAGS so the version is included in the binary: > > % gosec -h 2>&1 | head > [...] > VERSION: v2.9.5 > GIT TAG: > BUILD DATE: > > > --- Makefile.orig Thu Jan 20 16:51:37 2022 > +++ Makefile Thu Jan 20 16:47:06 2022 > @@ -16,6 +16,8 @@ > > MODULES =lang/go > > +MODGO_LDFLAGS = -X main.Version=${MODGO_VERSION} > + > .include "modules.inc" > > .include > > > don't know if it's worth doing the same for git tag and build date. Oh good call! I think i'll skip the tag and date since I can't come up with a good way to get those without shelling out in the makefile.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/01/20 09:13:11 Modified files: graphics/xsane : Makefile Log message: Drop MAINTAINER.
Re: [new] security/gosec - a tool for scanning Go source code for sec issues
Aaron Bieber writes: > Hi! > > Here is a handy tool that can be used to find common issues in Go code. > > I recently used it on security/ogvt with great success! > > Information for inst:gosec-2.9.5 > > Comment: > security checker for Go projects > > Description: > Inspects source code for security problems by scanning the Go AST. > > Maintainer: The OpenBSD ports mailing-list > > WWW: https://securego.io/ > > OK to import? > > [2. application/octet-stream; gosec.tgz]... port looks fine, i've played a bit with it on some go projects and seems to find stuff. I'd just set MODGO_LDFLAGS so the version is included in the binary: % gosec -h 2>&1 | head [...] VERSION: v2.9.5 GIT TAG: BUILD DATE: --- Makefile.orig Thu Jan 20 16:51:37 2022 +++ MakefileThu Jan 20 16:47:06 2022 @@ -16,6 +16,8 @@ MODULES = lang/go +MODGO_LDFLAGS =-X main.Version=${MODGO_VERSION} + .include "modules.inc" .include don't know if it's worth doing the same for git tag and build date.
Re: net/gophernicus: update 3.0.1 -> 3.1.1
How about this for the README? Index: pkg/README === RCS file: /cvs/ports/net/gophernicus/pkg/README,v retrieving revision 1.5 diff -u -p -u -r1.5 README --- pkg/README 4 Sep 2018 12:46:17 - 1.5 +++ pkg/README 20 Jan 2022 15:54:44 - @@ -4,23 +4,22 @@ $OpenBSD: README,v 1.5 2018/09/04 12:46: | Running ${PKGSTEM} on OpenBSD +--- -Setting up a gopher site - - After installing the gophernicus package, edit /etc/inetd.conf and add the following, all on one line: -gopher stream tcp nowait _gophernicus ${TRUEPREFIX}/libexec/in.gophernicus in.gophernicus -h "hostname" +gopher stream tcp nowait _gophernicus ${TRUEPREFIX}/libexec/in.gophernicus in.gophernicus -h "hostname" -nm -nu -nx + +Replace "hostname" with the system's hostname. This should be valid +and resolvable, as it is used to construct links. -Replace "hostname" with the system's hostname, this should be valid -and resolvable as it is used to construct links. +inetd(8) must then be enabled and started: -inetd(8) must be reloaded (or started). To enable it at boot, the -following line needs to be added to rc.conf.local(8): -inetd_flags= + # rcctl enable inetd + # rcctl start inetd -By default Gophernicus serves documents from /var/gopher and will +By default, Gophernicus serves documents from ${VARBASE}/gopher and will only serve files which are world-readable; being readable by the server process is not enough. -For more information, see ${TRUEPREFIX}/share/doc/gophernicus/README. +For more information, see gophernicus(8) and +${TRUEPREFIX}/share/doc/gophernicus/README.md. -- Tracey Emery
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/01/20 08:44:05 Modified files: lang/go: go.port.mk Log message: Reduce variable expansion in DISTFILES list to speed up go ports deals with lots of distfiles (read: go modules); so many, that make(1) gets noticably slow doing thousands of variable expansions, subtitutions, etc. Use simpler `filename{url}sufx' bsd.port.mk(5) syntax in crafting DISTFILES to avoid duplicate variable expansions. Improvement for `time make -C net/telegraf show=PKGNAME` on my system: telegraf-1.21.2 -0m05.40s real 0m04.72s user 0m00.67s system +0m04.45s real 0m03.73s user 0m00.72s system No change in distinfo or builds. sthen apparently had the same diff but never committed it OK espie
Re: net/gophernicus: update 3.0.1 -> 3.1.1
Tracey Emery writes: > On Thu, Jan 20, 2022 at 10:07:13AM +0100, Omar Polo wrote: >> Hello ports, >> >> Please find attached a diff to update net/gophernicus to the latest >> version. >> >> The changelog for 3.1.0 is quite interesting, as they added pledge(2) >> and unveil(2) support and changed the build system (among other things.) >> 3.1.1 is just some bugfixes on the build system. >> >> Unfortunately the pledge/unveil support is disabled by default and a few >> command line switches are needed to enable it: gophernicus uses shared >> memory and allows exec'ing arbitrary scripts from gophermaps, so one >> needs at least -nm and -nx to respectively disable them to run under >> pledge and unveil. -nu disables serving from users home directory and >> seems tightens it a bit more. That's why I've changed the pkg/README to >> suggest running with those flags. >> >> Some installed files (such as TODO) are not available anymore, and since >> I was there I've also removed INSTALL.md as I don't see any reason to >> install it too. >> >> This still keeps gophernicus installed as libexec/in.gophernicus to >> avoid breaking existing setups. >> >> As I've only tested it on localhost, some real world usage is much >> appreciated :) >> >> > > Do you think the pkg_readme could be improved by pointing users to rcctl > enable inetd and rcctl start/restart inetd? > > Just an idea. I'm not sure what we do for other ports that have these > kind of daemon requirements. The only other port that uses inetd that comes to mind is net/vger and that points to rcctl enable/start inetd. It's questionable, but I agree on pointing users to rcctl. Here's an updated diff that tweaks pkg/README a bit more: - I've dropped the "setting up a gopher site" title. There's already a "running gophernicus on OpenBSD" and it felt redundant. - tweaked the paragraph regarding inetd to point the reader to rcctl(8) and show how enable and start inetd, loosely inspired from net/vger. I think it reads better now, but comments/critics are welcome. Regarding the update itself, I've found a small issue: there a couple of code path that ends up calling *printf with NULL instead of a string. Not a huge issue, just annoying to see log entries like: Jan 20 16:26:32 venera in.gophernicus: vfprintf %s NULL in "Error: %s %s\^M " for each not found file. (easy repro: printf 'foobar\r\n' | /usr/local/libexec/in.gophernicus -h localhost). grep gophernicus.c for `die' when the second argument is NULL. It's present in the master branch too, i'll report it upstream soon. It's worth to keep a local patch for that? Index: Makefile === RCS file: /home/cvs/ports/net/gophernicus/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile13 Feb 2021 14:13:37 - 1.20 +++ Makefile20 Jan 2022 15:14:32 - @@ -1,11 +1,9 @@ # $OpenBSD: Makefile,v 1.20 2021/02/13 14:13:37 bcallah Exp $ COMMENT= modern gopher server -REVISION = 0 -GH_ACCOUNT=gophernicus -GH_PROJECT=gophernicus -GH_TAGNAME=v3.0.1 +V= 3.1.1 +DISTNAME= gophernicus-${V} CATEGORIES=net @@ -14,19 +12,26 @@ HOMEPAGE= gopher://gophernicus.org/ # BSD PERMIT_PACKAGE=Yes +# uses pledge +# uses unveil WANTLIB += c +MASTER_SITES= https://github.com/gophernicus/gophernicus/releases/download/${V}/ + +CONFIGURE_STYLE= simple +CONFIGURE_ARGS=--listener=inetd + MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS}" NO_TEST= Yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gophernicus ${PREFIX}/libexec/in.gophernicus + ${INSTALL_PROGRAM} ${WRKSRC}/src/gophernicus ${PREFIX}/libexec/in.gophernicus + ${INSTALL_MAN} ${WRKSRC}/gophernicus.8 ${PREFIX}/man/man8 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gophernicus ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gophernicus - cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README INSTALL.md \ - TODO README.Gophermap gophertag \ - ${PREFIX}/share/doc/gophernicus/ - cd ${WRKSRC} && ${INSTALL_DATA} gophermap \ - ${PREFIX}/share/examples/gophernicus/ + cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README.md README.gophermap \ + gophertag ${PREFIX}/share/doc/gophernicus/ + ${INSTALL_DATA} ${WRKSRC}/gophermap.sample \ + ${PREFIX}/share/examples/gophernicus/gophermap .include Index: distinfo === RCS file: /home/cvs/ports/net/gophernicus/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo6 Feb 2020 18:06:10 - 1.10 +++ distinfo19 Jan 2022 21:43:34 - @@ -1,2 +1,2 @@ -SHA256 (gophernicus-3.0.1.tar.gz) = Fl/SrU+wY430FHFJa7rGgiA6FdBdX3RhiFhYFyE4vJY= -SIZE (gophernicus-3.0.1.tar.gz) = 52525 +SHA256 (gophernicus-3.1.1.tar.gz) = p4ROSqLhry9C0Z5bM+vswcK0ehnUvVkeddKVdSVL97Q= +SIZE
Re: net/gophernicus: update 3.0.1 -> 3.1.1
On Thu, Jan 20, 2022 at 10:07:13AM +0100, Omar Polo wrote: > Hello ports, > > Please find attached a diff to update net/gophernicus to the latest > version. > > The changelog for 3.1.0 is quite interesting, as they added pledge(2) > and unveil(2) support and changed the build system (among other things.) > 3.1.1 is just some bugfixes on the build system. > > Unfortunately the pledge/unveil support is disabled by default and a few > command line switches are needed to enable it: gophernicus uses shared > memory and allows exec'ing arbitrary scripts from gophermaps, so one > needs at least -nm and -nx to respectively disable them to run under > pledge and unveil. -nu disables serving from users home directory and > seems tightens it a bit more. That's why I've changed the pkg/README to > suggest running with those flags. > > Some installed files (such as TODO) are not available anymore, and since > I was there I've also removed INSTALL.md as I don't see any reason to > install it too. > > This still keeps gophernicus installed as libexec/in.gophernicus to > avoid breaking existing setups. > > As I've only tested it on localhost, some real world usage is much > appreciated :) > > Do you think the pkg_readme could be improved by pointing users to rcctl enable inetd and rcctl start/restart inetd? Just an idea. I'm not sure what we do for other ports that have these kind of daemon requirements. -- Tracey Emery
Re: net/gophernicus: update 3.0.1 -> 3.1.1
On Thu, Jan 20, 2022 at 10:07:13AM +0100, Omar Polo wrote: > Hello ports, > > Please find attached a diff to update net/gophernicus to the latest > version. > > The changelog for 3.1.0 is quite interesting, as they added pledge(2) > and unveil(2) support and changed the build system (among other things.) > 3.1.1 is just some bugfixes on the build system. > > Unfortunately the pledge/unveil support is disabled by default and a few > command line switches are needed to enable it: gophernicus uses shared > memory and allows exec'ing arbitrary scripts from gophermaps, so one > needs at least -nm and -nx to respectively disable them to run under > pledge and unveil. -nu disables serving from users home directory and > seems tightens it a bit more. That's why I've changed the pkg/README to > suggest running with those flags. > > Some installed files (such as TODO) are not available anymore, and since > I was there I've also removed INSTALL.md as I don't see any reason to > install it too. > > This still keeps gophernicus installed as libexec/in.gophernicus to > avoid breaking existing setups. > > As I've only tested it on localhost, some real world usage is much > appreciated :) > > Something isn't quite right here. The extacted dir is 0750, so my _pbuild fails. stef$ make fake ===> Checking files for gophernicus-3.1.1 `/usr/ports/distfiles/gophernicus-3.1.1.tar.gz' is up to date. >> (SHA256) gophernicus-3.1.1.tar.gz: OK ===> Verifying specs: c ===> found c.96.1 ===> Extracting for gophernicus-3.1.1 ===> Patching for gophernicus-3.1.1 ===> Applying OpenBSD patch patch-gophernicus_c ===> Ignoring empty patchfile patch-gophernicus_c ===> Compiler link: clang -> /usr/bin/clang ===> Compiler link: clang++ -> /usr/bin/clang++ ===> Compiler link: cc -> /usr/bin/cc ===> Compiler link: c++ -> /usr/bin/c++ ===> Generating configure for gophernicus-3.1.1 ===> Configuring for gophernicus-3.1.1 checking for working compiler... cc checking for uname... /usr/bin/uname checking for OS... openbsd checking for install... Unknown option: t install: testconf: Inappropriate file type or format rm: testconf/testfile: No such file or directory build-aux/install-sh checking for listener... inetd checking for update-inetd... not found checking current hostname... stef.traceyemery.net checking for libwrap... no, but program will still work checking for ipcrm (SHM management)... /usr/bin/ipcrm checking for make... /usr/bin/make checking for existing gopher root... no creating Makefile... done creating init/gophernicus.env... done creating init/haiku_snippet... done creating init/org.gophernicus.server.plist... done creating init/gophernicus.xinetd... done creating init/gophernicus@.service... done ===> Building for gophernicus-3.1.1 /bin/sh: cd: /usr/ports/pobj/gophernicus-3.1.1/gophernicus-3.1.1 - Permission denied *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2948 '/usr/ports/pobj/gophernicus-3.1.1/.build_done': @cd /usr/ports/pobj/gophern...) *** Error 2 in /usr/ports/net/gophernicus (/usr/ports/infrastructure/mk/bsd.port.mk:2594 'fake': @lock=gophernicus-3.1.1; export _LOCKS_HEL...) It will build if I manually chmod 755 /usr/ports/pobj/gophernicus-3.1.1/gophernicus-3.1.1, but then: stef$ make update-plist ===> Updating plist for gophernicus-3.1.1 Installing /usr/ports/net/gophernicus/pkg/README as /usr/ports/pobj/gophernicus-3.1.1/fake-amd64/usr/local/share/doc/pkg-readmes/gophernicus Can't locate OpenBSD/CommonPlist.pm in @INC (you may need to install the OpenBSD::CommonPlist module) (@INC contains: /usr/ports/infrastructure/lib /usr/local/libdata/perl5/site_perl/amd64-openbsd /usr/local/libdata/perl5/site_perl /usr/libdata/perl5/amd64-openbsd /usr/libdata/perl5) at /usr/ports/infrastructure/lib/OpenBSD/UpdatePlistReader.pm line 20. BEGIN failed--compilation aborted at /usr/ports/infrastructure/lib/OpenBSD/UpdatePlistReader.pm line 20. Compilation failed in require at /usr/ports/infrastructure/bin/update-plist line 53. BEGIN failed--compilation aborted at /usr/ports/infrastructure/bin/update-plist line 53. *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2569 '_internal-update-plist': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(d...) *** Error 2 in /usr/ports/net/gophernicus (/usr/ports/infrastructure/mk/bsd.port.mk:2594 'update-plist': @lock=gophernicus-3.1.1; export _L...) So, either something is suddenly off in my ports dir or there are some problems here. So, I can't give a full review of this diff. Another note I see, don't forget to: rm patches/patch-gophernicus_c cvs rm patches/patch-gophernicus_c Good luck! :) -- Tracey Emery
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2022/01/20 07:31:53 Modified files: www/mozilla-firefox: Makefile distinfo www/firefox-i18n: Makefile.inc distinfo Log message: www/mozilla-firefox: update to 96.0.2. see https://www.mozilla.org/en-US/firefox/96.0.2/releasenotes/
[new] security/gosec - a tool for scanning Go source code for sec issues
Hi! Here is a handy tool that can be used to find common issues in Go code. I recently used it on security/ogvt with great success! Information for inst:gosec-2.9.5 Comment: security checker for Go projects Description: Inspects source code for security problems by scanning the Go AST. Maintainer: The OpenBSD ports mailing-list WWW: https://securego.io/ OK to import? gosec.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2022/01/20 07:12:16 Modified files: net/miniflux : Makefile distinfo Added files: net/miniflux : modules.inc Log message: Update miniflux to 2.0.34 - switch to using modules.inc
Re: Fwd: [SECURITY] [UPDATE] lang/node to 16.13.2
Bump... On 1/16/22 16:48, Volker Schlecht wrote: Update after feedback from abieber@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2022/01/20 06:31:17 Modified files: net/tailscale : Makefile distinfo modules.inc net/tailscale/pkg: PLIST Added files: net/tailscale/patches: patch-net_dns_resolvd_go Log message: Update tailscale to 1.20.1 Add in an upstreamed fix for interfacing with resolvd.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2022/01/20 06:30:25 ports/net/tailscale/patches Update of /cvs/ports/net/tailscale/patches In directory cvs.openbsd.org:/tmp/cvs-serv30912/patches Log Message: Directory /cvs/ports/net/tailscale/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2022/01/20 06:29:09 Modified files: net/headscale : Makefile distinfo modules.inc net/headscale/pkg: PLIST Added files: net/headscale/patches: patch-config-example_yaml net/headscale/pkg: MESSAGE Removed files: net/headscale/patches: patch-config_json_postgres_example patch-config_json_sqlite_example Log message: Update headscale to 0.12.2 This update introduces a breaking config change. Config stuffs are defined via yaml instead of json.
net/gophernicus: update 3.0.1 -> 3.1.1
Hello ports, Please find attached a diff to update net/gophernicus to the latest version. The changelog for 3.1.0 is quite interesting, as they added pledge(2) and unveil(2) support and changed the build system (among other things.) 3.1.1 is just some bugfixes on the build system. Unfortunately the pledge/unveil support is disabled by default and a few command line switches are needed to enable it: gophernicus uses shared memory and allows exec'ing arbitrary scripts from gophermaps, so one needs at least -nm and -nx to respectively disable them to run under pledge and unveil. -nu disables serving from users home directory and seems tightens it a bit more. That's why I've changed the pkg/README to suggest running with those flags. Some installed files (such as TODO) are not available anymore, and since I was there I've also removed INSTALL.md as I don't see any reason to install it too. This still keeps gophernicus installed as libexec/in.gophernicus to avoid breaking existing setups. As I've only tested it on localhost, some real world usage is much appreciated :) Index: Makefile === RCS file: /home/cvs/ports/net/gophernicus/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile13 Feb 2021 14:13:37 - 1.20 +++ Makefile20 Jan 2022 09:38:43 - @@ -1,11 +1,9 @@ # $OpenBSD: Makefile,v 1.20 2021/02/13 14:13:37 bcallah Exp $ COMMENT= modern gopher server -REVISION = 0 -GH_ACCOUNT=gophernicus -GH_PROJECT=gophernicus -GH_TAGNAME=v3.0.1 +V= 3.1.1 +DISTNAME= gophernicus-${V} CATEGORIES=net @@ -14,19 +12,26 @@ HOMEPAGE= gopher://gophernicus.org/ # BSD PERMIT_PACKAGE=Yes +# uses pledge +# uses unveil WANTLIB += c +MASTER_SITES= https://github.com/gophernicus/gophernicus/releases/download/${V}/ + +CONFIGURE_STYLE= simple +CONFIGURE_ARGS=--listener=inetd + MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS}" NO_TEST= Yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gophernicus ${PREFIX}/libexec/in.gophernicus + ${INSTALL_PROGRAM} ${WRKSRC}/src/gophernicus ${PREFIX}/libexec/in.gophernicus + ${INSTALL_MAN} ${WRKSRC}/gophernicus.8 ${PREFIX}/man/man8 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gophernicus ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gophernicus - cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README INSTALL.md \ - TODO README.Gophermap gophertag \ - ${PREFIX}/share/doc/gophernicus/ - cd ${WRKSRC} && ${INSTALL_DATA} gophermap \ - ${PREFIX}/share/examples/gophernicus/ + cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README.md README.gophermap \ + gophertag ${PREFIX}/share/doc/gophernicus/ + ${INSTALL_DATA} ${WRKSRC}/gophermap.sample \ + ${PREFIX}/share/examples/gophernicus/gophermap .include Index: distinfo === RCS file: /home/cvs/ports/net/gophernicus/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo6 Feb 2020 18:06:10 - 1.10 +++ distinfo19 Jan 2022 21:43:34 - @@ -1,2 +1,2 @@ -SHA256 (gophernicus-3.0.1.tar.gz) = Fl/SrU+wY430FHFJa7rGgiA6FdBdX3RhiFhYFyE4vJY= -SIZE (gophernicus-3.0.1.tar.gz) = 52525 +SHA256 (gophernicus-3.1.1.tar.gz) = p4ROSqLhry9C0Z5bM+vswcK0ehnUvVkeddKVdSVL97Q= +SIZE (gophernicus-3.1.1.tar.gz) = 55234 Index: patches/patch-gophernicus_c === RCS file: patches/patch-gophernicus_c diff -N patches/patch-gophernicus_c --- patches/patch-gophernicus_c 13 Feb 2021 14:13:37 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,16 +0,0 @@ -$OpenBSD: patch-gophernicus_c,v 1.1 2021/02/13 14:13:37 bcallah Exp $ - -We don't have libwrap, and these cause issues with -fno-common - -Index: gophernicus.c gophernicus.c.orig -+++ gophernicus.c -@@ -30,8 +30,6 @@ - * Libwrap needs these defined - */ - #ifdef HAVE_LIBWRAP --int allow_severity = LOG_DEBUG; --int deny_severity = LOG_ERR; - #endif - - Index: pkg/PLIST === RCS file: /home/cvs/ports/net/gophernicus/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 6 Feb 2020 18:06:10 - 1.4 +++ pkg/PLIST 20 Jan 2022 09:38:57 - @@ -2,12 +2,11 @@ @newgroup _gophernicus:704 @newuser _gophernicus:704:704:daemon:Gophernicus Gopher Server:/nonexistent:/sbin/nologin @bin libexec/in.gophernicus +@man man/man8/gophernicus.8 share/doc/gophernicus/ -share/doc/gophernicus/INSTALL.md share/doc/gophernicus/LICENSE -share/doc/gophernicus/README -share/doc/gophernicus/README.Gophermap -share/doc/gophernicus/TODO +share/doc/gophernicus/README.gophermap +share/doc/gophernicus/README.md share/doc/gophernicus/gophertag @mode 755 @owner root Index: pkg/README
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/01/20 02:52:20 Modified files: geo/traccar: Makefile distinfo geo/traccar/patches: patch-conf_default_xml geo/traccar/pkg: PLIST Log message: update to traccar-4.15, from Renaud Allard, tweak by me
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/01/20 02:47:58 Modified files: net/catgirl: Makefile distinfo Log message: Update to catgirl 2.0a This patch fixes SASL PLAIN sending an accidental null byte over the wire. This patch also marks away notifications in query windows as general events so they can be hidden with M-+.
Re: [update] geo/traccar 4.15
On 2022/01/20 10:07, Renaud Allard wrote: > > > > On 1/20/22 10:06, Renaud Allard wrote: > > Hi Stuart, > > > > On 1/20/22 09:40, Stuart Henderson wrote: > > > On 2022/01/20 09:23, Renaud Allard wrote: > > > > - ./logs/tracker-server.log > > > > -+ > > > key='logger.file'>/var/log/traccar/tracker-server.log > > > > ++ > > > key='logger.file'>${VARBASE}/log/traccar/tracker-server.log > > > > > > I think this should just use /var/log > > > > When are we supposed to use $VARBASE and when /var? This isn't > > completely clear to me. Former patch was indeed using /var, but, as I > > had to change it, I did put $VARBASE which seems more appropriate. VARBASE is never going to change, it relates to the directory used in the base OS rather than packages, and things just won't work if that changes from /var (and there's no need to do it). Might as well just use /var instead of that. Less typing, less use of SUBST_CMD. Now you _could_ use LOCALSTATEDIR which is the "overridable" variable based on VARBASE, but it has the same issues as LOCALBASE, it is baked in at package build time, the only way to use it is to build your own set of packages, and there will be many things to fix on the way (and we already pretty much decided that it's pointless to go through contortions to support a different LOCALBASE). > > > Also (not new), I noticed this in the patch, doesn't seem quite right? > > > > > > - > > key='database.changelog'>./schema/changelog-master.xml > > > + > > key='database.changelog'>../..${LOCALBASE}/share/traccar/schema/changelog-master.xml > > > > > > > > > > It was already like this before. If I remember well, traccar doesn't > > allow a relative path for this setting and that's why I had to use this > > kind of bad looking trick. > > I obviously meant "ONLY allows", and not "doesn't allow" Ah OK :) This is something that comments in the patches are useful for, making it clear why something that seems a bit odd is being done. So I would suggest this diff instead, does that make sense for you? Index: Makefile === RCS file: /cvs/ports/geo/traccar/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile16 Aug 2021 10:09:10 - 1.17 +++ Makefile20 Jan 2022 09:36:23 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.17 2021/08/16 10:09:10 sthen Exp $ COMMENT = modern GPS tracking platform -V =4.14 +V =4.15 PKGNAME = traccar-${V} DISTNAME = traccar-other-${V} EXTRACT_SUFX = .zip Index: distinfo === RCS file: /cvs/ports/geo/traccar/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo16 Aug 2021 10:09:10 - 1.11 +++ distinfo20 Jan 2022 09:36:23 - @@ -1,2 +1,2 @@ -SHA256 (traccar-other-4.14.zip) = dBqftyCGpjXbbLX4hdxvmO1Sqev1MH1QhvN7GhCbCrM= -SIZE (traccar-other-4.14.zip) = 79240444 +SHA256 (traccar-other-4.15.zip) = SirAIa+WsmX1LxYSuJI0dMaQRSEnX4LqaR59QnxjESE= +SIZE (traccar-other-4.15.zip) = 82952742 Index: patches/patch-conf_default_xml === RCS file: /cvs/ports/geo/traccar/patches/patch-conf_default_xml,v retrieving revision 1.7 diff -u -p -r1.7 patch-conf_default_xml --- patches/patch-conf_default_xml 5 Jun 2021 18:35:51 - 1.7 +++ patches/patch-conf_default_xml 20 Jan 2022 09:36:23 - @@ -1,18 +1,22 @@ $OpenBSD: patch-conf_default_xml,v 1.7 2021/06/05 18:35:51 sthen Exp $ +seems that database.changelog requires a relative path + Index: conf/default.xml --- conf/default.xml.orig +++ conf/default.xml -@@ -11,13 +11,14 @@ +@@ -11,7 +11,8 @@ --> 8082 -./web +127.0.0.1 +${LOCALBASE}/share/traccar/web + false - false - google + true +@@ -20,7 +21,7 @@ + pk.689d849289c8c63708068b2ff1f63b2d info -./logs/tracker-server.log @@ -20,7 +24,7 @@ Index: conf/default.xml true true -@@ -27,17 +28,16 @@ +@@ -30,17 +31,16 @@ true true Index: pkg/PLIST === RCS file: /cvs/ports/geo/traccar/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 16 Aug 2021 10:09:10 - 1.12 +++ pkg/PLIST 20 Jan 2022 09:36:23 - @@ -26,19 +26,19 @@ share/traccar/conf/traccar.xml @owner @group share/traccar/lib/ -share/traccar/lib/HikariCP-5.0.0.jar +share/traccar/lib/HikariCP-5.0.1.jar share/traccar/lib/activation-1.1.1.jar share/traccar/lib/antlr-2.7.2.jar share/traccar/lib/aopalliance-1.0.jar share/traccar/lib/aopalliance-repackaged-2.6.1.jar -share/traccar/lib/asm-9.1.jar -share/traccar/lib/asm-analysis-9.1.jar -share/traccar/lib/asm-commons-9.1.jar -share/traccar/lib/asm-tree-9.1.jar -share/traccar/lib/asm-util-9.1.jar -share/traccar/lib/aws-java-sdk-core-1.12.47.jar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2022/01/20 02:35:50 Modified files: infrastructure/mk: bsd.port.mk Log message: fully anchor distfiles regexp when we can, doesn't change much performance-wise unfortunately
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/01/20 02:22:28 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.22.39.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/01/20 02:22:16 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.20.39.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/01/20 02:22:05 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.23.39.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/01/20 02:18:49 Modified files: net/mrtg : Makefile distinfo net/mrtg/pkg : PLIST Log message: update to mrtg-2.17.10 slight port rework: instead of duplicating upstream's install target, use it directly and adjust the files afterwards (prompted by upstream changes to the target)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/01/20 02:15:09 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-369.0.0.
Re: rox-filer on -current has been slow for a week or so.
On 2022/01/19 08:27, Ed Ahlsen-Girard wrote: > On Wed, 19 Jan 2022 11:04:09 + > Stuart Henderson wrote: > > > On 2022/01/18 19:23, Ed Ahlsen-Girard wrote: > > [...] > > > > First thing to try is a self-built kernel to check if it's some > > uncommitted diff being tested in snapshots. > > > > If that doesn't change anything then go back to older kernel code, > > leaving userland alone. I would do a kernel build with a date-based > > cvs checkout to see this (e.g. cvs up -D 2022/01/10). > > > > Basically try to narrow down what area was changed that caused it to > > slow down. > > > > [...] > > I can't, a reason that is not obvious to me: > > [hostname]# make obj > mkdir: /usr/obj/sys: Permission denied > *** Error 1 in /sys/arch/amd64/compile/GENERIC.MP (:61 > 'obj': @cd /sys/arch/amd64/compile/GENERIC.MP; umask 007; > here=`/bin/pw...) > > make obj was run from an su session. > If you run a base system build as root, it automatically drops to the "build" user. So either /usr/obj needs to be writable by "build", or don't run it as root.
Re: [update] geo/traccar 4.15
On 2022/01/20 09:23, Renaud Allard wrote: > -./logs/tracker-server.log > -+/var/log/traccar/tracker-server.log > ++ key='logger.file'>${VARBASE}/log/traccar/tracker-server.log I think this should just use /var/log Also (not new), I noticed this in the patch, doesn't seem quite right? -./schema/changelog-master.xml +../..${LOCALBASE}/share/traccar/schema/changelog-master.xml
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/01/20 01:18:47 Modified files: infrastructure/lib/OpenBSD: UpdatePlistReader.pm Log message: adjust for CommonPlist.pm renaming