Re: UPDATE mail/mblaze 1.1 from MAINTAINER
On Sat, Jan 16, 2021 at 06:43:05PM +, Lucas wrote: > Find a tiny update for release 1.1 of mblaze. From the release notes: > I decided to also start including the `contrib/` directory in the > package, which is a collection of 3rd parties scripts that might be > useful for users. In particular, I have been installing `mgpg` on my > own since the very beginning, so I think it's a nice addition. I > decided to copy the approach used in devel/git. Let me know if there is > a better way to do it or if this is good enough. Committed as is, thanks.
UPDATE: ircd-hybrid 8.2.37
Here is an update to ircd-hybrid 8.2.37. Index: Makefile === RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v retrieving revision 1.57 diff -u -p -u -p -r1.57 Makefile --- Makefile21 Dec 2020 09:01:02 - 1.57 +++ Makefile17 Jan 2021 03:06:31 - @@ -2,7 +2,7 @@ COMMENT = Internet Relay Chat server -DISTNAME = ircd-hybrid-8.2.36 +DISTNAME = ircd-hybrid-8.2.37 CATEGORIES = net MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/} EXTRACT_SUFX = .tgz Index: distinfo === RCS file: /home/cvs/ports/net/ircd-hybrid/distinfo,v retrieving revision 1.34 diff -u -p -u -p -r1.34 distinfo --- distinfo21 Dec 2020 09:01:02 - 1.34 +++ distinfo17 Jan 2021 03:06:39 - @@ -1,2 +1,2 @@ -SHA256 (ircd-hybrid-8.2.36.tgz) = mz3kVmCdyJCdUYUkOosJTE/5EPom+UvnRiwiaj945Gk= -SIZE (ircd-hybrid-8.2.36.tgz) = 1056283 +SHA256 (ircd-hybrid-8.2.37.tgz) = rvFAVcnWO9CdRGc3CfCJoPeCvUXjhDNP5K3WQRcZibA= +SIZE (ircd-hybrid-8.2.37.tgz) = 1046778 Index: pkg/PLIST === RCS file: /home/cvs/ports/net/ircd-hybrid/pkg/PLIST,v retrieving revision 1.24 diff -u -p -u -p -r1.24 PLIST --- pkg/PLIST 21 Dec 2020 09:01:02 - 1.24 +++ pkg/PLIST 17 Jan 2021 03:08:27 - @@ -229,6 +229,7 @@ share/ircd-hybrid/help/locops share/ircd-hybrid/help/lusers share/ircd-hybrid/help/map share/ircd-hybrid/help/module +share/ircd-hybrid/help/monitor share/ircd-hybrid/help/motd share/ircd-hybrid/help/names share/ircd-hybrid/help/nick
Re: profanity: update to 0.10.0
On 1/16/2021 6:15 PM, Klemens Nanni wrote: https://github.com/profanity-im/profanity/releases/tag/0.10.0 Version requirements taken from the changelog. One could also emit the first python3 hunk now from the configure.ac patch but 3.8 is more explicit so best leave it there in case multiple python 3 versions are a problem. Tested on amd64 with OMEMO. Feedback? OK? Index: Makefile === RCS file: /cvs/ports/net/profanity/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile12 Jul 2020 07:18:03 - 1.17 +++ Makefile16 Jan 2021 22:15:22 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.17 2020/07/12 07:18:03 rsadowski Exp $ COMMENT = console based XMPP client -DISTNAME = profanity-0.9.5 +DISTNAME = profanity-0.10.0 CATEGORIES = net HOMEPAGE = https://profanity-im.github.io/ @@ -24,11 +24,11 @@ MODULES += lang/python MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} -LIB_DEPENDS += databases/sqlite3 \ - devel/glib2 \ +LIB_DEPENDS += databases/sqlite3>=3.22.0 \ + devel/glib2>=2.62.0 \ devel/readline \ net/curl \ - net/libmesode \ + net/libmesode>=0.10.0 \ net/libsignal-protocol-c \ security/gpgme \ security/libotr The SQLite and Glib depends have been in the tree for over a year.
Re: Update net/ddclient to 3.9.1
Thanks for the help! I've made the changes you suggested, please could you take a look? On Sat, 16 Jan 2021, at 2:55 PM, Stuart Henderson wrote: > On 2021/01/16 13:41, Reeto Chatterjee wrote: > > Bump > > No patch attached. > > > > On 3 Dec 2020, at 03:14, Reeto Chatterjee wrote: > > > > > > Hi, > > > > > > I’ve attached a small patch to update ddclient from 3.8.3 to 3.9.1. The > > > project has moved to GitHub (as noted on the old sourceforge homepage) > > > and the dependencies have changed slightly. I’ve updated the dependencies > > > from the README https://github.com/ddclient/ddclient/tree/v3.9.1 . > > > > > > I had a couple of questions: > > > 1) How are optional dependencies generally handled? JSON, IPv6 and SSL > > > seem to be optional. Currently I’ve added them all to the runtime > > > dependencies. > > Generally for optional dependencies which are checked at *run* time: > > If they're small and quite useful, include them. > > If they're huge (or have a big chain of dependencies themselves) and not > very useful, don't. > > If they're in between, make a judgment call. > > > > 2) Should the REVISION remain at 1 or be reset to 0 when upgrading > > > versions? I’ve left it as 1. > > Please remove the line completely. > > > > I lack the knowledge of Perl to do the security review that the Porting > > > guide mentions, so please could someone take a look (if it’s necessary). > > > > > > Finally, I don’t have commit access to CVS. If this looks alright, please > > > could someone run the committing commands? > > > > > > Thanks! > > > > > > Reeto > > > > > > > > > > patch.diff Description: Binary data
[new] sysutils/lf a terminal file manager
Hi, Here is a port of lf ( https://github.com/gokcehan/lf ), a terminal file manager written in Go and is heavily inspired by ranger. It build well on amd64-6.8 system. Because upstream doesn't do semantic versioning, I make my own vendored distfile like sysutil/fzf. I am a noob and do not know if it is the standard way to deal with go versioning problem. DESCR: lf (as in "list files") is a terminal file manager written in Go. It is heavily inspired by ranger with some missing and extra features. Chang, Chu-Kuan lf.tgz Description: Binary data
[new] devel/gover a Go version manager tool
Hi, This is a tool I wrote that lets you easily test something with a number of different Go versions. First you tell gover to download a specific version (pgp sigs are verified): gover download 1.16beta1 Then you can use it as you would the go command: gover 1.16beta1 build gover 1.16beta1 test GOARCH=mips64 GOOS=openbsd gover 1.16beta1 build ... etc I didn't add lang/go as a RUN dependency because in some cases I would like to use it without the ports version there to do the bootstrap / building. OK to import? gover.tgz Description: Binary data
[update] mail/opensmtpd-filters/rspamd to 0.1.7
Hi! Here is an update to the previously mentioned filter. The port update contains: - Switch to MODGO_*. This lets us drop the dependency on devel/go-sys - Switch myself to maintainer as discussed here: https://github.com/poolpOrg/filter-rspamd/pull/37 Changes for the actual tool are here: https://github.com/poolpOrg/filter-rspamd/releases/tag/v0.1.7 If you are testing this, you will need to make sure your tree contains the latest changes to lang/go/go.port.mk or else you won't be able to fetch the distfiles properly. OK? Cheers, Aaron diff 314b17ec5bb7ab894b6284edf762fcbe3d967966 /usr/ports blob - 2367d9b7fca0d1b8e084b4daaa600ebdd7a43ed7 file + mail/opensmtpd-filters/rspamd/Makefile --- mail/opensmtpd-filters/rspamd/Makefile +++ mail/opensmtpd-filters/rspamd/Makefile @@ -2,17 +2,21 @@ COMMENT = rspamd integration to the OpenSMTPD daemon -V = 0.1.6 +# V is used in opensmtpd-filters/Makefile.inc +V = 0.1.7 + +MODGO_MODNAME = github.com/poolpOrg/filter-rspamd +MODGO_VERSION = v${V} + +DISTNAME = filter-rspamd-${MODGO_VERSION:S/v//} + FILTER_NAME = rspamd -DISTNAME = filter-rspamd-${V} CATEGORIES = mail HOMEPAGE = https://github.com/poolpOrg/filter-rspamd/ -MAINTAINER = Gilles Chehade +MAINTAINER = Aaron Bieber -MASTER_SITES = https://github.com/poolpOrg/filter-rspamd/releases/download/${V}/ - # ISC PERMIT_PACKAGE = Yes @@ -20,8 +24,7 @@ WANTLIB = c pthread MODULES = lang/go NO_TEST = Yes -ALL_TARGET = filter-rspamd +MODGO_MODULES = \ + golang.org/x/sys v0.0.0-20200821140526-fda516888d29 -BUILD_DEPENDS = devel/go-sys - .include blob - 88cf2fbc3313a445e7c7b4129aa1da17c31b3b38 file + mail/opensmtpd-filters/rspamd/distinfo --- mail/opensmtpd-filters/rspamd/distinfo +++ mail/opensmtpd-filters/rspamd/distinfo @@ -1,2 +1,6 @@ -SHA256 (filter-rspamd-0.1.6.tar.gz) = Yhi0ozuIo9omQrn/kfM8z5p7WuAZEHrtUgujMuuvs4E= -SIZE (filter-rspamd-0.1.6.tar.gz) = 5096 +SHA256 (filter-rspamd-0.1.7.zip) = RvGkHuE/EsMcbOGRUTo7wPP8iOY9exXmGKsrzYC3fcw= +SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20200821140526-fda516888d29.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M= +SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20200821140526-fda516888d29.zip) = 9D6FSRnTgg/29U0BzzgQkS/CYpz0oof79oFvaKI5nXw= +SIZE (filter-rspamd-0.1.7.zip) = 9941 +SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20200821140526-fda516888d29.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20200821140526-fda516888d29.zip) = 1487242
profanity: update to 0.10.0
https://github.com/profanity-im/profanity/releases/tag/0.10.0 Version requirements taken from the changelog. One could also emit the first python3 hunk now from the configure.ac patch but 3.8 is more explicit so best leave it there in case multiple python 3 versions are a problem. Tested on amd64 with OMEMO. Feedback? OK? Index: Makefile === RCS file: /cvs/ports/net/profanity/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile12 Jul 2020 07:18:03 - 1.17 +++ Makefile16 Jan 2021 22:15:22 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.17 2020/07/12 07:18:03 rsadowski Exp $ COMMENT = console based XMPP client -DISTNAME = profanity-0.9.5 +DISTNAME = profanity-0.10.0 CATEGORIES = net HOMEPAGE = https://profanity-im.github.io/ @@ -24,11 +24,11 @@ MODULES += lang/python MODPY_VERSION =${MODPY_DEFAULT_VERSION_3} -LIB_DEPENDS += databases/sqlite3 \ - devel/glib2 \ +LIB_DEPENDS += databases/sqlite3>=3.22.0 \ + devel/glib2>=2.62.0 \ devel/readline \ net/curl \ - net/libmesode \ + net/libmesode>=0.10.0 \ net/libsignal-protocol-c \ security/gpgme \ security/libotr Index: distinfo === RCS file: /cvs/ports/net/profanity/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo12 Jul 2020 07:18:03 - 1.10 +++ distinfo16 Jan 2021 21:58:19 - @@ -1,2 +1,2 @@ -SHA256 (profanity-0.9.5.tar.gz) = I/ey5cbPhZE7nnoiiAK8qeyx0c87+PjyhelnYXaiSQI= -SIZE (profanity-0.9.5.tar.gz) = 830966 +SHA256 (profanity-0.10.0.tar.gz) = SgXjJZD57DhDDjNzW9As+hmbJXkitBFmE/I5Eso5/4w= +SIZE (profanity-0.10.0.tar.gz) = 868180 Index: patches/patch-configure_ac === RCS file: /cvs/ports/net/profanity/patches/patch-configure_ac,v retrieving revision 1.6 diff -u -p -r1.6 patch-configure_ac --- patches/patch-configure_ac 29 Jun 2020 04:54:59 - 1.6 +++ patches/patch-configure_ac 16 Jan 2021 22:08:59 - @@ -6,16 +6,16 @@ Use ${MODPY_VERSION} to pick up our pyth Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -80,7 +80,7 @@ elif test "x$enable_python_plugins" != xno; then - AC_MSG_NOTICE([Symlinking Python.framework to $PYTHON_FRAMEWORK]) +@@ -82,7 +82,7 @@ elif test "x$enable_python_plugins" != xno; then rm -f Python.framework ln -s $PYTHON_FRAMEWORK Python.framework ]) --AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python-config, yes, no) -+AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python${MODPY_VERSION}-config, yes, no) - if test "$PYTHON_CONFIG_EXISTS" == "yes"; then + AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python-config, yes, no) +-AC_CHECK_PROG(PYTHON3_CONFIG_EXISTS, python3-config, yes, no) ++AC_CHECK_PROG(PYTHON3_CONFIG_EXISTS, python${MODPY_VERSION}-config, yes, no) + if test "$PYTHON_CONFIG_EXISTS" = "yes" || test "$PYTHON3_CONFIG_EXISTS" = "yes"; then AX_PYTHON_DEVEL AM_CONDITIONAL([BUILD_PYTHON_API], [true]) -@@ -223,10 +223,10 @@ AS_IF([test "x$PLATFORM" = xosx], +@@ -221,10 +221,10 @@ AS_IF([test "x$PLATFORM" = xosx], [AC_MSG_ERROR([libreadline is required for profanity])])], [test "x$PLATFORM" = xopenbsd], Index: pkg/PLIST === RCS file: /cvs/ports/net/profanity/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 18 Jun 2020 20:44:16 - 1.5 +++ pkg/PLIST 16 Jan 2021 22:23:41 - @@ -4,6 +4,100 @@ include/profapi.h @static-lib lib/libprofanity.a lib/libprofanity.la @lib lib/libprofanity.so.${LIBprofanity_VERSION} +@man man/man1/profanity-about.1 +@man man/man1/profanity-account.1 +@man man/man1/profanity-affiliation.1 +@man man/man1/profanity-alias.1 +@man man/man1/profanity-autoaway.1 +@man man/man1/profanity-autoconnect.1 +@man man/man1/profanity-autoping.1 +@man man/man1/profanity-avatar.1 +@man man/man1/profanity-ban.1 +@man man/man1/profanity-beep.1 +@man man/man1/profanity-blocked.1 +@man man/man1/profanity-bookmark.1 +@man man/man1/profanity-caps.1 +@man man/man1/profanity-carbons.1 +@man man/man1/profanity-charset.1 +@man man/man1/profanity-clear.1 +@man man/man1/profanity-close.1 +@man man/man1/profanity-cmd.1 +@man man/man1/profanity-color.1 +@man man/man1/profanity-connect.1 +@man man/man1/profanity-console.1 +@man man/man1/profanity-correct.1 +@man man/man1/profanity-correction.1 +@man man/man1/profanity-disco.1 +@man man/man1/profanity-disconnect.1 +@man man/man1/profanity-executable.1 +@man man/man1/profanity-export.1 +@man man/man1/profanity-flash.1 +@man man/man1/profanity-form.1 +@man man/man1/profanity-gone.1 +@man man/man1/profanity-help.1 +@man man/man1/profanity-history.1 +@m
Re: [go.port.mk / portgen] Teach everyone how to handle Go's unique escaping
On Tue, Jan 05, 2021 at 07:18:20AM -0700, Aaron Bieber wrote: > Hi, > > This teaches portgen and go.port.mk how to handle module URLs that > contain uppercase characters. > --- infrastructure/lib/OpenBSD/PortGen/Port/Go.pm > +++ infrastructure/lib/OpenBSD/PortGen/Port/Go.pm > @@ -31,6 +31,8 @@ use Carp; > use Cwd; > use File::Temp qw/ tempdir /; > > +use Data::Dumper; > + You probably don't need this > --- lang/go/go.port.mk > +++ lang/go/go.port.mk > @@ -14,6 +14,10 @@ MASTER_SITES${MODGO_MASTER_SITESN} ?= ${MASTER_SITE_AT > MODGO_RUN_DEPENDS = lang/go > MODGO_BUILD_DEPENDS =lang/go > > +.for l in a b c d e f g h i j k l m n o p q r s t u v w x y z > +_subst := ${_subst}:S/${l:U}/!$l/g > +.endfor > + > .if ${NO_BUILD:L} == "no" && ${MODGO_BUILDDEP:L} == "yes" > BUILD_DEPENDS += ${MODGO_BUILD_DEPENDS} > .endif > @@ -57,13 +61,18 @@ MODGO_TEST_CMD += -ldflags="${MODGO_LDFLAGS}" > .endif > > .if defined(MODGO_MODNAME) > +.for _s in ${_subst} > +MODGO_MODNAME_ESC = ${MODGO_MODNAME${_s}} > +DISTNAME_ESC = ${DISTNAME${_s}} > +.endfor > + I'm not really a make expert here, but wouldn't this logic throw away all but the last $_subst? I would have expected something like this, to repeatedly munge things. Then again, it's totally possible make does something I don't expect. +MODGO_MODNAME_ESC = ${MODGO_MODNAME} +DISTNAME_ESC = ${DISTNAME} +.for _s in ${_subst} +MODGO_MODNAME_ESC = ${MODGO_MODNAME_ESC${_s}} +DISTNAME_ESC = ${DISTNAME_ESC${_s}} +.endfor > EXTRACT_SUFX ?= .zip > -PKGNAME ?= ${DISTNAME:S/-v/-/} > +PKGNAME ?= ${DISTNAME_ESC:S/-v/-/} Wouldn't this make the PKGNAME=my!fancy!tool if the DISTNAME was myFancyTool? That's doesn't really meet my expectations, but I'm not a go porter, so my expectations don't count much. > ALL_TARGET ?=${MODGO_MODNAME} > MODGO_FLAGS += -modcacherw > -DISTFILES = > ${DISTNAME}${EXTRACT_SUFX}{${MODGO_VERSION}${EXTRACT_SUFX}} > -EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX} > -MASTER_SITES ?= ${MASTER_SITE_ATHENS}${MODGO_MODNAME}/@v/ > +DISTFILES = > ${DISTNAME_ESC}${EXTRACT_SUFX}{${MODGO_VERSION}${EXTRACT_SUFX}} > +EXTRACT_ONLY = ${DISTNAME_ESC}${EXTRACT_SUFX} > +MASTER_SITES ?= ${MASTER_SITE_ATHENS}${MODGO_MODNAME_ESC}/@v/ > . for _modpath _modver in ${MODGO_MODULES} > DISTFILES += > ${MODGO_DIST_SUBDIR}/${_modpath}/@v/${_modver}.zip{${_modpath}/@v/${_modver}.zip}:${MODGO_MASTER_SITESN} > DISTFILES += > ${MODGO_DIST_SUBDIR}/${_modpath}/@v/${_modver}.mod{${_modpath}/@v/${_modver}.mod}:${MODGO_MASTER_SITESN} l8rZ, -- andrew - http://afresh1.com Software doesn't do what you want it to do, it does what you tell it do. -- Stefan G. Weichinger.
huge performance jump for package
Hello, I am running since a few months this package endless-sky-0.9.12, always on snapshots. A month ago, this game was very slow and sluggish. There is some meter inside the game, showing CPU and GPU utilization. They were something like CPU: 10% and GPU: 290% (yes, huge). I installed the snapshot from 13.01.2021, same game package (no version change) and the game runs very smoothly. The markers are CPU: 3% and GPU: 8%. Out of curiosity I wonder what is the "reason" for this: recent jump to clang, maybe some port dependencies upgrade (SDL?) or maybe some radeondrm improvements since I run on radeondrm. Please send in some hint. This is not a big deal, but if needed I can send other info. Thank you.
Re: Remove x11/qt5styleplugins
On Sat Jan 16, 2021 at 03:56:49PM -0500, Kurt Mosiejczuk wrote: > On Sat, Jan 16, 2021 at 11:39:31AM +0100, Rafael Sadowski wrote: > > Cloud we remove x11/qt5styleplugins? It is upstream completely > > unmaintained and I'm no really willing to do the extra work and unbreak > > it with Qt 5.15. > > > https://github.com/qt/qtstyleplugins > > That's one of the ones that has popped up in my test sparc64 build as > broken :) ... and there are more victims but I have already fixed them. Here is my list form today: www/ruby-capybara-webkit,ruby27 audio/clementine x11/kde-applications/poxml x11/qdirstat audio/hydrogen x11/qt5styleplugins x11/qtfm x11/qt5/qtdeclarative,,-examples x11/vlc Fixes are here https://github.com/sizeofvoid/wip-ports/commits/qt-5.15 I am close the the end of the amd64 bulk. kmos, don't be worry if the pop up in your bulk. > > If nothing uses it, then yes, ok kmos@ to remove > > --Kurt Thanks Kurt and Klemens! landry imported it so I'll wait for his final answer.
Re: Remove x11/qt5styleplugins
On Sat, Jan 16, 2021 at 11:39:31AM +0100, Rafael Sadowski wrote: > Cloud we remove x11/qt5styleplugins? It is upstream completely > unmaintained and I'm no really willing to do the extra work and unbreak > it with Qt 5.15. > https://github.com/qt/qtstyleplugins That's one of the ones that has popped up in my test sparc64 build as broken :) If nothing uses it, then yes, ok kmos@ to remove --Kurt
Re: [go.port.mk / portgen] Teach everyone how to handle Go's unique escaping
On Tue, Jan 05, 2021 at 07:18:20AM -0700, Aaron Bieber wrote: > This teaches portgen and go.port.mk how to handle module URLs that > contain uppercase characters. > > Go has chosen to translate module names like > 'github.com/poolpOrg/filter-rspamd' to > 'github.com/ploop!org/filter-rspamd'. Your typo here ("ploop" instead of "poolp") made think for a second that go folks *reversed* strings... > They had reasons: > > > To avoid ambiguity when serving from case-insensitive file systems, > > the $module and $version elements are case-encoded by replacing > > every uppercase letter with an exclamation mark followed by the > > corresponding lower-case letter. This allows modules example.com/M > > and example.com/m to both be stored on disk, since the former is > > encoded as example.com/!m. > > Because of the need for escaping, a port like that looks like the one > below would not work: > MODGO_MODNAME =github.com/poolpOrg/filter-rspamd > MODGO_VERSION =v0.1.7 > > Same goes for `portgen go github.com/poolpOrg/filter-rspamd` - this > errors because it can't find the distfile. > > The make magic is from espie@ / naddy@ - I am not clever enough to come > up with such voodoo myself! :D That reads fine. OK kn > I have tested a handful of existing MODGO_ ports with this diff, as well > as existing and new ports that were built with 'portgen go'. I have not done any extra tests.
Re: [new] sysutils/obsdpkgup - tools for creating and using a package index
Stuart Henderson writes: > On 2021/01/05 21:29, Aaron Bieber wrote: >> Hi, >> >> Here is a portgen'd port of obsdpkgup. You might remember it from >> previous threads on misc@[1]. >> >> I have been using it for some time now. Basically one can use genpkgup >> to create a package index, this index can be used by end users to create >> a "slim" list of packages that need upgrading. >> >> You can check your packages (amd64/snapshots only) with the following >> command: >> PKGUP_URL="https://deftly.net/pkgup"; obsdpkgup >> >> This will produce a list of only the out of date packages. This list can >> later be used with pkg_add to only fetch what is needed. >> >> OK to import? >> >> [1] https://marc.info/?l=openbsd-misc&m=159234132018626&w=2 >> > > Looking at this it's better than I thought it would be, there are some > problems though - > > - The version number comparison using mcuadros/go-version is wrong, > it doesn't match packages-specs(5). > > - There doesn't seem to be a way to validate that index.pkgup.gz is done > against the current available package build. For this I would suggest > recording the timestamp of the @digital-signature on the quirks package > in the index, and verifying when the update is run. (grep out of > "PKG_DBDIR=/var/empty PKG_PATH=$whatever pkg_info -f quirks" will do > the trick). > > Between those two it could cause problems because the user may try to > update a too-small subset of packages. The first problem is obvious. > The second problem, if a library is bumped after the index is generated, > the required updates won't show up. For both if people use it and then > run into problems it's likely the bug reports will end up with openbsd > rather than pkgup. This makes me not want to add it to packages yet > (adding it could easily be seen as an endorsement of using it). > This would be less of a problem if it at least tries to detect outdated > caches and prints a clear warning. > > Less important but I'd be happier if it used the signature from pkg_info > -qS rather than its own version using grep on +CONTENTS, to guard > against possible future changes to things that pkg_add considers when > deciding whether to update (also I think it would make sense to include > the whole string rather than a hash of the signature, there's no need to > hide that), as long as the full url/filename is used pkg_add will fetch > the file directly without grabbing the index first. i.e. > PKG_DBDIR=/var/empty pkg_info -qS > http://mirror/pub/OpenBSD/snapshots/packages/amd64/moo-1.5p0.tgz Here is an updated version that includes all of the fixes from: https://marc.info/?l=openbsd-ports&m=161054673002228&w=2 I have also updated my index at https://deftly.net/pkgup (snapshot/amd64) obsdpkgup.tgz Description: Binary data
[PATCH] fix emulators/vice on AARCH64
Took a look into the recurring failure of VICE on aarch64. It's failing due to an LLVM issue. This problem also effected NDK on Android and LLVM fixed it in version 11.0.0 https://reviews.llvm.org/D76312 The options seem to be to backport the fix to base LLVM, backport to ports LLVM, or just use ports gcc on aarch64. The last option being the least invasive, that's what I've gone with below. I'm not sure if there is an easier switch in the ports system than using an .if block as I have. Compiles and runs on PBP...slowly. Tim. Index: Makefile === RCS file: /cvs/ports/emulators/vice/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile12 Jan 2021 19:14:53 - 1.21 +++ Makefile16 Jan 2021 19:00:04 - @@ -8,13 +8,21 @@ CATEGORIES = emulators HOMEPAGE = http://vice-emu.sourceforge.net/ +REVISION = 0 + # GPLv2+ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_image c iconv intl m png WANTLIB += readline z +# Workaround for a bug in LLVM < 11.0.0 +# https://reviews.llvm.org/D76312 +.if ${MACHINE_ARCH} == "aarch64" +COMPILER = ports-gcc base-gcc +.else COMPILER = base-clang ports-gcc base-gcc +.endif MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=vice-emu/}
UPDATE mail/mblaze 1.1 from MAINTAINER
Hello ports@, Find a tiny update for release 1.1 of mblaze. From the release notes: * mcom: allow tilde prefixed path for profile's outbox setting * mcom: detect and report mmime errors * add contrib/mmailto, a handler for mailto: links * Bug fixes. In particular, it fixed a bug where `mmime` couldn't parse lines like `#text/plain#inline some_file`, which made sending inline patches a pain in the cases when that was necessary. I decided to also start including the `contrib/` directory in the package, which is a collection of 3rd parties scripts that might be useful for users. In particular, I have been installing `mgpg` on my own since the very beginning, so I think it's a nice addition. I decided to copy the approach used in devel/git. Let me know if there is a better way to do it or if this is good enough. It works on my machine(TM). -Lucas Index: Makefile === RCS file: /home/cvs/ports/mail/mblaze/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile17 Sep 2020 07:17:16 - 1.12 +++ Makefile16 Jan 2021 18:38:38 - @@ -2,7 +2,7 @@ COMMENT = set of Maildir utilities -DISTNAME = mblaze-1.0 +DISTNAME = mblaze-1.1 CATEGORIES = mail HOMEPAGE = https://git.vuxu.org/mblaze/ @@ -28,5 +28,9 @@ FAKE_FLAGS = PREFIX="${PREFIX}" \ MANDIR="${PREFIX}/man" TEST_TARGET = check + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/mblaze/contrib + cd ${WRKBUILD}/contrib && pax -rw . ${PREFIX}/share/mblaze/contrib .include Index: distinfo === RCS file: /home/cvs/ports/mail/mblaze/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo17 Sep 2020 07:17:16 - 1.8 +++ distinfo16 Jan 2021 15:54:01 - @@ -1,2 +1,2 @@ -SHA256 (mblaze-1.0.tar.gz) = MWBh6NbPZFWpEQXFUGaWOPbgKIxTxxhfskKcVOgPIzU= -SIZE (mblaze-1.0.tar.gz) = 95676 +SHA256 (mblaze-1.1.tar.gz) = 7djLhvZnVD5wPe5YJjuBx+R3RDOdI+u7akPnUFm6k7E= +SIZE (mblaze-1.1.tar.gz) = 97041 cvs diff: Diffing pkg Index: pkg/PLIST === RCS file: /home/cvs/ports/mail/mblaze/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 12 Feb 2019 14:27:35 - 1.4 +++ pkg/PLIST 16 Jan 2021 18:39:13 - @@ -58,3 +58,29 @@ bin/museragent @man man/man5/mblaze-profile.5 @man man/man7/mblaze.7 @man man/man7/mmsg.7 +share/mblaze/ +share/mblaze/contrib/ +share/mblaze/contrib/README.md +share/mblaze/contrib/_mblaze +share/mblaze/contrib/malternative +share/mblaze/contrib/mblow +share/mblaze/contrib/mcount +share/mblaze/contrib/mencrypt +share/mblaze/contrib/menter +share/mblaze/contrib/mfillmid +share/mblaze/contrib/mgpg +share/mblaze/contrib/mhasatt +share/mblaze/contrib/mmailto +share/mblaze/contrib/mmairix +share/mblaze/contrib/mp7m +share/mblaze/contrib/mpeek +share/mblaze/contrib/mraw +share/mblaze/contrib/mrecode +share/mblaze/contrib/msearch +share/mblaze/contrib/msearch.1 +share/mblaze/contrib/msendmail +share/mblaze/contrib/msign +share/mblaze/contrib/msuck +share/mblaze/contrib/mtwoscan +share/mblaze/contrib/mverify +share/mblaze/contrib/mvi
[UPDATE] misc/astrolog 5.40 -> 7.10
Hi @ports, I updated the misc/astrolog port to the latest version. Since the last update has been a while, I reorganized the port with subpackages and flavors. Best regards, Evandro Rathke *Mobile/WhatsApp*: +55 51 9 9921-5584 *Skype*: erathke astrolog-7.10.tar.gz Description: application/gzip
Re: [patch] UPDATE: converters/libiconv: pledge iconv binary
On Mon, Jan 11, 2021 at 07:50:55PM +0100, Hiltjo Posthuma wrote: > Hi, > > The below patch pledges the iconv binary in the libiconv package. The tool is > useful for converting text-encoding of text data to UTF-8 for example. > > It now uses pledge("stdio", NULL) if only using stdin/stdout. It uses > pledge("stdio rpath", NULL) when specifying files. > > I've tested many command-line option combinations and haven't found missing > promises which cause an abort(). > > Patch: > > > From f3b6b4de0a010bd7e9725eeaceddb33a61953a72 Mon Sep 17 00:00:00 2001 > From: Hiltjo Posthuma > Date: Mon, 11 Jan 2021 19:39:31 +0100 > Subject: [PATCH] libiconv: pledge iconv(1) binary > > --- > converters/libiconv/Makefile | 3 ++- > converters/libiconv/patches/patch-src_iconv_c | 22 +++ > 2 files changed, 24 insertions(+), 1 deletion(-) > create mode 100644 converters/libiconv/patches/patch-src_iconv_c > > diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile > index 2ab58ea4519..5c8043270de 100644 > --- a/converters/libiconv/Makefile > +++ b/converters/libiconv/Makefile > @@ -5,7 +5,7 @@ COMMENT= character set conversion library > DISTNAME=libiconv-1.16 > CATEGORIES= converters devel > MASTER_SITES=${MASTER_SITE_GNU:=libiconv/} > -REVISION=0 > +REVISION=1 > > SHARED_LIBS= charset 1.1 \ > iconv 7.0 > @@ -17,6 +17,7 @@ MAINTAINER= Brad Smith > # LGPLv2 and GPLv3 > PERMIT_PACKAGE= Yes > > +# uses pledge() > WANTLIB= c > > SEPARATE_BUILD= Yes > diff --git a/converters/libiconv/patches/patch-src_iconv_c > b/converters/libiconv/patches/patch-src_iconv_c > new file mode 100644 > index 000..2f3eaac346d > --- /dev/null > +++ b/converters/libiconv/patches/patch-src_iconv_c > @@ -0,0 +1,22 @@ > +--- src/iconv.c.orig Mon Jan 11 19:28:35 2021 > src/iconv.c Mon Jan 11 19:31:36 2021 > +@@ -19,6 +19,9 @@ > + # define ICONV_CONST > + #endif > + > ++#include > ++#include > ++ > + #include > + #include > + #include > +@@ -846,6 +849,9 @@ > + struct iconv_hooks hooks; > + int i; > + int status; > ++ > ++ if (pledge(i == argc ? "stdio" : "stdio rpath", NULL) == -1) > ++err(1, "pledge"); > + > + set_program_name (argv[0]); > + #if HAVE_SETLOCALE > -- > 2.30.0 > Any thoughts/OKs for the above patch? I use it to convert the text-encoding of some RSS/Atom feeds which are non-UTF-8 to UTF-8. With this patch it completes pledge(2)'ing my entire software bundle to handle RSS/Atom feeds. In a nutshell: ftp someurl | iconv -f encoding -t utf-8 | myprogram Thanks, -- Kind regards, Hiltjo
Re: Update net/ddclient to 3.9.1
On 2021/01/16 13:41, Reeto Chatterjee wrote: > Bump No patch attached. > > On 3 Dec 2020, at 03:14, Reeto Chatterjee wrote: > > > > Hi, > > > > I’ve attached a small patch to update ddclient from 3.8.3 to 3.9.1. The > > project has moved to GitHub (as noted on the old sourceforge homepage) and > > the dependencies have changed slightly. I’ve updated the dependencies from > > the README https://github.com/ddclient/ddclient/tree/v3.9.1 . > > > > I had a couple of questions: > > 1) How are optional dependencies generally handled? JSON, IPv6 and SSL seem > > to be optional. Currently I’ve added them all to the runtime dependencies. Generally for optional dependencies which are checked at *run* time: If they're small and quite useful, include them. If they're huge (or have a big chain of dependencies themselves) and not very useful, don't. If they're in between, make a judgment call. > > 2) Should the REVISION remain at 1 or be reset to 0 when upgrading > > versions? I’ve left it as 1. Please remove the line completely. > > I lack the knowledge of Perl to do the security review that the Porting > > guide mentions, so please could someone take a look (if it’s necessary). > > > > Finally, I don’t have commit access to CVS. If this looks alright, please > > could someone run the committing commands? > > > > Thanks! > > > > Reeto > > > > > >
Re: Update net/ddclient to 3.9.1
Bump > On 3 Dec 2020, at 03:14, Reeto Chatterjee wrote: > > Hi, > > I’ve attached a small patch to update ddclient from 3.8.3 to 3.9.1. The > project has moved to GitHub (as noted on the old sourceforge homepage) and > the dependencies have changed slightly. I’ve updated the dependencies from > the README https://github.com/ddclient/ddclient/tree/v3.9.1 . > > I had a couple of questions: > 1) How are optional dependencies generally handled? JSON, IPv6 and SSL seem > to be optional. Currently I’ve added them all to the runtime dependencies. > 2) Should the REVISION remain at 1 or be reset to 0 when upgrading versions? > I’ve left it as 1. > > I lack the knowledge of Perl to do the security review that the Porting guide > mentions, so please could someone take a look (if it’s necessary). > > Finally, I don’t have commit access to CVS. If this looks alright, please > could someone run the committing commands? > > Thanks! > > Reeto > > >
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
Hi, thank you everyone for the feedback. On Fri, Jan 15, 2021 at 05:01:19PM +, Stuart Henderson wrote: > 3 days is way too soon to be prodding really, especially for what is > a relatively specialist port that most ports devs won't use. Anyway a > few quick comments I am short on time - as mentioned by others please > send a diff not a tar for updates. Use cvs add / cvs rm if there are > any new/removed files and cvs diff -uNp. > > patch-config_nim_cfg: > -cc = gcc > +cc = clang > > The compiler should be passed from the port in CC not hardcoded. nim.cfg is read by the nim compiler to know what C compiler it has to run when it is going to compile nim code. It cannot be left neither unset nor set to cc %= "$CC", otherwise the compilation will fail. That said, I added the --cc:$CC parameter in Makefile order to let the port build with the compiler of choice, as long as it is supported by nim. This parameter will override the value in nim.cfg during the building of the port. > > PLIST: missing @sample for the new cfg file Now it should be ok. $ grep sample pkg/PLIST @sample ${SYSCONFDIR}/nim/ @sample ${SYSCONFDIR}/nim/nim.cfg @sample ${SYSCONFDIR}/nim/nimdoc.cfg @sample ${SYSCONFDIR}/nim/nimdoc.tex.cfg > Makefile: drop REVISION, maybe the --parallelBuild:1 should really > be ${MAKE_JOBS} instead of 1 > Fixed. Best regards, Luca De Pandis Index: Makefile === RCS file: /cvs/ports/lang/nim/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile2 May 2020 09:33:06 - 1.11 +++ Makefile16 Jan 2021 13:10:55 - @@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/ COMMENT = statically typed, imperative programming language -VERSION = 1.2.0 +VERSION = 1.4.2 DISTNAME = nim-${VERSION} EXTRACT_SUFX = .tar.xz REVISION = 0 @@ -22,6 +22,13 @@ PERMIT_PACKAGE = Yes WANTLIB = c m +# cc is not a supported compiler, so CC has to be set as clang instead +CC = clang + +MODULES = lang/python + +MODPY_VERSION =${MODPY_DEFAULT_VERSION_3} + post-patch: mkdir -p ${WRKSRC}/nimcache-port mkdir -p ${WRKSRC}/nimcache-port-test @@ -33,15 +40,15 @@ do-build: cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \ CFLAGS="${CFLAGS}" sh build.sh # slow machines can get a head of themselves and fail to link - cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:1 \ + cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:${MAKE_JOBS} \ --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \ - --listCmd --putenv:"PATH=${PATH}" koch - cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \ + --listCmd --putenv:"PATH=${PATH}" --cc:${CC} koch + cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:${MAKE_JOBS} \ --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \ - --listCmd --putenv:"PATH=${PATH}" - cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \ + --listCmd --putenv:"PATH=${PATH}" --cc:${CC} + cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:${MAKE_JOBS} \ --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \ - --listCmd --putenv:"PATH=${PATH}" + --listCmd --putenv:"PATH=${PATH}" --cc:${CC} do-install: ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin @@ -54,11 +61,13 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nim ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ + ${PREFIX}/lib/nim/pure/unidecode/gen.py do-test: cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \ - --parallelBuild:1 --listFullPaths --listCmd \ + --parallelBuild:${MAKE_JOBS} --listFullPaths --listCmd \ --nimcache:"${WRKSRC}/nimcache-port-test" \ - --putenv:"PATH=${PATH}" + --putenv:"PATH=${PATH}" --cc:${CC} .include Index: distinfo === RCS file: /cvs/ports/lang/nim/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo2 May 2020 09:33:06 - 1.5 +++ distinfo16 Jan 2021 13:10:55 - @@ -1,2 +1,2 @@ -SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU= -SIZE (nim-1.2.0.tar.xz) = 5869428 +SHA256 (nim-1.4.2.tar.xz) = 03a47583777dd81380a3407aa6a788c9aa8a67df4821025770c9ac4186291161 +SIZE (nim-1.4.2.tar.xz) = 4770616 Index: patche
Re: [UPDATE] lang/nim 1.2.0 -> 1.4.2
On Fri, Jan 15, 2021 at 05:07:10PM +0100, Rafael Sadowski wrote: [...] > cvs diff -uNp, please. More information: > https://www.openbsd.org/faq/ports/testing.html Yes, but note that this is the automatic default and doesn't need to be specified *unless* you changed /etc/skel/.cvsrc or your $HOME/.cvsrc. $ grep diff /etc/skel/.cvsrc diff -uNp These become the default flags for cvs per cvs(1). Still probably good to have the occasional reminder about the existence of these rc files and what goes into your 'cvs diff' command. > > > > > regards, > > Dimitri > > >
Re: [sparc64/base-gcc] Fix build of math/py-scikit-image
On 2021/01/15 14:48, Kurt Mosiejczuk wrote: > py-scikit-image uses c++0x, so base-gcc cannot be used. > > This fixes the build on sparc64. > > ok? > > (cc maintainer) > > --Kurt > > Index: Makefile > === > RCS file: /cvs/ports/math/py-scikit-image/Makefile,v > retrieving revision 1.6 > diff -u -p -r1.6 Makefile > --- Makefile 4 Jan 2021 14:06:34 - 1.6 > +++ Makefile 15 Jan 2021 19:46:51 - > @@ -13,6 +13,9 @@ MAINTAINER =Paul Irofti # BSD > PERMIT_PACKAGE = Yes > > +# c++0x > +COMPILER = base-clang ports-gcc > + > MODULES =lang/python > > FLAVORS =python3 > Please add WANTLIB and bump too. OK.
Re: Remove x11/qt5styleplugins
On Sat, Jan 16, 2021 at 11:39:31AM +0100, Rafael Sadowski wrote: > Cloud we remove x11/qt5styleplugins? It is upstream completely > unmaintained and I'm no really willing to do the extra work and unbreak > it with Qt 5.15. No point in beating a dead horse that hinders you in maintaining the Qt framework, I'd say. No ports depend on it and style plugins sound purely optional/cosmetic. OK kn
Remove x11/qt5styleplugins
Cloud we remove x11/qt5styleplugins? It is upstream completely unmaintained and I'm no really willing to do the extra work and unbreak it with Qt 5.15. https://github.com/qt/qtstyleplugins
Remove link libraries patches in graphics/kdiagram
Remove link libraries patches in graphics/kdiagram. The port builds and links fine with ports GCC and base CLang. I also tested with USE_LLD on and off. Did I miss something? Index: Makefile === RCS file: /cvs/ports/graphics/kdiagram/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile14 May 2020 19:46:35 - 1.5 +++ Makefile16 Jan 2021 09:22:58 - @@ -4,6 +4,7 @@ COMMENT = libraries for creating busines VERSION = 2.7.0 DISTNAME = kdiagram-${VERSION} +REVISION = 0 CATEGORIES = graphics Index: patches/patch-examples_tools_CMakeLists_txt === RCS file: patches/patch-examples_tools_CMakeLists_txt diff -N patches/patch-examples_tools_CMakeLists_txt --- patches/patch-examples_tools_CMakeLists_txt 18 Sep 2018 10:22:03 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-examples_tools_CMakeLists_txt,v 1.1.1.1 2018/09/18 10:22:03 rsadowski Exp $ - -Index: examples/tools/CMakeLists.txt examples/tools/CMakeLists.txt.orig -+++ examples/tools/CMakeLists.txt -@@ -7,5 +7,6 @@ add_library(testtools SHARED ${testtools_LIB_SRCS}) - generate_export_header( testtools ) - - target_link_libraries(testtools LINK_PRIVATE -+c - Qt5::Core - ) Index: patches/patch-src_KChart_CMakeLists_txt === RCS file: patches/patch-src_KChart_CMakeLists_txt diff -N patches/patch-src_KChart_CMakeLists_txt --- patches/patch-src_KChart_CMakeLists_txt 18 Sep 2018 10:22:03 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_KChart_CMakeLists_txt,v 1.1.1.1 2018/09/18 10:22:03 rsadowski Exp $ - -Index: src/KChart/CMakeLists.txt src/KChart/CMakeLists.txt.orig -+++ src/KChart/CMakeLists.txt -@@ -144,6 +144,7 @@ target_include_directories(KChart - target_link_libraries(KChart - PUBLIC - Qt5::Widgets -+c - PRIVATE - Qt5::Svg - ) Index: patches/patch-src_KGantt_CMakeLists_txt === RCS file: patches/patch-src_KGantt_CMakeLists_txt diff -N patches/patch-src_KGantt_CMakeLists_txt --- patches/patch-src_KGantt_CMakeLists_txt 14 May 2020 19:46:35 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_KGantt_CMakeLists_txt,v 1.2 2020/05/14 19:46:35 rsadowski Exp $ - -Index: src/KGantt/CMakeLists.txt src/KGantt/CMakeLists.txt.orig -+++ src/KGantt/CMakeLists.txt -@@ -72,6 +72,7 @@ target_include_directories(KGantt - target_link_libraries( KGantt - PUBLIC - Qt5::Widgets -+c - PRIVATE - Qt5::PrintSupport - )