Re: [update] sysutils/grafana to 7.5.15
Am 23.04.2022 um 16:04 schrieb Landry Breuil: Le Sat, Apr 23, 2022 at 01:11:15PM +, Lucas Raab a écrit : Hello, Here's a small update to grafana which brings it up to the latest in the 7.5.x line. Lightly tested on amd64 with no issues seen loading/creating dashboards connected to an InfluxDB source. Mostly security fixes in this one: CVE-2022-21702 CVE-2022-21703 CVE-2022-21713 Alerting: Fix NoDataFound for alert rules using AND operator (#41305) https://github.com/grafana/grafana/blob/main/CHANGELOG.md#7515-2022-02-08 Anyone else want to give it a spin? i've tested it and it starts fine here, the only 'strange' thing is that it reports itself as 7.5.14: t=2022-04-23T16:01:53+0200 lvl=info msg="Starting Grafana" logger=server version=7.5.14 commit=unknown-dev branch=master compiled=2022-04-23T12:36:11+0200 i guess that's not a big deal. This grafana update works fine here, thank you. OK martin@ The CVEs are categorized as medium severity, a candidate for -stable? -m
ghc-9.2.2 upgrade (and many dependent ports)
Hi Matthias and ports testers, I have a plausible set of attached patches that should switch us to the newest GHC. We are skipping the 9.0 series as I don't think they offer anything valuable compared to going directly to the latest. The ports that were easy to update while keeping compatible ghc-8.10 have been already submitted. I do not know how to land the remaining patches non-atomically without heroics. So when we are happy with them, I can submit them all at once. As previously discussed, we won't be supporting i386 going forward. For the ease of review, the i386 removal is a separate patch. One knotty update is git-annex which I documented upstream: https://git-annex.branchable.com/bugs/No_viable_build_plan_for_ghc_9.2.2/ I hacked the do-patch target of this port together. If people feel this is too hacky, we can discuss how to improve. If people feel like helping, please build your own GHC and any ports that you use and run them for real. I can am pretty sure everything packages and installs, but not much beyond this except for some ports I actively use. Thanks Greg ghc922.tgz Description: Binary data
Re: Update pandoc to 2.18
Hi Evan, Evan Silberman writes: > Attached updates pandoc to 2.18, also takes maintainer. (I finally have > openbsd on a laptop after a couple years of debating with myself how > sensible it is to buy yet another laptop.) Very nice, thank you for taking the initiative and upgrading the port. I'm ready to commit your patch. I just would like to confirm if you ran some tests with the new package version. > I know a new GHC version is cooking so maybe it doesn't make sense to > commit this now, but maybe that doesn't really matter either. I checked that your port is buildable with ghc-9.2.2. So it's good to go. Thanks Greg
[help] sysutils/grafana update and Go
Hello,
I think I've been staring at this too long...
grafana is proving to be a special case unless I'm missing something
obvious. The project seems to follow the pkg[0] layout pattern. It
uses a build.go which imports from the module in pkg/ to generate
the final build files. From there, the problem seems to be with the
vendoring. When Go runs build.go, it expects to find the grafana
module (in pkg/) in vendor/github.com/grafana/grafana.
I've tried naively copying the contents of pkg into
vendors/github.com/grafana/grafana. This starts the build, but
quickly (and unsurprisingly) fails with more "cannot find package..."
errors. Looking in go.port.mk, I've tried manipulating MODGO_WORKSPACE
and MODGO_GOPATH to mirror what a $HOME install would look like
(~/go/pkg/...) to no avail.
When built and run locally from $HOME, it works just fine from the
initial testing. I must be missing the right incantation of MODGO
vars, but I'm at a loss what I'm doing incorrectly and/or missing.
I've attached the WIP diff. Feel free to ignore the notes about
building the {front,back}end, they're not relevant here and
incorporated into the vendored DISTFILES. You should be able to
take the DISTFILES though and build locally, `go run build.go setup`
, `go run build.go build`, and then `./bin/openbsd-amd64/grafana-server`.
If that doesn't work, well, I must be a fool...
Best,
Lucas
[0] https://github.com/golang-standards/project-layout#pkg
https://github.com/grafana/grafana/tree/v8.5.0
diff refs/heads/master refs/heads/grafana
blob - b50ead16349c7d4375f0ebd4e3cbfcc5fd469fe7
blob + f1ecc30cb4abab11953bcf20773edd756f06dc22
--- sysutils/grafana/Makefile
+++ sysutils/grafana/Makefile
@@ -1,26 +1,38 @@
+# grafana requires a vendored build in two stages, frontend and backend
+# To build the backend, run `gmake gen-go`, `go mod tidy`, and then
+# `go mod vendor`
+# To build the frontend:
+# 1. Run `yarn install --immutable`. yarn will fail to build the
+#cypress module, but this doesn't matter. It is only used for e2e
+#tests
+# 2. Run `NODE_ENV=production NODE_OPTIONS="--max-old-space-size=6144" \
+#yarn run build`
+# Tidy up a bit by grabbing the BUILD_ID from the generated JS files
+# and removing these directories:
+# * rm -R .yarn/{.cache,cache,install-state.gz,unplugged}
+# * rm -R node_modules
+# Compress the grafana directory
COMMENT = monitoring and metric analytics dashboards
-V =7.5.11
+V =8.5.0
DISTNAME = grafana+vendor-$V
WRKDIST = ${WRKDIR}/grafana-$V
-EXTRACT_SUFX = .tar.zstd
+EXTRACT_SUFX = .tar.zst
PKGNAME = grafana-$V
-BUILD_ID = 0cd8deb042c68e8113e4
+BUILD_ID = da4d1dde3251d06d1d4a
CATEGORIES = sysutils
HOMEPAGE = https://grafana.com
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
- grafana-$V.linux-amd64.tar.gz{grafana-$V.linux-amd64.tar.gz?1}:0
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
# force CDN refresh; upstream rerolled but some CDN nodes have the old version
# normally grafana-$V.linux-amd64.tar.gz:0
# grafana+vendor distfile generated by fetching archive from
# https://github.com/grafana/grafana/archive/v$V/grafana-$V.tar.gz
# and running "go mod tidy" + "go mod vendor"
-MASTER_SITES = https://rhaalovely.net/~landry/stuff/
-MASTER_SITES0 =https://dl.grafana.com/oss/release/
+MASTER_SITES = https://ports.lucasraab.me/
# Apache 2.0 (bundles roboto and opensans fonts)
PERMIT_PACKAGE = Yes
@@ -31,10 +43,6 @@ SUBST_VARS +=BUILD_ID
MODGO_FLAGS += -ldflags="-w -X main.version=$V"
-# remove linux binaries from grafana-$V.linux-amd64.tar.gz
-post-extract:
- rm ${WRKDIST}/bin/*
-
do-build:
cd ${WRKSRC} && ${MODGO_CMD} run ${MODGO_FLAGS} build.go setup
cd ${WRKSRC} && ${MODGO_CMD} run ${MODGO_FLAGS} build.go build
blob - 81e7a9a3d39a828710545471759cc73fea63bc22
blob + ddecead58fa7793ff1cc8cfbb9b0b758672740d9
--- sysutils/grafana/distinfo
+++ sysutils/grafana/distinfo
@@ -1,4 +1,2 @@
-SHA256 (grafana+vendor-7.5.11.tar.zstd) =
qWIl+v4PaHTkg72OGWISgYbfnPD8v3KzAivCnsJHbm0=
-SHA256 (grafana-7.5.11.linux-amd64.tar.gz) =
MkTQztSNLelybJo71tXwjBtqCB1CZlQB4DP8SjHFfV0=
-SIZE (grafana+vendor-7.5.11.tar.zstd) = 21207028
-SIZE (grafana-7.5.11.linux-amd64.tar.gz) = 52218943
+SHA256 (grafana+vendor-8.5.0.tar.zst) =
DMJof60UoaSxwo9ZbEzQQUYu39Yg0xpc776lKtBW0bs=
+SIZE (grafana+vendor-8.5.0.tar.zst) = 58331264
blob - 8c90a0d54c0f1a800a0a12cf4970c14fa733eabf (mode 644)
blob + /dev/null
--- sysutils/grafana/patches/patch-build_go
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: build.go
build.go.orig
-+++ build.go
-@@ -343,7 +343,7 @@ func setBuildEnv() {
- os.Setenv("GOARCH", goarch)
- }
- if goarch == "386" {
-- os.Setenv("GO386", "387")
-+ os.Setenv("GO386", "softfloat")
- }
- if cgo {
- os.Setenv("CGO_ENABLED", "1")
blob - b724dd60382b907afc8c6a9425200cd4434c97c3
blob + aeab81e36c2b3a8134ba763ae53ec0
games/dMagnetic: Udate to 0.34
Hello guys.
Once again, this is for the ports tree of the 7.2 release.
A user pointed out a bug in my release 0.33, so I fixed it.
Please find the patch attached to this email.
From the Debian release, here is my changelog for this release:
dmagnetic (0.34-1) unstable; urgency=medium
* Minor bugfixes
* Slightly updated documentation
* Popular feature "-nodoc" had an issue with saved games.
-- Thomas Dettbarn Wed, 27 Apr 2022 00:33:07 +0200
Unfortunately, I did not save the changelog for the 0.33 release, but
its only entry (other than the Minor bugfixes) was
* New feature "-nodoc" for players without a manual
Thomas
diff --git a/games/dmagnetic/Makefile b/games/dmagnetic/Makefile
index b4b3f917e70..4f48d658917 100644
--- a/games/dmagnetic/Makefile
+++ b/games/dmagnetic/Makefile
@@ -1,4 +1,6 @@
-V =0.33
+# $OpenBSD: Makefile,v 1.18 2021/06/23 22:36:56 sthen Exp $
+
+V =0.34
COMMENT = interpreter for Magnetic Scrolls games
DISTNAME = dMagnetic_${V}
PKGNAME = dmagnetic-${V}
diff --git a/games/dmagnetic/distinfo b/games/dmagnetic/distinfo
index 922538889a9..863d971fe55 100644
--- a/games/dmagnetic/distinfo
+++ b/games/dmagnetic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dMagnetic_0.33.tar.bz2) = QZmWbyFGZ8eMcTO4sMk/9LjGXI39sv+Uh6CzsXJq8hI=
-SIZE (dMagnetic_0.33.tar.bz2) = 90675
+SHA256 (dMagnetic_0.34.tar.bz2) = Vwsb63ERh0z7tU/HGGjczHMrwyNbnl31htk6T/K46Jc=
+SIZE (dMagnetic_0.34.tar.bz2) = 90775
diff --git a/games/dmagnetic/pkg/PLIST b/games/dmagnetic/pkg/PLIST
index 9683640aed5..fe9b1cb21eb 100644
--- a/games/dmagnetic/pkg/PLIST
+++ b/games/dmagnetic/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.2 2021/06/23 22:36:56 sthen Exp $
@bin bin/dMagnetic
@man man/man5/dMagneticini.5
@man man/man6/dMagnetic.6
Re: nsh manual rewrite in mandoc draft feedback requested style ideas etc
Hello Ingo, Thanks for all your feedback, It s very much appreciated. Re mandoc(1) vs mdoc(7) thanks for the clarification for me, I will try to use mdoc(7) when referring to the manpage language Your formatting advice was very helpful I have tried to fully implement your feedback as best I can with a couple of exceptions. .Ss section overuse for trivial commands have been removed but I propose to retain .Ss for commands with a large subset of commands / sub menu of commands is this appropiate use of the .Ss sections ? regarding Sorting ...I agree it needs to be improved, Im caught between 3 conflicting methods 1) I think certain commands should be presented in the manual sooner rather than later (eg enable, show , ip , ip6 and interface ) 2) anything else alphabetically 3) match the ordering of commands in the nsh program ... (some of the commands probably should be re-ordered Ill discuss this with Chris, I think a hybrid between 1 and 2 options is probably best ... (aphabetical by default and then present important basic commands first (as an exception)) I will look at the tg macro again (i missed this completely but I plan to incorporate your advice below shortly .Tg rtable .It Oo Ic no Oc Ic rtable Oo Ar table-id Oc Op name In such cases, the .Tg macro is useful to make ":t rtable" work in man(1). Re Upstream Inclusion of the manual I have been discussing with Chris and once I get a final draft (with current features documented) it will be checked by Chris and included in the nsh source. Attached is the updated version any other feedback / adivce would be appreciated Thanks again Tom On Mon, 25 Apr 2022 at 21:59, Ingo Schwarze wrote: > > Hi Tom, > > Tom Smyth wrote on Mon, Apr 25, 2022 at 11:08:26AM +0100: > > > I have been translating the txt of MANUAL of nsh port to mandoc > > In fact, you have started translating it to mdoc(7) - which is a markup > language - rather than to mandoc(1) - which is a parsing and formatting > program for multiple markup languages including mdoc(7). > > > there is quite alot of features and syntax to document > > Wow, indeed. What a beast! > > > so I figured that before I complete the first redraft (that is fit for > > human consumption) I would get feedback on what I have done so far. > > > > do you like the bullets are they too much > > My impression is that bullet lists are indeed overused. > > > what I should do more of? > > what i should do less of? > > I suggest making sure that features are described completely and > consisely and not only demonstrated by examples. You certainly > do not need to add more examples. Wording, grammar, and punctuation > might profit from some polishing throughout. Some text feels rather > wordy and repetitive for a manual page but somewhat vague at the > same time. > > In a manual page, the DESCRIPTION needs particular attention because > it's the first part readers look at. Choosing a good order and > weeding out repetions is particularly important in that section. > > > any advice comments would be appreciated > > OK, let's have a stab at it: > > > .\" NSH is BSD licensed > > Instead of this line, insert the complete text of the license that > applies to the manual page file, including a "Copyright" line. > Look in /usr/share/man/man8/ for examples. > > > .Nd Network configuration shell > > Use lower case instead of sentence case in the .Nd line. > > > .Bk -words ... .Ek > > No need for that, just delete both the .Bk and the .Ek line. > > > .Op Fl i Ar rcfile > > .Op Fl c Ar rcfile > > Use different placeholder names for different option arguments. > Make them as descriptive as possible. > > > for other daemons into one place, providing an alternative > > to /etc/netstart and parts of /etc/rc. > > Make that > > an alternative to > .Xr netstart 8 > and parts of > .Xr rc 8 . > > > .sp > > Never use .sp in manual pages. Use .Pp instead. > > > .Nm > > encapsulates the following daemons and services: > > Very subtle markup bug here: outside literal context, you almost never > want to start a line in roff(7) code with a space character. > In roff(7), a leading space character means "break the output line > and indent the next line by a space character - look at the output: > > nsh > encapsulates the following daemons and services: > > That's very ugly and a bit confusing. Search your file for lines > starting with spaces, there are several more examples. > > > pf, ospfd, ospf6d, bgpd, ripd, ldpd, relayd, ipsecctl, iked, rtadvd, > > dvmrpd, sasyncd, dhcpd, snmpd, sshd, ntpd, ifstated, tftp-proxy, > > ftp-proxy, tftpd, npppd, resolv.conf, inetd, smtpd, ldapd, ifstated > > Ouch, what a monster. I'd probably do something like this: > > .Bd -ragged -offset indent > .Xr pfctl 8 , > .Xr ospfd 8 , > .Xr ospf6d 8 , > .Xr bgpd 8 , > .Xr ripd 8 , > ... > .Ed > > Consider some kind of sorting, maybe alphabetically. > > This is bad because it destroys conciseness of the DESCRIPTION. > Maybe say
Re: update net/rsync 3.2.4
Nam Nguyen writes:
> Two diffs are attached, incorporating feedback from espie@ sthen@ and
> naddy@. Feedback is welcome. OK?
>
> 1. rsync_stable.diff: intended for -stable. brings bundled zlib from
>rsync 3.2.4 to 3.2.3 with this commit:
>
> https://github.com/WayneD/rsync/commit/1de71e8a7870fa1be29f562df61f4c5c4685818f
>
>
> 2. rsync.diff:
> - --enable-md5-asm (from naddy@ to retain
> checking whether to enable MD5 ASM optimizations... yes (x86_64))
> - --with-nobody-user=_rsync
> - install rrsync(1) man page. If --with-rrsync is used to build and
> install the man page, it introduces python3 as a dependency to run
> ${WRKSRC}/md-convert script. Drawback: rrsync(1) prints 3.2.4pre4
> - remove compat.c (fixed)
> - remove configure.sh (use --with-nobody-user=_rsync instead)
> - remove receiver.c (upstreamed)
> - rsync(1) patch: churn
> - rsyncd.conf patch: add missing ${PREFIX}/bin and remove ${SYSCONFDIR}
> bits
> - rrsync patch: churn and moves from perl to python3
rsync_stable.diff is the same.
Here is a fresh rsync.diff that additionally:
- --with-rrsync and brings in python as BUILD_DEPENDS (not RUN_DEPENDS)
and textproc/py-commonmark, needed to run
${WRKSRC}/md-convert. md-convert converts rsync.1.md --> rsync.1, so
remove patches for man pages and patch markdown files instead.
- remove rsyncd.conf.5 from ${SUBST_CMD} as /usr/local/bin correctly
appears in man page.
- --enable-md5-asm only on amd64, as configure check fails on other
platforms
>
> I plan to do the following soon (these don't have to hold up the
> update):
> - add zstd flavor
> - port py-braceexpand for better rrsync support
rsync.diff
Description: rsync.diff
rsync_stable.diff
Description: rsync_stable.diff
Re: games/dMagnetic: Udate to 0.34
Hello once again. My sincere apologies. I just realized that my patch (once again) is creating the old comment with the version number. Since you guys moved the repository to git, this is superfluous. I changed my patch-generation script, it SHOULD not be in the next release. Thomas On 4/27/22 00:39, Thomas Dettbarn wrote: Hello guys. Once again, this is for the ports tree of the 7.2 release. A user pointed out a bug in my release 0.33, so I fixed it. Please find the patch attached to this email. From the Debian release, here is my changelog for this release: dmagnetic (0.34-1) unstable; urgency=medium * Minor bugfixes * Slightly updated documentation * Popular feature "-nodoc" had an issue with saved games. -- Thomas Dettbarn Wed, 27 Apr 2022 00:33:07 +0200 Unfortunately, I did not save the changelog for the 0.33 release, but its only entry (other than the Minor bugfixes) was * New feature "-nodoc" for players without a manual Thomas
Re: Update mail/dovecot-fts-xapian to 1.5.5 to fix segfault in 7.1
Any comments Tom? Since it is currently broken it's probably best if we commit it asap and also commit something (whether that's 1.5.5 or 1.4.14) to 7.1-stable. On 2022/04/24 15:08, Brad Smith wrote: > On 4/24/2022 7:39 AM, William Orr wrote: > > Hey, > > > > The plugin API of dovecot apparently changed in 2.3.17. Because of this, > > the version of dovecot-fts-xapian in 7.1 is broken and will crash > > whenever invoked. > > > > Diff to update the plugin to the latest version follows. I'm running > > this on my backup MX that I upgraded to 7.1 to test, and I no longer get > > crashes when receiving mail or replicating mail to it. > > > > (please CC me, I'm not subscribed to ports@) > > > > Thanks > > > It looks like the issue would have been resolved by updating to 1.4.14 as > well. > > It is too bad this was not noticed before the release. Thank you for working > on this. > > Do you intend to push those patches upstream or should I? >
Re: [new] devel/py-jsonpointer and devel/py-jsonpatch
> new tarballs attached. Imported, thanks!
Re: [update] textproc/py-sphinx_rtd_theme
On 2022/04/26 18:19, portno12 wrote: > bumps to latest, i tried for a version that wasnt major but it didnt have a > release and this was the next. > > incompatibilities in changelog are requirements moved to py 2.7+ and 3.4+ > both in tree, also now supports sphinx 4 officially also in tree, and this > update adds more translations and code fixes. > > https://sphinx-rtd-theme.readthedocs.io/en/stable/changelog.html With sphinx and themes you need to check that dependent ports still package and that the PLIST doesn't change. For this it's: devel/luacheck emulators/qemu misc/open62541 productivity/vdirsyncer have you checked any/all of those?
Re: [new] audio/shairport-sync an AirPlay audio player
Hi Stuart,
On Tue, Apr 26, 2022 at 04:52:11PM +0100, Stuart Henderson wrote:
| couple of tweaks in the version attached, and I used upstream's
| install target as much as possible (usually better as long as it
| doesn't need serious patching, it's less likely to get out of sync
| that way).
Thanks - that looks better indeed (to my untrained eye).
| ok (I have not tested at runtime)
I have, it works great!
Paul
| On 2022/04/26 17:32, Paul de Weerd wrote:
| > Hi all,
| >
| > sthen@ had some feedback on IRC:
| >
| > - needs a tweak to use CONFIGURE_STYLE=autoreconf
| > - manpage into a better section (probably 1; 7 isn't right)
| > - check to make sure it doesn't pick up libsoxr if installed (or add
| > it as a dep)
| > - should be /var/empty not ${VARBASE}/empty
| > - and remove daemon from @newuser / update the uid
| > - and typo "Sharport-sync"
| > - and zap the rcs ids
| > - check it doesn't pick up libdaemon/libsndfile too
| >
| > I've updated Aaron's submission with these changes, please find it
| > attached. The tarball misses this change to user.list:
| >
| > cvs diff: Diffing .
| > Index: user.list
| > ===
| > RCS file: /home/OpenBSD/cvs/ports/infrastructure/db/user.list,v
| > retrieving revision 1.397
| > diff -u -p -r1.397 user.list
| > --- user.list 25 Apr 2022 07:32:01 - 1.397
| > +++ user.list 26 Apr 2022 14:19:35 -
| > @@ -384,3 +384,4 @@ id usergroup port
| > 873 _alertmanager _alertmanager sysutils/alertmanager
| > 874 _snowflakeproxy_snowflakeproxy net/snowflake_proxy
| > 875 _guacd _guacd net/guacamole/server
| > +876 _shairport _shairport audio/shairport-sync
| >
| > as the original UID Aaron picked (872) has already been taken by
| > databases/victoriametrics (point 5 from sthen's list).
| >
| > Many thanks again to Aaron for creating the port, and to Stuart for
| > his feedback.
| >
| > Paul
| >
| > On Tue, Apr 26, 2022 at 04:32:38PM +0200, Paul de Weerd wrote:
| > | Hi all,
| > |
| > | I've tried Aaron's port .. it works great. I've had to change the
| > | _shairport user id to 876 with the current ports tree, but other than
| > | that a very simple configuration file (setting the name and interface
| > | to listen on) produces a working setup for me.
| > |
| > | Thanks Aaron!
| > |
| > | Paul
| > |
| > | On Thu, Dec 09, 2021 at 07:41:29AM -0700, Aaron Bieber wrote:
| > | | Hi,
| > | |
| > | | Here is a port of shairport-sync. It lets one stream audio from iDevices
| > | | to OpenBSD.
| > | |
| > | | DESCR snip:
| > | |
| > | | Shairport Sync is an AirPlay audio player. It plays audio streamed
from
| > | | iTunes, iOS, Apple TV and macOS devices and AirPlay sources such as
Quicktime
| > | | Player and ForkedDaapd, among others.
| > | |
| > | | HOME: https://github.com/mikebrady/shairport-sync
| > | |
| > | | I have had this in WIP for some time and it has been working without a
| > | | hitch.
| > | |
| > | | Cluesticks? OK to import?
| > | |
| > | | Here is the diff for the user db:
| > | |
| > | | diff 43179bcb078bb95ad600e5d85321b77ec70deb07 /usr/ports
| > | | blob - 17cb166abe6601b51e206bb97d1ce009a2729eac
| > | | file + infrastructure/db/user.list
| > | | --- infrastructure/db/user.list
| > | | +++ infrastructure/db/user.list
| > | | @@ -380,3 +380,4 @@ id usergroup port
| > | | 869 _headscale _headscale net/headscale
| > | | 870 _unit _unit www/unit
| > | | 871 _gelatod _gelatodnet/gelatod
| > | | +872 _shairport _shairport audio/shairport-sync
| > | |
| > |
| > |
| > |
| > | --
| > | >[<++>-]<+++.>+++[<-->-]<.>+++[<+
| > | +++>-]<.>++[<>-]<+.--.[-]
| > | http://www.weirdnet.nl/
| > |
| >
| > --
| > >[<++>-]<+++.>+++[<-->-]<.>+++[<+
| > +++>-]<.>++[<>-]<+.--.[-]
| > http://www.weirdnet.nl/
|
|
--
>[<++>-]<+++.>+++[<-->-]<.>+++[<+
+++>-]<.>++[<>-]<+.--.[-]
http://www.weirdnet.nl/
Re: UPDATE: net/argus-clients
On Tue Apr 26, 2022 at 07:42:00PM +0200, Steven Mestdagh wrote:
> minor update with some bug fixes, and zeek support.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/argus-clients/Makefile,v
> retrieving revision 1.21
> diff -u -p -u -r1.21 Makefile
> --- Makefile 11 Mar 2022 19:45:44 - 1.21
> +++ Makefile 26 Apr 2022 15:31:02 -
> @@ -1,10 +1,13 @@
> COMMENT =utilities to read and parse Argus data
>
> -DISTNAME = argus-clients-3.0.8.3
> +VERSION =3.0.8.4
> +DISTNAME = argus-clients-${VERSION}
> CATEGORIES = net
>
> HOMEPAGE = http://qosient.com/argus/
https://openargus.org/ !?
> -MASTER_SITES = ${HOMEPAGE}/src/
> +GH_ACCOUNT = openargus
> +GH_PROJECT = clients
> +GH_TAGNAME = v${VERSION}
>
> MAINTAINER = Steven Mestdagh
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/argus-clients/distinfo,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 distinfo
> --- distinfo 24 Nov 2021 19:23:50 - 1.8
> +++ distinfo 26 Apr 2022 15:31:02 -
> @@ -1,2 +1,2 @@
> -SHA256 (argus-clients-3.0.8.3.tar.gz) =
> uNTvi6zbrYHAivQMPkhlNCoqRW9GOkgKvCf3mInds80=
> -SIZE (argus-clients-3.0.8.3.tar.gz) = 2758432
> +SHA256 (argus-clients-3.0.8.4.tar.gz) =
> HnHh7ISjEa9KxsbJ56MjHhBZHiFbhNfghBc1sR2zEno=
> +SIZE (argus-clients-3.0.8.4.tar.gz) = 2773840
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/argus-clients/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -u -r1.6 PLIST
> --- pkg/PLIST 11 Mar 2022 19:45:45 - 1.6
> +++ pkg/PLIST 26 Apr 2022 15:31:02 -
> @@ -61,6 +61,7 @@ include/argus/argus_grep.h
> include/argus/argus_histo.h
> include/argus/argus_int.h
> include/argus/argus_isis.h
> +include/argus/argus_json.h
> include/argus/argus_label.h
> include/argus/argus_llc.h
> include/argus/argus_main.h
> @@ -143,6 +144,7 @@ share/examples/argus-clients/Config/iana
> share/examples/argus-clients/Config/local.addrs
> share/examples/argus-clients/Config/racluster.conf
> share/examples/argus-clients/Config/racolor.conf
> +share/examples/argus-clients/Config/raconvert.zeek.conf
> share/examples/argus-clients/Config/radium.conf
> share/examples/argus-clients/Config/ragetcountrycodes.sh
> share/examples/argus-clients/Config/ralabel.conf
>
UPDATE: net/argus-clients
minor update with some bug fixes, and zeek support.
Index: Makefile
===
RCS file: /cvs/ports/net/argus-clients/Makefile,v
retrieving revision 1.21
diff -u -p -u -r1.21 Makefile
--- Makefile11 Mar 2022 19:45:44 - 1.21
+++ Makefile26 Apr 2022 15:31:02 -
@@ -1,10 +1,13 @@
COMMENT = utilities to read and parse Argus data
-DISTNAME = argus-clients-3.0.8.3
+VERSION = 3.0.8.4
+DISTNAME = argus-clients-${VERSION}
CATEGORIES = net
HOMEPAGE = http://qosient.com/argus/
-MASTER_SITES = ${HOMEPAGE}/src/
+GH_ACCOUNT = openargus
+GH_PROJECT = clients
+GH_TAGNAME = v${VERSION}
MAINTAINER = Steven Mestdagh
Index: distinfo
===
RCS file: /cvs/ports/net/argus-clients/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo24 Nov 2021 19:23:50 - 1.8
+++ distinfo26 Apr 2022 15:31:02 -
@@ -1,2 +1,2 @@
-SHA256 (argus-clients-3.0.8.3.tar.gz) =
uNTvi6zbrYHAivQMPkhlNCoqRW9GOkgKvCf3mInds80=
-SIZE (argus-clients-3.0.8.3.tar.gz) = 2758432
+SHA256 (argus-clients-3.0.8.4.tar.gz) =
HnHh7ISjEa9KxsbJ56MjHhBZHiFbhNfghBc1sR2zEno=
+SIZE (argus-clients-3.0.8.4.tar.gz) = 2773840
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/argus-clients/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST 11 Mar 2022 19:45:45 - 1.6
+++ pkg/PLIST 26 Apr 2022 15:31:02 -
@@ -61,6 +61,7 @@ include/argus/argus_grep.h
include/argus/argus_histo.h
include/argus/argus_int.h
include/argus/argus_isis.h
+include/argus/argus_json.h
include/argus/argus_label.h
include/argus/argus_llc.h
include/argus/argus_main.h
@@ -143,6 +144,7 @@ share/examples/argus-clients/Config/iana
share/examples/argus-clients/Config/local.addrs
share/examples/argus-clients/Config/racluster.conf
share/examples/argus-clients/Config/racolor.conf
+share/examples/argus-clients/Config/raconvert.zeek.conf
share/examples/argus-clients/Config/radium.conf
share/examples/argus-clients/Config/ragetcountrycodes.sh
share/examples/argus-clients/Config/ralabel.conf
Re: [new] audio/shairport-sync an AirPlay audio player
couple of tweaks in the version attached, and I used upstream's
install target as much as possible (usually better as long as it
doesn't need serious patching, it's less likely to get out of sync
that way).
ok (I have not tested at runtime)
On 2022/04/26 17:32, Paul de Weerd wrote:
> Hi all,
>
> sthen@ had some feedback on IRC:
>
> - needs a tweak to use CONFIGURE_STYLE=autoreconf
> - manpage into a better section (probably 1; 7 isn't right)
> - check to make sure it doesn't pick up libsoxr if installed (or add
> it as a dep)
> - should be /var/empty not ${VARBASE}/empty
> - and remove daemon from @newuser / update the uid
> - and typo "Sharport-sync"
> - and zap the rcs ids
> - check it doesn't pick up libdaemon/libsndfile too
>
> I've updated Aaron's submission with these changes, please find it
> attached. The tarball misses this change to user.list:
>
> cvs diff: Diffing .
> Index: user.list
> ===
> RCS file: /home/OpenBSD/cvs/ports/infrastructure/db/user.list,v
> retrieving revision 1.397
> diff -u -p -r1.397 user.list
> --- user.list 25 Apr 2022 07:32:01 - 1.397
> +++ user.list 26 Apr 2022 14:19:35 -
> @@ -384,3 +384,4 @@ id usergroup port
> 873 _alertmanager _alertmanager sysutils/alertmanager
> 874 _snowflakeproxy_snowflakeproxy net/snowflake_proxy
> 875 _guacd _guacd net/guacamole/server
> +876 _shairport _shairport audio/shairport-sync
>
> as the original UID Aaron picked (872) has already been taken by
> databases/victoriametrics (point 5 from sthen's list).
>
> Many thanks again to Aaron for creating the port, and to Stuart for
> his feedback.
>
> Paul
>
> On Tue, Apr 26, 2022 at 04:32:38PM +0200, Paul de Weerd wrote:
> | Hi all,
> |
> | I've tried Aaron's port .. it works great. I've had to change the
> | _shairport user id to 876 with the current ports tree, but other than
> | that a very simple configuration file (setting the name and interface
> | to listen on) produces a working setup for me.
> |
> | Thanks Aaron!
> |
> | Paul
> |
> | On Thu, Dec 09, 2021 at 07:41:29AM -0700, Aaron Bieber wrote:
> | | Hi,
> | |
> | | Here is a port of shairport-sync. It lets one stream audio from iDevices
> | | to OpenBSD.
> | |
> | | DESCR snip:
> | |
> | | Shairport Sync is an AirPlay audio player. It plays audio streamed from
> | | iTunes, iOS, Apple TV and macOS devices and AirPlay sources such as
> Quicktime
> | | Player and ForkedDaapd, among others.
> | |
> | | HOME: https://github.com/mikebrady/shairport-sync
> | |
> | | I have had this in WIP for some time and it has been working without a
> | | hitch.
> | |
> | | Cluesticks? OK to import?
> | |
> | | Here is the diff for the user db:
> | |
> | | diff 43179bcb078bb95ad600e5d85321b77ec70deb07 /usr/ports
> | | blob - 17cb166abe6601b51e206bb97d1ce009a2729eac
> | | file + infrastructure/db/user.list
> | | --- infrastructure/db/user.list
> | | +++ infrastructure/db/user.list
> | | @@ -380,3 +380,4 @@ id user group port
> | | 869 _headscale _headscale net/headscale
> | | 870 _unit_unit www/unit
> | | 871 _gelatod _gelatodnet/gelatod
> | | +872 _shairport _shairport audio/shairport-sync
> | |
> |
> |
> |
> | --
> | >[<++>-]<+++.>+++[<-->-]<.>+++[<+
> | +++>-]<.>++[<>-]<+.--.[-]
> | http://www.weirdnet.nl/
> |
>
> --
> >[<++>-]<+++.>+++[<-->-]<.>+++[<+
> +++>-]<.>++[<>-]<+.--.[-]
> http://www.weirdnet.nl/
shairport-sync.tgz
Description: application/tar-gz
Re: pkg_add coccinella: Can't find tcltls-1.6p4
Sorry about that. I'm looking into it. Stu -- Original Message -- From: mcmer-open...@tor.at To: ports@openbsd.org Cc: sebas...@openbsd.org Sent: Monday, April 25, 2022 7:46 AM Subject: pkg_add coccinella: Can't find tcltls-1.6p4 Hello! As the subject says: "pkg_add coccinella" tells me it "Can't find tcltls-1.6p4". The Makefile of tcltls says: BROKEN= Needs update to less outdated version and checking \ of dependent ports The Makefile of coccinella says: RUN_DEPENDS = security/tcltls [and many more] Doesn't this mean coccinella is broken, too? This is on -current as of yesterday but happens for quite a while already. Marcus
Re: [new] audio/shairport-sync an AirPlay audio player
Hi all,
sthen@ had some feedback on IRC:
- needs a tweak to use CONFIGURE_STYLE=autoreconf
- manpage into a better section (probably 1; 7 isn't right)
- check to make sure it doesn't pick up libsoxr if installed (or add
it as a dep)
- should be /var/empty not ${VARBASE}/empty
- and remove daemon from @newuser / update the uid
- and typo "Sharport-sync"
- and zap the rcs ids
- check it doesn't pick up libdaemon/libsndfile too
I've updated Aaron's submission with these changes, please find it
attached. The tarball misses this change to user.list:
cvs diff: Diffing .
Index: user.list
===
RCS file: /home/OpenBSD/cvs/ports/infrastructure/db/user.list,v
retrieving revision 1.397
diff -u -p -r1.397 user.list
--- user.list 25 Apr 2022 07:32:01 - 1.397
+++ user.list 26 Apr 2022 14:19:35 -
@@ -384,3 +384,4 @@ id usergroup port
873 _alertmanager _alertmanager sysutils/alertmanager
874 _snowflakeproxy_snowflakeproxy net/snowflake_proxy
875 _guacd _guacd net/guacamole/server
+876 _shairport _shairport audio/shairport-sync
as the original UID Aaron picked (872) has already been taken by
databases/victoriametrics (point 5 from sthen's list).
Many thanks again to Aaron for creating the port, and to Stuart for
his feedback.
Paul
On Tue, Apr 26, 2022 at 04:32:38PM +0200, Paul de Weerd wrote:
| Hi all,
|
| I've tried Aaron's port .. it works great. I've had to change the
| _shairport user id to 876 with the current ports tree, but other than
| that a very simple configuration file (setting the name and interface
| to listen on) produces a working setup for me.
|
| Thanks Aaron!
|
| Paul
|
| On Thu, Dec 09, 2021 at 07:41:29AM -0700, Aaron Bieber wrote:
| | Hi,
| |
| | Here is a port of shairport-sync. It lets one stream audio from iDevices
| | to OpenBSD.
| |
| | DESCR snip:
| |
| | Shairport Sync is an AirPlay audio player. It plays audio streamed from
| | iTunes, iOS, Apple TV and macOS devices and AirPlay sources such as
Quicktime
| | Player and ForkedDaapd, among others.
| |
| | HOME: https://github.com/mikebrady/shairport-sync
| |
| | I have had this in WIP for some time and it has been working without a
| | hitch.
| |
| | Cluesticks? OK to import?
| |
| | Here is the diff for the user db:
| |
| | diff 43179bcb078bb95ad600e5d85321b77ec70deb07 /usr/ports
| | blob - 17cb166abe6601b51e206bb97d1ce009a2729eac
| | file + infrastructure/db/user.list
| | --- infrastructure/db/user.list
| | +++ infrastructure/db/user.list
| | @@ -380,3 +380,4 @@ id usergroup port
| | 869 _headscale _headscale net/headscale
| | 870 _unit _unit www/unit
| | 871 _gelatod _gelatodnet/gelatod
| | +872 _shairport _shairport audio/shairport-sync
| |
|
|
|
| --
| >[<++>-]<+++.>+++[<-->-]<.>+++[<+
| +++>-]<.>++[<>-]<+.--.[-]
| http://www.weirdnet.nl/
|
--
>[<++>-]<+++.>+++[<-->-]<.>+++[<+
+++>-]<.>++[<>-]<+.--.[-]
http://www.weirdnet.nl/
shairport-sync.tgz
Description: application/tar-gz
Re: UPDATE: libsndfile
Thanks for the fix, and sorry for the delay.
On Apr 23 14:40:04, b...@comstyle.com wrote:
> A bug fix from upstream..
> gsm610: Fix signed integer overflow
On each of current/{amd64, arm64, armv7}
it builds, runs, and does not break this:
sox -c 1 -b 8 -r 8000 -n file.wav synth 5 sin gain -6
sndfile-convert file.wav file.gsm
sndfile-play file.gsm
However, the original problem reported at
https://github.com/libsndfile/libsndfile/issues/785
now looks like this:
$ sndfile-metadata-get /tmp/poc_sio
Open of file '/tmp/poc_sio' failed :
Internal error : SF_INFO struct incomplete.
$ sndfile-info /tmp/poc_sio
Error : Not able to open input file /tmp/poc_sio.
File : /tmp/poc_sio
Length : 3782
FORM : 3774
AIFC
FVER : 4
COMM : 24
Sample Rate : 11025
Frames : 16384
Channels: 1
Sample Size : 16
Encoding: GSM
SSND : 3408
Offset : 536870912
Block Size : 0 ???
ANNO : This is really quite a long comment. It is designed to be long enough
to screw up the encoders and decoders if the file container format does not
handle things correctly. If everything is working correctly, the decoder will
only decode the actual audio data, and not this string at the end of the file.
*** Warning : data chunk seems to be truncated.
*** Frame count read from 'COMM' chunk (16384) not equal to frame count
*** calculated from length of 'SSND' chunk (1691973536).
-
Sample rate : 11025
Frames : -2602993760
Channels: 1
Format : 0x20020
Sections: 1
Seekable: FALSE
-
Internal error : SF_INFO struct incomplete.
I'm not sure how it relates to the inttype fix.
It reports that the comment appears truncated (not having the length),
but at the same time it somehow botches the SF_INFO structure.
Jan
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/audio/libsndfile/Makefile,v
> retrieving revision 1.41
> diff -u -p -u -p -r1.41 Makefile
> --- Makefile 3 Apr 2022 11:12:38 - 1.41
> +++ Makefile 14 Apr 2022 21:20:02 -
> @@ -3,6 +3,7 @@ COMMENT= library to handle various audio
> GH_ACCOUNT= libsndfile
> GH_PROJECT= libsndfile
> GH_TAGNAME= 1.1.0
> +REVISION=0
> CATEGORIES= audio
>
> HOMEPAGE=https://libsndfile.github.io/libsndfile/
> Index: patches/patch-src_gsm610_c
> ===
> RCS file: patches/patch-src_gsm610_c
> diff -N patches/patch-src_gsm610_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_gsm610_c14 Apr 2022 21:26:35 -
> @@ -0,0 +1,15 @@
> +gsm610: Fix signed integer overflow
> +d6f83cd4feb154efcf5614601985ae2ce9d9fa6d
> +
> +Index: src/gsm610.c
> +--- src/gsm610.c.orig
> src/gsm610.c
> +@@ -150,7 +150,7 @@ Need separate gsm_data structs for encode and decode.
> + pgsm610->blocks = psf->datalength / pgsm610->blocksize
> + 1 ;
> + } ;
> +
> +-psf->sf.frames = pgsm610->samplesperblock * pgsm610->blocks ;
> ++psf->sf.frames = (sf_count_t) pgsm610->samplesperblock *
> pgsm610->blocks ;
> +
> + psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
> +
>
>
Re: games/godot: split the editor in a subpackage
Stuart Henderson wrote:
> On 2022/04/25 22:11, Omar Polo wrote:
> > PKGNAME = godot-${V}
> > -REVISION = 0
> > +REVISION-main =1
>
> right
>
> > Index: pkg/DESCR-editor
> > ===
> > RCS file: pkg/DESCR-editor
> > diff -N pkg/DESCR-editor
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ pkg/DESCR-editor19 Apr 2022 10:25:53 -
> > @@ -0,0 +1,3 @@
> > +Godot is an advanced, feature-packed, multi-platform 2D and 3D open source
> > +game engine. It provides a huge set of common tools, so you can just focus
> > +on making your game without reinventing the wheel.
> > Index: pkg/DESCR-main
> > ===
> > RCS file: pkg/DESCR-main
> > diff -N pkg/DESCR-main
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ pkg/DESCR-main 27 Apr 2018 07:32:53 -
> > @@ -0,0 +1,3 @@
> > +Godot is an advanced, feature-packed, multi-platform 2D and 3D open source
> > +game engine. It provides a huge set of common tools, so you can just focus
> > +on making your game without reinventing the wheel.
>
> The two DESCRs are the same; better to distinguish them
Agreed! (I thought I did that, but I just forgot)
> > RCS file: pkg/PLIST-editor
> > diff -N pkg/PLIST-editor
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ pkg/PLIST-editor19 Apr 2022 10:22:56 -
> > @@ -0,0 +1,9 @@
>
> needs an @conflict on the old version
I haven't thought about this. I've added the @conflict and the
@pkgpath, thanks for reminding me
> > +@bin bin/godot-editor
> > +@man man/man6/godot.6
>
> manual should go in -main shouldn't it?
good catch! yes, the manpage should go in -main
> > +share/applications/org.godotengine.Godot.desktop
> > +share/doc/pkg-readmes/${PKGSTEM}
>
> should the readme also go in -main? how about the other files?
No, the README is only about the editor, same for the other files: only
a build with the editor is meant to be run from a graphical menu. If
you run godot compiled without tools (i.e. the -main package) without
--main-pack or not in a directory with a project.godot file it just pops
up an error window.
> > +share/metainfo/
> > +share/metainfo/org.godotengine.Godot.appdata.xml
> > +share/pixmaps/
> > +share/pixmaps/godot.svg
> > +@tag update-desktop-database
> > Index: pkg/PLIST-main
> > ===
> > RCS file: pkg/PLIST-main
> > diff -N pkg/PLIST-main
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ pkg/PLIST-main 19 Apr 2022 10:22:55 -
> > @@ -0,0 +1 @@
> > +@bin bin/godot
>
> needs @pkgpath games/godot
added, thanks!
Here's an updated diff.
I've also renamed the -editor subpackage to -tools: i still think that
-editor sounds better, but -tools follows the upstream documentation,
and freebsd has a similar package (devel/godot-tools).
Index: Makefile
===
RCS file: /home/cvs/ports/games/godot/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile15 Apr 2022 20:23:19 - 1.34
+++ Makefile26 Apr 2022 14:22:35 -
@@ -1,25 +1,33 @@
BROKEN-powerpc = fails at runtime, the UI is totally blank
-COMMENT = 2D and 3D game engine
+COMMENT-main = 2D and 3D game engine
+COMMENT-tools= 2D and 3D game engine (with tools)
V =3.4.4
GODOTSTEAM_V = g34-s152-gs311
DISTNAME = godot-${V}-stable
PKGNAME = godot-${V}
-REVISION = 0
+REVISION-main =1
+
CATEGORIES = games
+
HOMEPAGE = https://godotengine.org/
+
MAINTAINER = Omar Polo
# MIT
PERMIT_PACKAGE = Yes
+MULTI_PACKAGES = -main -tools
+
WANTLIB += ${COMPILER_LIBCXX} BulletCollision BulletDynamics BulletSoftBody
WANTLIB += LinearMath GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender c enet execinfo freetype intl m mbedtls mbedcrypto
WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio steam_api theora
WANTLIB += theoradec usbhid vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
+WANTLIB-tools = ${WANTLIB}
+
# C++14
COMPILER = base-clang ports-gcc
@@ -58,7 +66,6 @@ MODSCONS_FLAGS = CC="${CC}" \
custom_modules=${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam \
progress=no \
pulseaudio=no \
- target=release_debug \
verbose=yes \
warnings=extra \
werror=no
@@ -83,7 +90,8 @@ LIB_DEPENDS = archivers/zstd \
multimedia/libvpx \
net/enet \
security/polarssl
-RUN_DEPENDS = devel/desktop-file-utils
+
+RUN_DEPENDS-tools =devel/desktop-file-utils
DEBUG_PACKAGES = ${BUILD_PACKAGES}
NO_TEST = Yes
@@ -103,15 +111,21 @@ post-extract:
$
Re: [new] audio/shairport-sync an AirPlay audio player
Hi all, I've tried Aaron's port .. it works great. I've had to change the _shairport user id to 876 with the current ports tree, but other than that a very simple configuration file (setting the name and interface to listen on) produces a working setup for me. Thanks Aaron! Paul On Thu, Dec 09, 2021 at 07:41:29AM -0700, Aaron Bieber wrote: | Hi, | | Here is a port of shairport-sync. It lets one stream audio from iDevices | to OpenBSD. | | DESCR snip: | | Shairport Sync is an AirPlay audio player. It plays audio streamed from | iTunes, iOS, Apple TV and macOS devices and AirPlay sources such as Quicktime | Player and ForkedDaapd, among others. | | HOME: https://github.com/mikebrady/shairport-sync | | I have had this in WIP for some time and it has been working without a | hitch. | | Cluesticks? OK to import? | | Here is the diff for the user db: | | diff 43179bcb078bb95ad600e5d85321b77ec70deb07 /usr/ports | blob - 17cb166abe6601b51e206bb97d1ce009a2729eac | file + infrastructure/db/user.list | --- infrastructure/db/user.list | +++ infrastructure/db/user.list | @@ -380,3 +380,4 @@ id user group port | 869 _headscale _headscale net/headscale | 870 _unit_unit www/unit | 871 _gelatod _gelatodnet/gelatod | +872 _shairport _shairport audio/shairport-sync | -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-] http://www.weirdnet.nl/
Re: update net/rsync 3.2.4
Nam Nguyen: > 2. rsync.diff: > - --enable-md5-asm (from naddy@ to retain > checking whether to enable MD5 ASM optimizations... yes (x86_64)) Unfortunately, this breaks on !amd64: checking whether to enable MD5 ASM optimizations... unavailable configure.sh: error: The ASM optimizations are currently x86_64|amd64 only. Omit --enable-md5-asm to continue without it. So --enable-md5-asm can only be given on amd64. (The upstream logic if neither --enable nor --disable-md5-asm are given is to enable it on Linux and disable it elsewhere.) -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: Issue in fetching upstream package source
Thanks a lot, Stuart! It worked.
On Mon, Apr 25, 2022 at 1:33 PM Stuart Henderson
wrote:
> On 2022/04/25 21:31, Stuart Henderson wrote:
> > On 2022/04/25 13:30, Salil Wadnerkar wrote:
> > > Hi,
> > >
> > > I am facing issues in fetching upstream packages hosted on github for
> > > multiple new packages that I am trying to build,
> > >
> > > For example,
> > > https://github.com/easymodo/qimgv/archive/refs/tags/v1.0.2.tar.gz
> > > is hosted on the page:
> https://github.com/easymodo/qimgv/releases/tag/v1.0.2
> >
> > See the examples and description for the GH_xxx variables
> > in /usr/ports/infrastructure/templates/Makefile.template
> >
> > > My Makefile is:
> > >
> > > MASTER_SITES=https://github.com/easymodo/qimgv/archive/refs/tags/
> > > VERSION=1.0.2
> > > DISTNAME=v${VERSION}
> > >
> > > My understanding is this should fetch the tar.gz, but `make fetch`
> fails
> > > with this error:
> > >
> > > $ make fetch
> > > ===> Checking files for qimgv-1.0.2
> > > >> No size recorded for v1.0.2.tar.gz
> > > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3205
> > > '/usr/ports/distfiles/v1.0.2.tar.gz': @lock=v1.0.2.tar.gz.dist; doas -u
> > > _pbu...)
> > > *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2481
> > > '_internal-fetch': @cd /usr/ports/mystuff/graphics/qimgv &&
> > > PKGPATH=graphics...)
> > > *** Error 2 in /usr/ports/mystuff/graphics/qimgv
> > > (/usr/ports/infrastructure/mk/bsd.port.mk:2607 'fetch':
> @lock=qimgv-1.0.2;
> > > export _LOCKS_H...)
>
> Also "make fetch" checks the downloaded files against recorded size/hash
> in distinfo. If you don't already have the files listed there (as is the
> case
> in a new port or an update), "make makesum" instead.
>
> > >
> > > Can someone show me what I am doing wrong?
> > >
> > > Thanks,
> > > Salil
> >
>
Re: games/godot: split the editor in a subpackage
On 2022/04/25 22:11, Omar Polo wrote:
> PKGNAME =godot-${V}
> -REVISION = 0
> +REVISION-main = 1
right
> Index: pkg/DESCR-editor
> ===
> RCS file: pkg/DESCR-editor
> diff -N pkg/DESCR-editor
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/DESCR-editor 19 Apr 2022 10:25:53 -
> @@ -0,0 +1,3 @@
> +Godot is an advanced, feature-packed, multi-platform 2D and 3D open source
> +game engine. It provides a huge set of common tools, so you can just focus
> +on making your game without reinventing the wheel.
> Index: pkg/DESCR-main
> ===
> RCS file: pkg/DESCR-main
> diff -N pkg/DESCR-main
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/DESCR-main27 Apr 2018 07:32:53 -
> @@ -0,0 +1,3 @@
> +Godot is an advanced, feature-packed, multi-platform 2D and 3D open source
> +game engine. It provides a huge set of common tools, so you can just focus
> +on making your game without reinventing the wheel.
The two DESCRs are the same; better to distinguish them
> RCS file: pkg/PLIST-editor
> diff -N pkg/PLIST-editor
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/PLIST-editor 19 Apr 2022 10:22:56 -
> @@ -0,0 +1,9 @@
needs an @conflict on the old version
> +@bin bin/godot-editor
> +@man man/man6/godot.6
manual should go in -main shouldn't it?
> +share/applications/org.godotengine.Godot.desktop
> +share/doc/pkg-readmes/${PKGSTEM}
should the readme also go in -main? how about the other files?
> +share/metainfo/
> +share/metainfo/org.godotengine.Godot.appdata.xml
> +share/pixmaps/
> +share/pixmaps/godot.svg
> +@tag update-desktop-database
> Index: pkg/PLIST-main
> ===
> RCS file: pkg/PLIST-main
> diff -N pkg/PLIST-main
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/PLIST-main19 Apr 2022 10:22:55 -
> @@ -0,0 +1 @@
> +@bin bin/godot
needs @pkgpath games/godot
Re: HEADS-UP: devel/cmake update - needs bulk tests
First victim was x11/qt6/qtbase
ld: error: undefined symbol: backtrace
It's just a typo:
> diff --git a/x11/qt6/qtbase/Makefile b/x11/qt6/qtbase/Makefile
> index decd207f5d0..15fc859c01f 100644
> --- a/x11/qt6/qtbase/Makefile
> +++ b/x11/qt6/qtbase/Makefile
> @@ -105,7 +105,7 @@ CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX=${PREFIX} \
> -DQT_FEATURE_openssl_linked=ON \
> -DQT_FEATURE_dtls=OFF
>
> -LDFLAGS += -lexecinfo
> +MOCMAKE_LDFLAGS += -lexecinfo
^
missing D in MODCMAKE_LDFLAGS
[maintainer update] nnn 4.4 -> 4.5
This patch updates nnn from 4.4 to 4.5.
Tested on two amd64 systems.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile11 Mar 2022 19:57:43 - 1.19
+++ Makefile26 Apr 2022 13:16:44 -
@@ -1,6 +1,6 @@
COMMENT = the missing terminal file browser for X
-V =4.4
+V =4.5
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
Index: distinfo
===
RCS file: /cvs/ports/sysutils/nnn/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo25 Nov 2021 18:52:55 - 1.15
+++ distinfo26 Apr 2022 13:16:44 -
@@ -1,2 +1,2 @@
-SHA256 (nnn-v4.4.tar.gz) = 4Eo/Dwwq8eGMtvAF0YJnx3A2RCdNIbuT8Dsw5P09FlM=
-SIZE (nnn-v4.4.tar.gz) = 239005
+SHA256 (nnn-v4.5.tar.gz) = +twVvW1EAMBuXMxHhFtC5gd082hXDkdb2IJ2fuGHSao=
+SIZE (nnn-v4.5.tar.gz) = 242191
Index: patches/patch-src_nnn_c
===
RCS file: patches/patch-src_nnn_c
diff -N patches/patch-src_nnn_c
--- patches/patch-src_nnn_c 11 Mar 2022 19:57:43 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-Cherry pick patch to make file renames more reliable.
-https://patch-diff.githubusercontent.com/raw/jarun/nnn/pull/1243.diff
-
-Index: src/nnn.c
src/nnn.c.orig
-+++ src/nnn.c
-@@ -2729,12 +2729,7 @@ static void archive_selection(const char *cmd, const c
- }
-
- snprintf(buf, CMD_LEN_MAX,
--#ifdef __linux__
- SED" -ze 's|^%s/||' '%s' | xargs -0 %s %s", curpath, selpath,
cmd, archive
--#else
-- "tr '\\0' '\n' < '%s' | "SED" -e 's|^%s/||' | tr '\n' '\\0' |
xargs -0 %s %s",
-- selpath, curpath, cmd, archive
--#endif
- );
- spawn(utils[UTIL_SH_EXEC], buf, NULL, NULL, F_CLI | F_CONFIRM);
- free(buf);
Re: update net/rsync 3.2.4
On 2022/04/25 20:41, Nam Nguyen wrote:
> - install rrsync(1) man page. If --with-rrsync is used to build and
> install the man page, it introduces python3 as a dependency to run
> ${WRKSRC}/md-convert script. Drawback: rrsync(1) prints 3.2.4pre4
a build-only dependency on python is not a problem.
> - rsyncd.conf patch: add missing ${PREFIX}/bin and remove ${SYSCONFDIR}
> bits
> - rrsync patch: churn and moves from perl to python3
>
> I plan to do the following soon (these don't have to hold up the
> update):
> - add zstd flavor
Perhaps this could be the other way round; standard flavour having the
usual dependencies as found on other OS (xhash, zstd, lz4) and a -light
flavour without deps. It only helps mirror operators if people are
actually using the flavour which has lower-CPU compression.
Maybe whoever it was that complained last time (commit log doesn't
say who and I can't remember) would like to comment?
Anyway yes this doesn't need to hold up the update.
> - Keep bundled zlib as is. tj@ and I wanted to move to system zlib in
> the hopes it would be updated faster. espie@ said rsync has a good
> security track record.
libraries in base getting updated faster, that's a funny joke
