Re: oolite: fix -fno-common
Hi
I don't have any OpenBSD machines capable of running this now so there
is not much point in me staying as maintainer.
Thanks
Index: Makefile
===
RCS file: /cvs/ports/games/oolite/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile20 Oct 2019 08:02:59 - 1.22
+++ Makefile7 Mar 2021 07:46:55 -
@@ -10,8 +10,6 @@ CATEGORIES= games
HOMEPAGE= http://www.oolite.org/
-MAINTAINER=Nicholas Marriott
-
# GPLv2
PERMIT_PACKAGE=Yes
On Sat, Mar 06, 2021 at 11:34:28AM -0800, Greg Steuck wrote:
> Thanks Martin!
>
> Martin Vahlensieck writes:
>
> > Rather mechanical fix for -fno-common. Builds and starts, but I don't
> > know how to play it, so can't judge if that works.
>
> Makefile needs this little bit too:
>
> @@ -33,6 +33,7 @@ ALL_TARGET= release
>
> FIX_CRLF_FILES = GNUmakefile.postamble \
> Makefile \
> + src/Cocoa/JoystickHandler.h \
> src/Core/Debug/OODebugTCPConsoleClient.m \
> src/Core/Materials/OOPNGTextureLoader.m \
> src/Core/OOAsyncQueue.m \
>
> Nicholas, WDYT? OK gnezdo@ if you want to use it :)
>
> >
> > Best,
> >
> > Martin
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/oolite/Makefile,v
> > retrieving revision 1.24
> > diff -u -p -r1.24 Makefile
> > --- Makefile26 Feb 2021 18:20:33 - 1.24
> > +++ Makefile6 Mar 2021 18:01:30 -
> > @@ -3,7 +3,7 @@
> > COMMENT= space combat and trading game in the style of Elite
> >
> > VERSION= 1.73.4
> > -REVISION = 16
> > +REVISION = 17
> > DISTNAME= oolite-dev-source-${VERSION}
> > PKGNAME= oolite-${VERSION}
> > CATEGORIES=games
> > Index: patches/patch-src_Cocoa_JoystickHandler.h
> > ===
> > RCS file: patches/patch-src_Cocoa_JoystickHandler.h
> > diff -N patches/patch-src_Cocoa_JoystickHandler.h
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_Cocoa_JoystickHandler.h 6 Mar 2021 18:01:30
> > -
> > @@ -0,0 +1,21 @@
> > +$OpenBSD$
> > +--- src/Cocoa/JoystickHandler.hSat Mar 6 18:11:04 2021
> > src/Cocoa/JoystickHandler.hSat Mar 6 18:20:16 2021
> > +@@ -66,7 +66,7 @@
> > + AXIS_VIEWX,
> > + AXIS_VIEWY,
> > + AXIS_end
> > +-} axfn;
> > ++};
> > +
> > + // Controls that can be a button
> > + enum {
> > +@@ -102,7 +102,7 @@
> > + BUTTON_VIEWPORT,
> > + BUTTON_VIEWSTARBOARD,
> > + BUTTON_end
> > +-} butfn;
> > ++};
> > +
> > + // Stick constants
> > + #define MAX_STICKS 4
> > Index: patches/patch-src_Core_Entities_PlanetEntity_h
> > ===
> > RCS file:
> > /cvs/ports/games/oolite/patches/patch-src_Core_Entities_PlanetEntity_h,v
> > retrieving revision 1.1
> > diff -u -p -r1.1 patch-src_Core_Entities_PlanetEntity_h
> > --- patches/patch-src_Core_Entities_PlanetEntity_h 22 Oct 2013 16:52:09
> > - 1.1
> > +++ patches/patch-src_Core_Entities_PlanetEntity_h 6 Mar 2021 18:01:30
> > -
> > @@ -6,9 +6,9 @@ $OpenBSD: patch-src_Core_Entities_Planet
> > } VertexData;
> >
> > +// straight c
> > -+doublecorona_speed_factor;// multiply delta_t by this
> > before adding it to corona_stage
> > -+doublecorona_stage; // 0.0 -> 1.0
> > -+GLfloat rvalue[729];// stores random values
> > for adjusting colors in the corona
> > ++extern double corona_speed_factor;// multiply delta_t by
> > this before adding it to corona_stage
> > ++extern double corona_stage; // 0.0 -> 1.0
> > ++extern GLfloatrvalue[729];// stores
> > random values for adjusting colors in the corona
> > +
> > +
> > @interface PlanetEntity: OOSelfDrawingEntity
> > Index: patches/patch-src_Core_Entities_PlanetEntity_m
> > ===
> > RCS file: patches/patch-src_Core_Entities_PlanetEntity_m
> > diff -N patches/patch-src_Core_Entities_PlanetEntity_m
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_Core_Entities_PlanetEntity_m 6 Mar 2021 18:01:30
> > -
> > @@ -0,0 +1,14 @@
> > +$OpenBSD$
> > +--- src/Core/Entities/PlanetEntity.m Sat Mar 6 18:11:04 2021
> > src/Core/Entities/PlanetEntity.m Sat Mar 6 18:34:07 2021
> > +@@ -44,6 +44,10 @@
> > + #define LIM8K 8000.0*8000.0 *
> > NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
> > + #define LIM16K 16000.0*16000.0 *
> > NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
> > +
> > ++// -fno-common
> > ++double corona_speed_factor;
> > ++double corona_stage;
> > ++GLfloat rvalue[729];
> > +
> > + // straight c
> > + static Vector base_vertex_array[10400];
> >
Re: switch handbrake to python3
On Saturday, March 6th, 2021 at 8:43 PM, Daniel Dickman wrote: > The release notes say handbrake moved to python3 with release 1.3. > > I was able to build and run handbrake on amd64. > > ok? ok, thanks. ~Brian
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/03/06 23:13:45 Modified files: multimedia/mkvtoolnix: Makefile distinfo Log message: Update mkvtoolnix to 55.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/03/06 22:06:35 Modified files: x11: Makefile Log message: Link adwaita-qt and lightly
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/03/06 22:02:39 Log message: Import adwaita-qt-1.2.0 Comment: GNOME Shell style for Qt applications Description: A native style to bend Qt5 applications to look like they belong into GNOME Shell. Maintainer: The OpenBSD ports mailing-list WWW: https://github.com/FedoraQt/adwaita-qt Tweaks and OK zhuk@ Status: Vendor Tag: rsadowski Release Tags: rsadowski_20210307 N ports/x11/adwaita-qt/Makefile N ports/x11/adwaita-qt/distinfo N ports/x11/adwaita-qt/pkg/DESCR N ports/x11/adwaita-qt/pkg/PLIST N ports/x11/adwaita-qt/patches/patch-src_style_CMakeLists_txt No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/03/06 22:01:28 Log message: Import lightly-0.4.1 Comment: modern style for Qt applications Description: Lightly is a fork of breeze theme style that aims to be visually modern and minimalistic. Maintainer: Rafael Sadowski WWW: https://github.com/Luwx/Lightly Tweaks and OK zhuk@ Status: Vendor Tag: rsadowski Release Tags: rsadowski_20210307 N ports/x11/lightly/Makefile N ports/x11/lightly/distinfo N ports/x11/lightly/pkg/DESCR N ports/x11/lightly/pkg/PLIST No conflicts created by this import
Re: NEW: x11/kde-plasma/oxygen
On Sat Mar 06, 2021 at 11:16:01PM +0300, Vadim Zhukov wrote: > сб, 6 мар. 2021 г. в 09:53, Rafael Sadowski : > > > > The good old oxygen theme is back. Please find attached the mew port as > > tarball. I see no port with the same name in quirks. > > > > OK? > > This port conflicts with oxygen-icons. I've tweaked it by simply > removing duplicated stuff, this looks like enough. I'll commit this > version unless you have any objections/tweaks. > Perfect but please remove "gtk-update-icon-cache" and MODKDE5_ICON_CACHE in both Makefile and PLIST. Thanks, OK rsadowski
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/03/06 19:30:46 Modified files: multimedia/handbrake: Makefile Log message: switch handbrake to python3 ok bcallah@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/03/06 19:25:06 Modified files: converters/opencc: Makefile Log message: switch opencc to python3 ok bentley@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2021/03/06 19:22:10 Modified files: comms/sigrok/sigrok-cli: Makefile distinfo Log message: Update to sigrok-cli-0.7.2.
switch handbrake to python3
The release notes say handbrake moved to python3 with release 1.3.
I was able to build and run handbrake on amd64.
ok?
Index: Makefile
===
RCS file: /cvs/ports/multimedia/handbrake/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- Makefile23 Feb 2021 19:39:30 - 1.10
+++ Makefile7 Mar 2021 01:39:38 -
@@ -4,6 +4,7 @@ V = 1.3.3
COMMENT = open source video transcoder
DISTNAME = HandBrake-${V}-source
PKGNAME = handbrake-${V}
+REVISION = 0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = multimedia x11
@@ -32,7 +33,6 @@ MASTER_SITES =https://github.com/HandBr
COMPILER = base-clang ports-gcc
MODULES = lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
MODPY_RUNDEP = No
BUILD_DEPENDS =devel/autoconf/${AUTOCONF_VERSION} \
Re: oolite: fix -fno-common
Martin Vahlensieck: > Rather mechanical fix for -fno-common. This would be a great opportunity to update the port to the latest release 1.90 instead of letting the obsolete version sit there. > Builds and starts, but I don't > know how to play it, so can't judge if that works. Yes, that's a problem. -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/03/06 18:28:21 Modified files: games/colobot : Makefile.inc games/colobot/colobot: Makefile distinfo games/colobot/colobot/patches: patch-CMakeLists_txt patch-src_common_system_system_cpp games/colobot/colobot/pkg: PLIST games/colobot/data: Makefile distinfo games/colobot/data/pkg: PLIST games/colobot/music: distinfo Log message: update colobot to 0.12.0 and switch to python3 ok bentley@
switch opencc to python3
According to NEWS.md, opencc has supported python3 since v1.0.4.
ok?
Index: Makefile
===
RCS file: /cvs/ports/converters/opencc/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- Makefile23 Feb 2021 19:39:11 - 1.6
+++ Makefile7 Mar 2021 00:57:39 -
@@ -4,6 +4,7 @@ COMMENT = convert between traditional an
V =1.1.1
DISTNAME = opencc-$V
+REVISION = 0
GH_ACCOUNT = BYVoid
GH_PROJECT = OpenCC
@@ -25,7 +26,7 @@ WANTLIB += ${COMPILER_LIBCXX} c m
COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
+
MODPY_RUNDEP = No
WRKDIST = ${WRKDIR}/OpenCC-ver.$V
[sparc64] Fix build of net/sniproxy
sniproxy uses "-Wpedantic" which base-gcc doesn't understand. This patch removes that option and fixes the build on sparc64. ok? (cc maintainer) --Kurt Index: patches/patch-src_Makefile_am === RCS file: patches/patch-src_Makefile_am diff -N patches/patch-src_Makefile_am --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_Makefile_am 7 Mar 2021 00:32:51 - @@ -0,0 +1,12 @@ +$OpenBSD$ + +Index: src/Makefile.am +--- src/Makefile.am.orig src/Makefile.am +@@ -1,5 +1,5 @@ + AM_CPPFLAGS = $(LIBEV_CFLAGS) $(LIBPCRE_CFLAGS) $(LIBUDNS_CFLAGS) +-AM_CFLAGS = -fno-strict-aliasing -Wall -Wextra -Wpedantic -Wwrite-strings ++AM_CFLAGS = -fno-strict-aliasing -Wall -Wextra -Wwrite-strings + + sbin_PROGRAMS = sniproxy +
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2021/03/06 17:44:07 Modified files: www/gitea : Makefile distinfo Log message: Update gitea 1.13.2 -> 1.13.3 Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.13.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2021/03/06 16:08:16 Modified files: net/oicb : Makefile distinfo Log message: Update oicb to 1.3.0, featuring UTF-8 support.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/03/06 16:04:27 Modified files: lang/seed7 : Makefile distinfo lang/seed7/patches: patch-src_makefile lang/seed7/pkg : PLIST Log message: Update to seed7-20210130
Re: ghc 8.10.3 updates
Greg Steuck writes: > Hi Matthias, > > Once the other 3 cleanup patches are applied we can proceed with this > update which will take us to ghc-8.10.3. I'm double-checking that all > Haskell ports still work on amd64, but it seems like a fairly limited > affar. We should be able to finish in the next week if all goes well. Turns out a darcs regen is needed too: >From 4afd125d659b56f52244076d40ea160fa75202c7 Mon Sep 17 00:00:00 2001 From: Greg Steuck Date: Sat, 6 Mar 2021 14:14:21 -0800 Subject: [PATCH] Regen devel/darcs manifest with ghc-8.10.3 --- devel/darcs/Makefile | 11 ++- devel/darcs/distinfo | 16 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile index c4265e2467d..c9feafcbb54 100644 --- a/devel/darcs/Makefile +++ b/devel/darcs/Makefile @@ -4,6 +4,7 @@ COMMENT = advanced revision control system written in Haskell MODCABAL_STEM =darcs MODCABAL_VERSION = 2.16.3 +REVISION = 0 CATEGORIES = devel HOMEPAGE = http://www.darcs.net/ @@ -19,7 +20,7 @@ MODCABAL_MANIFEST = \ asn1-types 0.3.4 0 \ assoc 1.0.2 1 \ async 2.2.3 0 \ - attoparsec 0.13.2.50 \ + attoparsec 0.13.2.51 \ base-compat 0.11.2 0 \ base-compat-batteries 0.11.2 0 \ base-orphans0.8.4 0 \ @@ -31,7 +32,7 @@ MODCABAL_MANIFEST = \ case-insensitive1.2.1.0 0 \ cereal 0.5.8.1 0 \ comonad 5.0.8 0 \ - conduit 1.3.4 0 \ + conduit 1.3.4.1 0 \ conduit-extra 1.3.5 0 \ connection 0.3.1 1 \ constraints 0.120 \ @@ -43,7 +44,6 @@ MODCABAL_MANIFEST = \ digest 0.0.1.2 0 \ distributive0.6.2.1 0 \ dlist 1.0 0 \ - exceptions 0.10.4 1 \ fgl 5.7.0.3 0 \ filtrable 0.1.6.0 0 \ hashable1.3.1.0 0 \ @@ -75,7 +75,7 @@ MODCABAL_MANIFEST = \ scientific 0.3.6.2 0 \ semigroups 0.19.1 0 \ socks 0.6.1 0 \ - split 0.2.3.4 0 \ + split 0.2.3.4 1 \ splitmix0.1.0.3 0 \ streaming-commons 0.2.2.1 0 \ strict 0.4.0.1 0 \ @@ -102,7 +102,8 @@ MODCABAL_MANIFEST = \ x509-system 1.6.6 0 \ x509-validation 1.6.11 0 \ zip-archive 0.4.1 1 \ - zlib0.6.2.2 0 \ + zlib0.6.2.3 0 \ + LIB_DEPENDS = converters/libiconv \ devel/gmp \ diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo index 6dc565fae06..ccfdcc3d61c 100644 --- a/devel/darcs/distinfo +++ b/devel/darcs/distinfo @@ -7,6 +7,7 @@ SHA256 (hackage/assoc-1.0.2.tar.gz) = 2JiNxuhxjHo0VlFbdpyTNq7uxzDPhvxRdSR5af+PFE SHA256 (hackage/assoc-1.0.2_1.cabal) = qCTk9hVGmietlJ2/SQe6JYvWtFne6+wAUkx7yz9lzJ8= SHA256 (hackage/async-2.2.3.tar.gz) = RnrzoAN5R6UjLs9fTvvUzyEYqqIxBWbX9ArIKw4yk1w= SHA256 (hackage/attoparsec-0.13.2.5.tar.gz) = IeDzjqoZV79HEnavoXZRwSWjiSRXXxLCy9L6U0tFaG8= +SHA256 (hackage/attoparsec-0.13.2.5_1.cabal) = fIgZXD8yQ8ar41bBvIcs9AgYqMew4mGo+OaGj+QoGaA= SHA256 (hackage/base-compat-0.11.2.tar.gz) = U6a1FFRC+6WkutbbK83t4X8WRkK0i8OblQFUIqOa29s= SHA256 (hackage/base-compat-batteries-0.11.2.tar.gz) = MeBmpaqWr5T+ZGWtuVnDjWOkngE1dkGqQyLHVKlNMCM= SHA256 (hackage/base-orphans-0.8.4.tar.gz) = N7K1k1bANACi1QmGJnc5PF/3BqCqv4JsEE9v4D2Tu7M= @@ -19,7 +20,7 @@ SHA256 (hackage/blaze-builder-0.4.2.1.tar.gz) = bmiJvJw/+SBioX84JdzBsoUQ0mEzTU1O SHA256 (hackage/case-insensitive-1.2.1.0.tar.gz) = KW3BfgxfPfs9gs7YPkycRMM47N50myeLbq5RLx0E5AY= SHA256 (hackage/cereal-0.5.8.1.tar.gz) = LZ6IrJNLnrwFgJfHIBH/WfPxRhdjEOHJV6Dkz2NoG9c= SHA256 (hackage/comonad-5.0.8.tar.gz) = 72zfLMKSzEPuaqlsWBsjX96oq0Sgv/sk3HmuKy7zPRM= -SHA256 (hackage/conduit-1.3.4.tar.gz) = nwKDGq3qJEicHRggAY7a3W2XAA4R810F2hP6jCFkYPA= +SHA256 (hackage/conduit-1.3.4.1.tar.gz) = hXQ7jV8tV3nMt0WbWpGcV4ZwevI/56Bl0oHujm3CJvE= SHA256 (hackage/conduit-extra-1.3.5.tar.gz) = imSN7iA8AeZH+jhr/npbKTzlUvi1yrnA3Vy3HHzQEtk= SHA256 (hackage/connection-0.3.1.tar.gz) = XXWVicUyw02Hv8T2/Lcyv1W1WpNVnTuUIp6DR6FTddk= SHA256 (hackage/connection-0.3.1_1.cabal) = ZdocBVYQCVczvNIo2F3/gIBLI6XRj+3plKD5/NGwwSE= @@ -33,8 +34,6 @@ SHA256 (hackage/data-ordlist-0.4.7.0.tar.gz) = b2weepqRVa14ynjLmr1vfi4ceLPlSbF53 SHA256 (hackage/digest-0.0.1.2.tar.gz) = ZBcX6xY5Kr+JZZhqno3CHuvx2Xd1u7aSPHt/j+4X/hE= SHA256 (hackage/distributive-0.6.2.1.tar.gz) = 1zUTkuB49YyqRmMKS5xkPh4und3uRYSMXINY57Exa5E= SHA256 (hackage/dlist-1.0.tar.gz) = Fz1jcyi7Fz/MNl8w0p/0qUKSoeDlVYrrPfwR3oFRARU= -SHA256 (hackage/exceptions-0.10.4.tar.gz) =
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2021/03/06 15:42:43 Modified files: comms/sigrok/libsigrok: Makefile Log message: libsigrok picks up hidapi if present, so add LIB_DEPENDS. Fixes sigrok-cli build failure (reported by naddy@)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/03/06 15:24:27 Modified files: games/freedroidrpg: Makefile Log message: switch freedroidrpg to python3
games/colobot - update and switch to python3
Diff below switches to python3 and while here updates to latest version of
the game.
I was able to start the game up and play for a few minutes without any
issues on amd64.
ok?
Index: Makefile.inc
===
RCS file: /cvs/ports/games/colobot/Makefile.inc,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile.inc
--- Makefile.inc13 Jul 2019 10:59:26 - 1.2
+++ Makefile.inc6 Mar 2021 21:04:04 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.2 2019/07/13 10:59:26 sthen Exp $
-V ?= 0.1.11.1
+V ?= 0.1.12
CATEGORIES ?= games
Index: colobot/Makefile
===
RCS file: /cvs/ports/games/colobot/colobot/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- colobot/Makefile20 May 2019 22:15:09 - 1.3
+++ colobot/Makefile6 Mar 2021 21:04:04 -
@@ -3,7 +3,6 @@
COMMENT = programming-focused real-time strategy game
DISTNAME = colobot-$V
-REVISION = 1
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += GL GLEW GLU SDL2 SDL2_image SDL2_ttf boost_filesystem-mt
Index: colobot/distinfo
===
RCS file: /cvs/ports/games/colobot/colobot/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- colobot/distinfo25 Sep 2018 08:53:04 - 1.1.1.1
+++ colobot/distinfo6 Mar 2021 21:04:04 -
@@ -1,2 +1,2 @@
-SHA256 (colobot-0.1.11.1.tar.gz) = jle4TxCc6Rzy0xHDh3L5Ieyxozb/r96nhFXlrFgkzkA=
-SIZE (colobot-0.1.11.1.tar.gz) = 1451861
+SHA256 (colobot-0.1.12.tar.gz) = OOAab7jGcCA7huehAMee1KtKmk3MAf0mpqV/QPoai1w=
+SIZE (colobot-0.1.12.tar.gz) = 1468594
Index: colobot/patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/games/colobot/colobot/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-CMakeLists_txt
--- colobot/patches/patch-CMakeLists_txt25 Sep 2018 08:53:04 -
1.1.1.1
+++ colobot/patches/patch-CMakeLists_txt6 Mar 2021 21:04:04 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -132,14 +132,13 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+@@ -135,14 +135,13 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
message(STATUS "Detected GCC version 4.7+")
@@ -18,7 +18,7 @@ Index: CMakeLists.txt
set(DEBUG_CXX_FLAGS "-g -O0")
set(TEST_CXX_FLAGS "-pthread")
add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE)
-@@ -150,9 +149,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+@@ -153,9 +152,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message(STATUS "Detected Clang version 3.1+")
Index: colobot/patches/patch-src_common_system_system_cpp
===
RCS file:
/cvs/ports/games/colobot/colobot/patches/patch-src_common_system_system_cpp,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-src_common_system_system_cpp
--- colobot/patches/patch-src_common_system_system_cpp 25 Sep 2018 08:53:04
- 1.1.1.1
+++ colobot/patches/patch-src_common_system_system_cpp 6 Mar 2021 21:04:04
-
@@ -5,11 +5,11 @@ Pull XDG directory code from system_linu
Index: src/common/system/system.cpp
--- src/common/system/system.cpp.orig
+++ src/common/system/system.cpp
-@@ -190,5 +190,26 @@ std::string CSystemUtils::GetLangPath()
+@@ -188,5 +188,26 @@ std::string CSystemUtils::GetLangPath()
std::string CSystemUtils::GetSaveDir()
{
--return std::string("saves");
+-return "./saves";
+std::string savegameDir;
+
+// Determine savegame dir according to XDG Base Directory Specification
Index: colobot/pkg/PLIST
===
RCS file: /cvs/ports/games/colobot/colobot/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- colobot/pkg/PLIST 25 Sep 2018 08:53:04 - 1.1.1.1
+++ colobot/pkg/PLIST 6 Mar 2021 21:04:04 -
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/09/25 08:53:04 bentley Exp $
@bin bin/colobot
lib/colobot/
-lib/colobot/libCBot.so
+@so lib/colobot/libCBot.so
share/colobot/shaders/
share/colobot/shaders/gl21/
share/colobot/shaders/gl21/fs_interface.glsl
@@ -21,4 +21,5 @@ share/locale/cs/LC_MESSAGES/colobot.mo
share/locale/de/LC_MESSAGES/colobot.mo
share/locale/fr/LC_MESSAGES/colobot.mo
share/locale/pl/LC_MESSAGES/colobot.mo
+share/locale/pt/LC_MESSAGES/colobot.mo
share/locale/ru/LC_MESSAGES/colobot.mo
Index: data/Makefile
===
RCS file: /cvs/ports/games/colobot/data/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- data/Makefile 23 Feb 2021 19:39:22 - 1.2
+++
Re: NEW: devel/git-annex
Greg Steuck writes:
>> I'm happy to prepare an 8.10-compatible version now if that would help
>> with the upgrade to 8.10.
>
> Thanks, that wouldn't hurt :)
I gave it a whirl, what do you think:
>From 3035c41344d31ef466004071acde2d0eddd3a2dc Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Sat, 6 Mar 2021 12:14:37 -0800
Subject: [PATCH] Regen git-annex manifest with ghc-8.10.3
---
devel/git-annex/Makefile | 12 ++--
devel/git-annex/distinfo | 22 ++
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/devel/git-annex/Makefile b/devel/git-annex/Makefile
index 147f796293e..89b1021dbb0 100644
--- a/devel/git-annex/Makefile
+++ b/devel/git-annex/Makefile
@@ -25,6 +25,7 @@ MAKE_ENV =LC_ALL=en_US.UTF-8
MODCABAL_STEM =git-annex
MODCABAL_VERSION = 8.20210223
+REVISION = 0
MAN1_STAGING_DIR = ${WRKBUILD}/man1_staging
@@ -69,7 +70,7 @@ MODCABAL_MANIFEST = \
asn1-types 0.3.4 0 \
assoc 1.0.2 1 \
async 2.2.3 0 \
- attoparsec 0.13.2.50 \
+ attoparsec 0.13.2.51 \
attoparsec-iso8601 1.0.2.0 0 \
auto-update 0.1.6 0 \
aws 0.220 \
@@ -84,7 +85,7 @@ MODCABAL_MANIFEST = \
binary-orphans 1.0.1 5 \
blaze-builder 0.4.2.1 0 \
blaze-html 0.9.1.2 0 \
- blaze-markup0.8.2.7 0 \
+ blaze-markup0.8.2.8 0 \
bloomfilter 2.0.1.0 0 \
bsb-http-chunked0.0.0.4 3 \
byteable0.1.1 0 \
@@ -92,7 +93,7 @@ MODCABAL_MANIFEST = \
cabal-doctest 1.0.8 2 \
call-stack 0.3.0 0 \
case-insensitive1.2.1.0 0 \
- cassava 0.5.2.0 2 \
+ cassava 0.5.2.0 3 \
cereal 0.5.8.1 0 \
cipher-aes 0.2.11 0 \
clientsession 0.9.1.2 0 \
@@ -101,7 +102,7 @@ MODCABAL_MANIFEST = \
colour 2.3.5 0 \
comonad 5.0.8 0 \
concurrent-output 1.10.12 0 \
- conduit 1.3.4 0 \
+ conduit 1.3.4.1 0 \
conduit-extra 1.3.5 0 \
connection 0.3.1 1 \
contravariant 1.5.3 0 \
@@ -131,7 +132,6 @@ MODCABAL_MANIFEST = \
edit-distance 0.2.2.1 1 \
email-validate 2.3.2.130 \
entropy 0.4.1.6 0 \
- exceptions 0.10.4 1 \
fast-logger 3.0.3 0 \
feed1.3.0.1 1 \
file-embed 0.0.13.00 \
@@ -270,7 +270,7 @@ MODCABAL_MANIFEST = \
x509-store 1.6.7 1 \
x509-system 1.6.6 0 \
x509-validation 1.6.11 0 \
- xml-conduit 1.9.0.0 0 \
+ xml-conduit 1.9.1.0 0 \
xml-hamlet 0.5.0.1 0 \
xml-types 0.3.8 0 \
xss-sanitize0.3.6 0 \
diff --git a/devel/git-annex/distinfo b/devel/git-annex/distinfo
index c07d912009f..04b664f08b6 100644
--- a/devel/git-annex/distinfo
+++ b/devel/git-annex/distinfo
@@ -26,6 +26,7 @@ SHA256 (hackage/assoc-1.0.2.tar.gz) =
2JiNxuhxjHo0VlFbdpyTNq7uxzDPhvxRdSR5af+PFE
SHA256 (hackage/assoc-1.0.2_1.cabal) =
qCTk9hVGmietlJ2/SQe6JYvWtFne6+wAUkx7yz9lzJ8=
SHA256 (hackage/async-2.2.3.tar.gz) =
RnrzoAN5R6UjLs9fTvvUzyEYqqIxBWbX9ArIKw4yk1w=
SHA256 (hackage/attoparsec-0.13.2.5.tar.gz) =
IeDzjqoZV79HEnavoXZRwSWjiSRXXxLCy9L6U0tFaG8=
+SHA256 (hackage/attoparsec-0.13.2.5_1.cabal) =
fIgZXD8yQ8ar41bBvIcs9AgYqMew4mGo+OaGj+QoGaA=
SHA256 (hackage/attoparsec-iso8601-1.0.2.0.tar.gz) =
ApUtd8eOlXEO6oVfTobKBIq5/ag8bAjdkhXyGkBgT5g=
SHA256 (hackage/auto-update-0.1.6.tar.gz) =
9OAj3IcTw4fs8g2FEkdZf9ASyr6jhyMQs16REQXrZsQ=
SHA256 (hackage/aws-0.22.tar.gz) = GS1GOX2oLbs0aielgzgIwdHNs5/Sz3jGp/rAeCtJbtA=
@@ -43,7 +44,7 @@ SHA256 (hackage/binary-orphans-1.0.1.tar.gz) =
QxrUC42BK62hhsaJNcCmmqKQTKO8V9lX4
SHA256 (hackage/binary-orphans-1.0.1_5.cabal) =
xsnT1IKzC1MrVkFLzDlYhySaMLEyWnhzspxl9/UZTcA=
SHA256 (hackage/blaze-builder-0.4.2.1.tar.gz) =
bmiJvJw/+SBioX84JdzBsoUQ0mEzTU1OF3Iy2QTqCwY=
SHA256 (hackage/blaze-html-0.9.1.2.tar.gz) =
YFA/QlRsbBuVQBTRiOoTfkPXTc/9K/YVfBE/2RoMOUw=
-SHA256 (hackage/blaze-markup-0.8.2.7.tar.gz) =
i2SJ7UItmOQ3L0G+H0D3crjU7ZJfMgOza+QHjZGMjuQ=
+SHA256 (hackage/blaze-markup-0.8.2.8.tar.gz) =
Q/w/aHLcjRvo0P4JG9R3UTm0IXmYfzPWSQp8Xx4Ho0k=
SHA256 (hackage/bloomfilter-2.0.1.0.tar.gz) =
bF4NNX1dOe/peuJ3bo+1M/pQwcBTl8e4UCCw8JiteQ8=
SHA256 (hackage/bsb-http-chunked-0.0.0.4.tar.gz) =
FIMJ4j64smHB3jdHEjctYtjI3I7lBMOSgJx+wzwKDnw=
SHA256 (hackage/bsb-http-chunked-0.0.0.4_3.cabal) =
rdUw5pXqMFi/T3FWocqFZT/zY1uH7G0b6MSJFkUZD5Y=
@@ -54,7 +55,7 @@ SHA256 (hackage/cabal-doctest-1.0.8_2.cabal) =
i9HWFPtl8NUmCdowv45exxpLat+P9WEO2
SHA256 (hackage/call-stack-0.3.0.tar.gz) =
Re: [UPDATE] devel/adb
It appears that the mailing list is not correctly showing whom I'm replying to. This is the one that I'm replying to. https://marc.info/?l=openbsd-ports=161000490809726=2 Sent with ProtonMail Secure Email. ‐‐‐ Original Message ‐‐‐ On Sunday, March 7, 2021 12:05 AM, Wind R wrote: > Running adbd as root seems to cause a kernel panic. > I have attached a picture of the ddb log. > > I am unable to use my keyboard after the kernel panic, > devices connected to the USB ports after the panic won't be powered > either. > > I am able to consistently reproduce it by using "doas adb devices". > My phone is attached to the machine when I execute the command. > Usually the kernel panic occurs almost immediately after, however > on one instance, it did not panic until a few seconds after. > > Sent with ProtonMail Secure Email.
Re: NEW: x11/lightly
сб, 6 мар. 2021 г. в 09:42, Rafael Sadowski : > > On Sun Feb 28, 2021 at 11:58:59AM +0100, Rafael Sadowski wrote: > > Please find attached lightly-0.4.1 tarball. This port depends on > > x11/kde-plasma/kdecoration, which has not yet been imported. You can > > find it on ports@. > > > > Information for inst:lightly-0.4.1 > > > > Comment: > > modern style for Qt applications > > > > Description: > > Lightly is a fork of breeze theme style that aims to be visually modern and > > minimalistic. > > > > Maintainer: Rafael Sadowski > > > > WWW: https://github.com/Luwx/Lightly > > > > x11/kde-plasma/kdecoration was imported recently, you can easy test > lightly now. okay zhuk@ after make update-plist -- WBR, Vadim Zhukov
Re: NEW: x11/adwaita-qt - GNOME Shell style for Qt applications
сб, 6 мар. 2021 г. в 09:42, Rafael Sadowski : > > On Sun Feb 28, 2021 at 09:55:09PM +0100, Rafael Sadowski wrote: > > Inspered by https://twitter.com/x61sh/status/1365980441065447424 > > > > Information for inst:adwaita-qt-1.2.0 > > > > Comment: > > GNOME Shell style for Qt applications > > > > Description: > > A native style to bend Qt5 applications to look like they belong into GNOME > > Shell. > > > > Maintainer: The OpenBSD ports mailing-list > > > > WWW: https://github.com/FedoraQt/adwaita-qt > > ping okay zhuk@ after running make update-plist -- WBR, Vadim Zhukov
Re: NEW: x11/kde-plasma/oxygen
сб, 6 мар. 2021 г. в 09:53, Rafael Sadowski : > > The good old oxygen theme is back. Please find attached the mew port as > tarball. I see no port with the same name in quirks. > > OK? This port conflicts with oxygen-icons. I've tweaked it by simply removing duplicated stuff, this looks like enough. I'll commit this version unless you have any objections/tweaks. -- WBR, Vadim Zhukov x11_kde-plasma_oxygen_port.tgz Description: application/compressed-tar
Re: oolite: fix -fno-common
Thanks Martin!
Martin Vahlensieck writes:
> Rather mechanical fix for -fno-common. Builds and starts, but I don't
> know how to play it, so can't judge if that works.
Makefile needs this little bit too:
@@ -33,6 +33,7 @@ ALL_TARGET= release
FIX_CRLF_FILES = GNUmakefile.postamble \
Makefile \
+ src/Cocoa/JoystickHandler.h \
src/Core/Debug/OODebugTCPConsoleClient.m \
src/Core/Materials/OOPNGTextureLoader.m \
src/Core/OOAsyncQueue.m \
Nicholas, WDYT? OK gnezdo@ if you want to use it :)
>
> Best,
>
> Martin
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/oolite/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 26 Feb 2021 18:20:33 - 1.24
> +++ Makefile 6 Mar 2021 18:01:30 -
> @@ -3,7 +3,7 @@
> COMMENT= space combat and trading game in the style of Elite
>
> VERSION= 1.73.4
> -REVISION = 16
> +REVISION = 17
> DISTNAME=oolite-dev-source-${VERSION}
> PKGNAME= oolite-${VERSION}
> CATEGORIES= games
> Index: patches/patch-src_Cocoa_JoystickHandler.h
> ===
> RCS file: patches/patch-src_Cocoa_JoystickHandler.h
> diff -N patches/patch-src_Cocoa_JoystickHandler.h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Cocoa_JoystickHandler.h 6 Mar 2021 18:01:30 -
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- src/Cocoa/JoystickHandler.h Sat Mar 6 18:11:04 2021
> src/Cocoa/JoystickHandler.h Sat Mar 6 18:20:16 2021
> +@@ -66,7 +66,7 @@
> + AXIS_VIEWX,
> + AXIS_VIEWY,
> + AXIS_end
> +-} axfn;
> ++};
> +
> + // Controls that can be a button
> + enum {
> +@@ -102,7 +102,7 @@
> + BUTTON_VIEWPORT,
> + BUTTON_VIEWSTARBOARD,
> + BUTTON_end
> +-} butfn;
> ++};
> +
> + // Stick constants
> + #define MAX_STICKS 4
> Index: patches/patch-src_Core_Entities_PlanetEntity_h
> ===
> RCS file:
> /cvs/ports/games/oolite/patches/patch-src_Core_Entities_PlanetEntity_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_Core_Entities_PlanetEntity_h
> --- patches/patch-src_Core_Entities_PlanetEntity_h22 Oct 2013 16:52:09
> - 1.1
> +++ patches/patch-src_Core_Entities_PlanetEntity_h6 Mar 2021 18:01:30
> -
> @@ -6,9 +6,9 @@ $OpenBSD: patch-src_Core_Entities_Planet
> } VertexData;
>
> +// straight c
> -+double corona_speed_factor;// multiply delta_t by this
> before adding it to corona_stage
> -+double corona_stage; // 0.0 -> 1.0
> -+GLfloat rvalue[729];// stores random values
> for adjusting colors in the corona
> ++extern double corona_speed_factor;// multiply delta_t by
> this before adding it to corona_stage
> ++extern double corona_stage; // 0.0 -> 1.0
> ++extern GLfloat rvalue[729];// stores
> random values for adjusting colors in the corona
> +
> +
> @interface PlanetEntity: OOSelfDrawingEntity
> Index: patches/patch-src_Core_Entities_PlanetEntity_m
> ===
> RCS file: patches/patch-src_Core_Entities_PlanetEntity_m
> diff -N patches/patch-src_Core_Entities_PlanetEntity_m
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Core_Entities_PlanetEntity_m6 Mar 2021 18:01:30
> -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +--- src/Core/Entities/PlanetEntity.m Sat Mar 6 18:11:04 2021
> src/Core/Entities/PlanetEntity.m Sat Mar 6 18:34:07 2021
> +@@ -44,6 +44,10 @@
> + #define LIM8K 8000.0*8000.0 *
> NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
> + #define LIM16K 16000.0*16000.0 *
> NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
> +
> ++// -fno-common
> ++double corona_speed_factor;
> ++double corona_stage;
> ++GLfloat rvalue[729];
> +
> + // straight c
> + static Vector base_vertex_array[10400];
> Index: patches/patch-src_Core_OOTrumble_h
> ===
> RCS file: patches/patch-src_Core_OOTrumble_h
> diff -N patches/patch-src_Core_OOTrumble_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Core_OOTrumble_h6 Mar 2021 18:01:30 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/Core/OOTrumble.h Sat Mar 6 18:11:04 2021
> src/Core/OOTrumble.h Sat Mar 6 18:30:37 2021
> +@@ -66,7 +66,7 @@
> + TRUMBLE_MOUTH_NORMAL
> + };
> +
> +-float trumbleAppetiteAccumulator;
> ++extern floattrumbleAppetiteAccumulator;
> +
> + @interface OOTrumble : NSObject
> + {
> Index: patches/patch-src_Core_OOTrumble_m
> ===
> RCS file: patches/patch-src_Core_OOTrumble_m
> diff -N patches/patch-src_Core_OOTrumble_m
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2021/03/06 12:31:56 Modified files: security/rhash : Makefile distinfo Removed files: security/rhash/patches: patch-librhash_byte_order_h Log message: Update to rhash-1.4.1 Changelog: https://github.com/rhash/RHash/blob/v1.4.1/ChangeLog
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2021/03/06 12:31:22 Modified files: archivers/zstd : Makefile distinfo archivers/zstd/patches: patch-lib_Makefile patch-programs_Makefile patch-tests_Makefile Log message: Update to zstd-1.4.9 Changelog: https://github.com/facebook/zstd/blob/v1.4.9/CHANGELOG Visibility of symbols in shared lib has been fixed resulting in check_sym reporting removal of several symbols. Bump shared lib accordingly. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2021/03/06 12:16:31 Added files: net/dino/patches: patch-qlite_src_column_vala Log message: fix build with vala-0.50.4 from upstream
Re: Update: net/prosody 0.11.8
committed. not new, but tests have been broken since the update to 0.11.x, they depend on a program called "busted" now. On 2021/03/06 18:35, Lucas wrote: > Hey David, > > Thanks a lot for taking care of this on my vacations! :D > > David Goerger wrote: > > Hi ports@ and Lucas, > > > > I've been running 0.11.8 for about a week without issue on amd64. > > Might it be possible to get this in for 6.9? Thanks! > > > > The changelog for 0.11.7 -> 0.11.8 consists of the usual fare of > > bugfixes, performance improvements, and security updates. > > It builds fine on -current, and deployed a backported patch in -stable > in my server, which is working correctly. Had to modify the diff adding > `FIX_EXTRACT_PERMISSIONS=Yes` as all the directories and a single file > in the release tarball are `o-rwx` and I run with `PORTS_PRIVSEP=Yes` > in my `/etc/mk.conf`. Upstream said they don't plan to fix that > released tarball. With that, this is "OK" maintainer. > > -Lucas > > > Index: Makefile > === > RCS file: /home/cvs/ports/net/prosody/Makefile,v > retrieving revision 1.59 > diff -u -p -r1.59 Makefile > --- Makefile 5 Oct 2020 22:09:34 - 1.59 > +++ Makefile 6 Mar 2021 18:06:54 - > @@ -1,7 +1,7 @@ > # $OpenBSD: Makefile,v 1.59 2020/10/05 22:09:34 solene Exp $ > > COMMENT= communications server for Jabber/XMPP written in Lua > -DISTNAME=prosody-0.11.7 > +DISTNAME=prosody-0.11.8 > CATEGORIES= net > MASTER_SITES=https://prosody.im/downloads/source/ > > @@ -11,6 +11,8 @@ MAINTAINER= Lucas > > # MIT > PERMIT_PACKAGE= Yes > + > +FIX_EXTRACT_PERMISSIONS= Yes > > MAKE_FILE= makefile > MODULES= lang/lua > Index: distinfo > === > RCS file: /home/cvs/ports/net/prosody/distinfo,v > retrieving revision 1.19 > diff -u -p -r1.19 distinfo > --- distinfo 5 Oct 2020 22:09:34 - 1.19 > +++ distinfo 6 Mar 2021 17:49:42 - > @@ -1,2 +1,2 @@ > -SHA256 (prosody-0.11.7.tar.gz) = KP/AdlNIXLY+IrOH0+pIJe4rqu4MWCfeTWBTo1sch0c= > -SIZE (prosody-0.11.7.tar.gz) = 429369 > +SHA256 (prosody-0.11.8.tar.gz) = gw8YO5jVdC2B6QjS2OMljxtTja10EfBv2lssxcdQaPg= > +SIZE (prosody-0.11.8.tar.gz) = 429762 > Index: pkg/PLIST > === > RCS file: /home/cvs/ports/net/prosody/pkg/PLIST,v > retrieving revision 1.16 > diff -u -p -r1.16 PLIST > --- pkg/PLIST 5 Oct 2020 22:09:35 - 1.16 > +++ pkg/PLIST 6 Mar 2021 17:49:42 - > @@ -211,6 +211,7 @@ lib/prosody/util/stanza.lua > lib/prosody/util/startup.lua > lib/prosody/util/statistics.lua > lib/prosody/util/statsd.lua > +@so lib/prosody/util/strbitop.so > @so lib/prosody/util/table.so > lib/prosody/util/template.lua > lib/prosody/util/termcolours.lua >
Re: Update to redis-6.2.1
On Tue, 2 Mar 2021 18:37:09 -0500, Daniel Jakots wrote: > Here's an update for redis. (this has been committed)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 11:43:56 Modified files: net/prosody: Makefile distinfo net/prosody/pkg: PLIST Log message: update to prosody-0.11.8, from David Goerger, tweak/ok maintainer
Re: [update] rsyslog 8.2102.0
On 2021/03/06 17:14, Remi Locherer wrote: > On Sun, Feb 28, 2021 at 09:56:55PM +0100, Remi Locherer wrote: > > Hi, > > > > this updates rsyslog to version 8.2102.0 released in February 2021. > > The changes are listed here: > > https://github.com/rsyslog/rsyslog/blob/master/ChangeLog > > > > I verified that the 6 rsyslog tests in the regress test suite from syslogd > > all succeed. In addition I also tested the modules imfile, ommysql and > > omrelp (all on amd64). > > > > portcheck notified me that iconv in WANTLIB-mysql is masked by iconv > > in -main. I removed the one in -mysql. > > > > port-lib-depends-check told me that libffi is not required. > > > > OK? > > > > Remi > > ping ... OK. > -WANTLIB-mysql += crypto iconv m mariadb pthread ssl z > +WANTLIB-mysql += crypto m mariadb pthread ssl z libmariadb previously used iconv but it was removed. (https://github.com/mariadb-corporation/mariadb-connector-c/commit/7052619cc4)
Re: Update: net/prosody 0.11.8
Hey David, Thanks a lot for taking care of this on my vacations! :D David Goerger wrote: > Hi ports@ and Lucas, > > I've been running 0.11.8 for about a week without issue on amd64. > Might it be possible to get this in for 6.9? Thanks! > > The changelog for 0.11.7 -> 0.11.8 consists of the usual fare of > bugfixes, performance improvements, and security updates. It builds fine on -current, and deployed a backported patch in -stable in my server, which is working correctly. Had to modify the diff adding `FIX_EXTRACT_PERMISSIONS=Yes` as all the directories and a single file in the release tarball are `o-rwx` and I run with `PORTS_PRIVSEP=Yes` in my `/etc/mk.conf`. Upstream said they don't plan to fix that released tarball. With that, this is "OK" maintainer. -Lucas Index: Makefile === RCS file: /home/cvs/ports/net/prosody/Makefile,v retrieving revision 1.59 diff -u -p -r1.59 Makefile --- Makefile5 Oct 2020 22:09:34 - 1.59 +++ Makefile6 Mar 2021 18:06:54 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.59 2020/10/05 22:09:34 solene Exp $ COMMENT= communications server for Jabber/XMPP written in Lua -DISTNAME= prosody-0.11.7 +DISTNAME= prosody-0.11.8 CATEGORIES=net MASTER_SITES= https://prosody.im/downloads/source/ @@ -11,6 +11,8 @@ MAINTAINER= Lucas # MIT PERMIT_PACKAGE=Yes + +FIX_EXTRACT_PERMISSIONS= Yes MAKE_FILE= makefile MODULES= lang/lua Index: distinfo === RCS file: /home/cvs/ports/net/prosody/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- distinfo5 Oct 2020 22:09:34 - 1.19 +++ distinfo6 Mar 2021 17:49:42 - @@ -1,2 +1,2 @@ -SHA256 (prosody-0.11.7.tar.gz) = KP/AdlNIXLY+IrOH0+pIJe4rqu4MWCfeTWBTo1sch0c= -SIZE (prosody-0.11.7.tar.gz) = 429369 +SHA256 (prosody-0.11.8.tar.gz) = gw8YO5jVdC2B6QjS2OMljxtTja10EfBv2lssxcdQaPg= +SIZE (prosody-0.11.8.tar.gz) = 429762 Index: pkg/PLIST === RCS file: /home/cvs/ports/net/prosody/pkg/PLIST,v retrieving revision 1.16 diff -u -p -r1.16 PLIST --- pkg/PLIST 5 Oct 2020 22:09:35 - 1.16 +++ pkg/PLIST 6 Mar 2021 17:49:42 - @@ -211,6 +211,7 @@ lib/prosody/util/stanza.lua lib/prosody/util/startup.lua lib/prosody/util/statistics.lua lib/prosody/util/statsd.lua +@so lib/prosody/util/strbitop.so @so lib/prosody/util/table.so lib/prosody/util/template.lua lib/prosody/util/termcolours.lua
fix gdb python helper
Python has a gdb helper that allows doing python backtraces from gdb
and other such things. We currently don't install it in Python packages,
and also gdb looks in a bogus directory "${prefix}/share/auto-load" (!)
to find autoload files:
(gdb) show auto-load scripts-directory
List of directories from which to load auto-loaded scripts is
:${prefix}/share/auto-load.
(gdb) set debug auto-load
(gdb) file /usr/local/bin/python3.8
Reading symbols from /usr/local/bin/python3.8...Reading symbols from
/usr/local/bin/.debug/python3.8.dbg...done.
auto-load: Attempted file "/usr/local/bin/.debug/python3.8.dbg-gdb.gdb" does
not exist.
auto-load: Searching 'set auto-load scripts-directory' path
":${prefix}/share/auto-load".
auto-load: Attempted file "/usr/local/bin/.debug/python3.8.dbg-gdb.gdb" does
not exist.
auto-load: Attempted file
"${prefix}/share/auto-load/usr/local/bin/.debug/python3.8.dbg-gdb.gdb" does not
exist.
auto-load: Attempted file "/usr/local/bin/.debug/python3.8.dbg-gdb.py" does not
exist.
auto-load: Searching 'set auto-load scripts-directory' path
":${prefix}/share/auto-load".
auto-load: Attempted file "/usr/local/bin/.debug/python3.8.dbg-gdb.py" does not
exist.
auto-load: Attempted file
"${prefix}/share/auto-load/usr/local/bin/.debug/python3.8.dbg-gdb.py" does not
exist.
done.
auto-load: Attempted file "/usr/local/bin/python3.8-gdb.gdb" does not exist.
auto-load: Searching 'set auto-load scripts-directory' path
":${prefix}/share/auto-load".
auto-load: Attempted file "/usr/local/bin/python3.8-gdb.gdb" does not exist.
auto-load: Attempted file
"${prefix}/share/auto-load/usr/local/bin/python3.8-gdb.gdb" does not exist.
auto-load: Attempted file "/usr/local/bin/python3.8-gdb.py" does not exist.
auto-load: Searching 'set auto-load scripts-directory' path
":${prefix}/share/auto-load".
auto-load: Attempted file "/usr/local/bin/python3.8-gdb.py" does not exist.
auto-load: Attempted file
"${prefix}/share/auto-load/usr/local/bin/python3.8-gdb.py" does not exist.
$ kdump|grep auto-load
52790 egdb NAMI "${prefix}/share/auto-load"
\^A\0t \M^C\0\^A\0d\^BS\0)\^Cz3Update sys.path, reload gdb and
auto-load packages.r\^A\0\0\
"#set auto-load-safe-path = ~/.gdb/
52790 egdb NAMI
"${prefix}/share/auto-load/usr/local/bin/.debug/python3.8.dbg-gdb.gdb"
52790 egdb NAMI
"${prefix}/share/auto-load/usr/local/bin/.debug/python3.8.dbg-gdb.py"
52790 egdb NAMI
"${prefix}/share/auto-load/usr/local/bin/python3.8-gdb.gdb"
52790 egdb NAMI "${prefix}/share/auto-load/usr/local/bin/python3.8-gdb.py"
Diff below fixes the two problems.
OK? Here's a simple example of using it:
-
$ egdb python3.8
...
(gdb) run /usr/local/bin/chardetect
Starting program: /usr/local/bin/python3.8 /usr/local/bin/chardetect
You are running chardetect interactively. Press CTRL-D twice at the start of a
blank line to signal the end of your input. If you want help, run chardetect
--help
^C
Program received signal SIGINT, Interrupt.
_thread_sys_read () at /tmp/-:3
3 /tmp/-: No such file or directory.
(gdb) py-bt
Traceback (most recent call first):
File "/usr/local/lib/python3.8/site-packages/chardet/cli/chardetect.py", line
36, in description_of
for line in lines:
File "/usr/local/lib/python3.8/site-packages/chardet/cli/chardetect.py", line
1104, in main
File "/usr/local/bin/chardetect", line 11, in
load_entry_point('chardet==4.0.0', 'console_scripts', 'chardetect')()
-
Index: devel/gdb/Makefile
===
RCS file: /cvs/ports/devel/gdb/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- devel/gdb/Makefile 23 Feb 2021 19:39:14 - 1.71
+++ devel/gdb/Makefile 6 Mar 2021 18:24:05 -
@@ -4,7 +4,7 @@ COMMENT=GNU debugger
CATEGORIES=devel
DISTNAME= gdb-7.12.1
-REVISION= 15
+REVISION= 16
HOMEPAGE= https://www.gnu.org/software/gdb/
@@ -21,7 +21,7 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WR
WANTLIB = c expat kvm m curses pthread ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc base-gcc
SEPARATE_BUILD= Yes
CONFIGURE_STYLE=gnu
@@ -30,6 +30,7 @@ CONFIGURE_ARGS= --program-prefix=e \
--disable-sim \
--without-guile \
--without-lzma \
+ --with-auto-load-dir=${TRUEPREFIX}/share/gdb/auto-load \
--enable-target=all \
--with-python=${MODPY_BIN}
Index: lang/python/Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.135
diff -u -p -r1.135 Makefile.inc
--- lang/python/Makefile.inc29 Dec 2020 23:59:06 - 1.135
+++ lang/python/Makefile.inc6 Mar 2021 18:24:05 -
@@ -146,14 +146,14 @@ do-gen:
post-configure:
@cd ${WRKSRC} && ${MAKE_PROGRAM}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2021/03/06 11:13:48 Modified files: net/haproxy: Makefile distinfo Log message: Update to haproxy-2.3.6
oolite: fix -fno-common
Hi
Rather mechanical fix for -fno-common. Builds and starts, but I don't
know how to play it, so can't judge if that works.
Best,
Martin
Index: Makefile
===
RCS file: /cvs/ports/games/oolite/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile26 Feb 2021 18:20:33 - 1.24
+++ Makefile6 Mar 2021 18:01:30 -
@@ -3,7 +3,7 @@
COMMENT= space combat and trading game in the style of Elite
VERSION= 1.73.4
-REVISION = 16
+REVISION = 17
DISTNAME= oolite-dev-source-${VERSION}
PKGNAME= oolite-${VERSION}
CATEGORIES=games
Index: patches/patch-src_Cocoa_JoystickHandler.h
===
RCS file: patches/patch-src_Cocoa_JoystickHandler.h
diff -N patches/patch-src_Cocoa_JoystickHandler.h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Cocoa_JoystickHandler.h 6 Mar 2021 18:01:30 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/Cocoa/JoystickHandler.hSat Mar 6 18:11:04 2021
src/Cocoa/JoystickHandler.hSat Mar 6 18:20:16 2021
+@@ -66,7 +66,7 @@
+ AXIS_VIEWX,
+ AXIS_VIEWY,
+ AXIS_end
+-} axfn;
++};
+
+ // Controls that can be a button
+ enum {
+@@ -102,7 +102,7 @@
+ BUTTON_VIEWPORT,
+ BUTTON_VIEWSTARBOARD,
+ BUTTON_end
+-} butfn;
++};
+
+ // Stick constants
+ #define MAX_STICKS 4
Index: patches/patch-src_Core_Entities_PlanetEntity_h
===
RCS file:
/cvs/ports/games/oolite/patches/patch-src_Core_Entities_PlanetEntity_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_Core_Entities_PlanetEntity_h
--- patches/patch-src_Core_Entities_PlanetEntity_h 22 Oct 2013 16:52:09
- 1.1
+++ patches/patch-src_Core_Entities_PlanetEntity_h 6 Mar 2021 18:01:30
-
@@ -6,9 +6,9 @@ $OpenBSD: patch-src_Core_Entities_Planet
} VertexData;
+// straight c
-+doublecorona_speed_factor;// multiply delta_t by this
before adding it to corona_stage
-+doublecorona_stage; // 0.0 -> 1.0
-+GLfloat rvalue[729];// stores random values
for adjusting colors in the corona
++extern double corona_speed_factor;// multiply delta_t by this
before adding it to corona_stage
++extern double corona_stage; // 0.0 -> 1.0
++extern GLfloatrvalue[729];// stores
random values for adjusting colors in the corona
+
+
@interface PlanetEntity: OOSelfDrawingEntity
Index: patches/patch-src_Core_Entities_PlanetEntity_m
===
RCS file: patches/patch-src_Core_Entities_PlanetEntity_m
diff -N patches/patch-src_Core_Entities_PlanetEntity_m
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Core_Entities_PlanetEntity_m 6 Mar 2021 18:01:30
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/Core/Entities/PlanetEntity.m Sat Mar 6 18:11:04 2021
src/Core/Entities/PlanetEntity.m Sat Mar 6 18:34:07 2021
+@@ -44,6 +44,10 @@
+ #define LIM8K 8000.0*8000.0 *
NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
+ #define LIM16K 16000.0*16000.0 *
NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
+
++// -fno-common
++double corona_speed_factor;
++double corona_stage;
++GLfloat rvalue[729];
+
+ // straight c
+ static Vector base_vertex_array[10400];
Index: patches/patch-src_Core_OOTrumble_h
===
RCS file: patches/patch-src_Core_OOTrumble_h
diff -N patches/patch-src_Core_OOTrumble_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Core_OOTrumble_h 6 Mar 2021 18:01:30 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Core/OOTrumble.h Sat Mar 6 18:11:04 2021
src/Core/OOTrumble.h Sat Mar 6 18:30:37 2021
+@@ -66,7 +66,7 @@
+ TRUMBLE_MOUTH_NORMAL
+ };
+
+-float trumbleAppetiteAccumulator;
++extern float trumbleAppetiteAccumulator;
+
+ @interface OOTrumble : NSObject
+ {
Index: patches/patch-src_Core_OOTrumble_m
===
RCS file: patches/patch-src_Core_OOTrumble_m
diff -N patches/patch-src_Core_OOTrumble_m
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Core_OOTrumble_m 6 Mar 2021 18:01:30 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Core/OOTrumble.m Sat Mar 6 18:11:04 2021
src/Core/OOTrumble.m Sat Mar 6 18:30:49 2021
+@@ -30,6 +30,8 @@
+ #import "OOSound.h"
+ #import "OOStringParsing.h"
+
++// -fno-common
++float trumbleAppetiteAccumulator;
+
+ static void InitTrumbleSounds(void);
+ static void PlayTrumbleIdle(void);
Index: patches/patch-src_SDL_JoystickHandler_h
===
RCS file: patches/patch-src_SDL_JoystickHandler_h
diff -N patches/patch-src_SDL_JoystickHandler_h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2021/03/06 10:42:12 Modified files: databases/redis: Makefile distinfo databases/redis/patches: patch-src_Makefile patch-src_debug_c Removed files: databases/redis/patches: patch-src_zmalloc_c Log message: Update to redis-6.2.1 Tests pass on sparc64/amd64. ok tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/03/06 10:14:58 Modified files: print/qpdf : Makefile distinfo Log message: Update to qpdf-10.3.0.
Re: NEW: devel/git-annex
James Cook writes: > On Thu, Mar 04, 2021 at 09:21:18PM -0800, Greg Steuck wrote: > I guess the only issue is MODCABAL_MANIFEST might need to be > re-generated? (I needed to do that when I rebased the port from your > ghc 8.10 branch onto master with ghc 8.6.) Yeah, that's the extent of the changes I anticipate. > I'm happy to prepare an 8.10-compatible version now if that would help > with the upgrade to 8.10. Thanks, that wouldn't hurt :) Thanks Greg
Re: NEW: devel/git-annex
Aaron Bieber writes:
> Builds fine for me! ("61m47.59s real36m53.69s user14m31.75s
> system" on my AMD Ryzen 9 3900X 12-Core Processor!)
>
> OK abieber@
Committed.
> We should decide on a name for a file to store the MOD{CABAL,GO,CARGO}
> dependency lists! These Makefiles are gonna be yuge!
espie@ was floating the idea of manifest.mk or something similar?
Thanks
Greg
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/03/06 09:55:52 Modified files: devel : Makefile Log message: Plug in git-annex
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/03/06 09:53:50 Added files: devel/git-annex: Makefile distinfo devel/git-annex/pkg: DESCR PLIST Log message: Add devel/git-annex 8.20210223 using cabal.port.mk Built in collaboration with James Cook OK abierber
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/03/06 09:53:08 ports/devel/git-annex/pkg Update of /cvs/ports/devel/git-annex/pkg In directory cvs.openbsd.org:/cvs.d/hack/gnezdo/ports/devel/git-annex/pkg Log Message: Directory /cvs/ports/devel/git-annex/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/03/06 09:53:08 ports/devel/git-annex Update of /cvs/ports/devel/git-annex In directory cvs.openbsd.org:/cvs.d/hack/gnezdo/ports/devel/git-annex Log Message: Directory /cvs/ports/devel/git-annex added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/03/06 09:36:24 Modified files: lang/moarvm: Makefile Added files: lang/moarvm/patches: patch-src_6model_reprs_MVMHash_c patch-src_6model_serialization_c Log message: Mark cmp_tc static to avoid linker errors in lang/moarvm OK sthen, tb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 09:36:01 Modified files: www/ap2-mod_jk : Makefile distinfo www/ap2-mod_jk/patches: patch-native_configure www/ap2-mod_jk/pkg: PLIST Log message: update to ap2-mod_jk-1.2.48
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 09:29:11 Modified files: textproc/py-alabaster: Makefile distinfo textproc/py-alabaster/pkg: PLIST Log message: update to py3-alabaster-0.7.12
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 09:28:05 Modified files: telephony/p5-asterisk: Makefile distinfo telephony/p5-asterisk/pkg: PLIST Log message: update to p5-asterisk-1.08
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 09:23:22 Modified files: devel/py-babel : Makefile distinfo devel/py-babel/pkg: PLIST Log message: update to py-babel-2.9.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 09:16:16 Modified files: devel/p5-Path-Tiny: Makefile distinfo Log message: update to p5-Path-Tiny-0.118
Re: [update] rsyslog 8.2102.0
On Sun, Feb 28, 2021 at 09:56:55PM +0100, Remi Locherer wrote: > Hi, > > this updates rsyslog to version 8.2102.0 released in February 2021. > The changes are listed here: > https://github.com/rsyslog/rsyslog/blob/master/ChangeLog > > I verified that the 6 rsyslog tests in the regress test suite from syslogd > all succeed. In addition I also tested the modules imfile, ommysql and > omrelp (all on amd64). > > portcheck notified me that iconv in WANTLIB-mysql is masked by iconv > in -main. I removed the one in -mysql. > > port-lib-depends-check told me that libffi is not required. > > OK? > > Remi ping ... Index: Makefile === RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.50 diff -u -p -r1.50 Makefile --- Makefile22 Nov 2020 17:05:59 - 1.50 +++ Makefile28 Feb 2021 20:40:17 - @@ -8,7 +8,7 @@ COMMENT-elasticsearch = Elasticsearch pl MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch -V =8.2008.0 +V =8.2102.0 DISTNAME = rsyslog-$V PKGNAME-main = rsyslog-$V PKGNAME-mysql =rsyslog-mysql-$V @@ -16,7 +16,6 @@ PKGNAME-normalize = rsyslog-normalize-$V PKGNAME-pgsql =rsyslog-pgsql-$V PKGNAME-elasticsearch =rsyslog-elasticsearch-$V CATEGORIES = sysutils -REVISION-main =0 HOMEPAGE = https://www.rsyslog.com/ @@ -27,11 +26,11 @@ PERMIT_PACKAGE =Yes COMPILER = base-clang ports-gcc base-gcc -WANTLIB-main +=c crypto curl estr fastjson ffi gcrypt gmp gnutls +WANTLIB-main +=c crypto curl estr fastjson gcrypt gmp gnutls WANTLIB-main +=gpg-error hogweed iconv idn2 intl nettle nghttp2 WANTLIB-main +=p11-kit pthread relp ssl tasn1 unistring uuid z -WANTLIB-mysql += crypto iconv m mariadb pthread ssl z +WANTLIB-mysql += crypto m mariadb pthread ssl z WANTLIB-normalize += estr fastjson lognorm pthread Index: distinfo === RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo8 Sep 2020 20:57:48 - 1.10 +++ distinfo28 Feb 2021 13:32:45 - @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.2008.0.tar.gz) = CdK2yLwvAWWYrtK7cZ4D+CK7Adcgxh5NbnJeANyhtlA= -SIZE (rsyslog-8.2008.0.tar.gz) = 3051049 +SHA256 (rsyslog-8.2102.0.tar.gz) = lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc= +SIZE (rsyslog-8.2102.0.tar.gz) = 3123684
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 09:13:18 Modified files: devel/p5-DateTime-Format-Natural: Makefile distinfo Log message: update to p5-DateTime-Format-Natural-1.11
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 09:12:53 Modified files: devel/p5-DateTime-Format-ISO8601: Makefile distinfo Log message: update to p5-DateTime-Format-ISO8601-0.16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 09:00:23 Modified files: textproc/py-sphinx-notfound-page: Makefile distinfo Log message: update to py3-sphinx-notfound-page-0.6
Re: Build failures from -fno-common (2021-03-06)
On 2021/03/06 07:49, Greg Steuck wrote: > Christian Weisgerber writes: > > > What, you thought the last few would resolve themselves by magic? > > Here are the remaining ports that fail to build due to the new > > -fno-common compiler default: > > > > lang/moarvm > > I took the patch from upstream. An update would've worked too, but this > is lower effort. > > OK? OK. It's possible that this will unlock new failures (nqp, rakudo).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 08:56:32 Modified files: sysutils/p5-Unix-Statgrab: Makefile distinfo sysutils/p5-Unix-Statgrab/pkg: PLIST Log message: update to p5-Unix-Statgrab-0.112
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Wed Mar 3 13:50:05 MST 2021 finished at Sat Mar 6 08:54:01 MST 2021 lasted 2D19h03m done with kern.version=OpenBSD 6.9-beta (GENERIC.MP) #1049: Tue Mar 2 13:14:36 MST 2021 built packages:11025 Mar 3:2672 Mar 4:1539 Mar 5:2863 Mar 6:3950 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2021-03-03/summary.log build failures: 24 http://build-failures.rhaalovely.net/aarch64/2021-03-03/audio/audacious/plugins,qt5.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/comms/gnuradio.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/converters/wv2.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/devel/autoconf/2.70.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/editors/calligra.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/editors/micro.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/editors/xwpe.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/emulators/vice.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/games/libgdx.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/games/lwjgl3.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/games/mirrormagic.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/games/shockolate.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/lang/moarvm.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/lang/zig.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/misc/open62541.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/multimedia/lives.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/net/dino.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/net/yersinia.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/security/age.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/sysutils/nomad.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/sysutils/telegraf.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/sysutils/terragrunt.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/www/chromium.log http://build-failures.rhaalovely.net/aarch64/2021-03-03/www/seamonkey,-lightning.log recurrent failures failures/audio/audacious/plugins,qt5.log failures/comms/gnuradio.log failures/converters/wv2.log failures/editors/calligra.log failures/editors/micro.log failures/editors/xwpe.log failures/emulators/vice.log failures/games/libgdx.log failures/games/lwjgl3.log failures/games/mirrormagic.log failures/games/shockolate.log failures/lang/moarvm.log failures/multimedia/lives.log failures/net/yersinia.log failures/security/age.log failures/sysutils/nomad.log failures/sysutils/telegraf.log failures/sysutils/terragrunt.log failures/www/chromium.log failures/www/seamonkey,-lightning.log new failures +++ ls-failures Sat Mar 6 08:54:12 2021 +failures/devel/autoconf/2.70.log +failures/lang/zig.log +failures/misc/open62541.log +failures/net/dino.log resolved failures --- ../old/aarch64/last//ls-failuresMon Mar 1 16:06:23 2021 -failures/audio/gtkpod.log -failures/audio/nspmod.log -failures/audio/wmtune.log -failures/comms/birda.log -failures/comms/efax.log -failures/comms/scmxx.log -failures/comms/xdx.log -failures/devel/glog.log -failures/emulators/pcsxr.log -failures/games/corewars.log -failures/games/egoboo.log -failures/games/freedroidrpg.log -failures/games/sdlpop.log -failures/mail/wmmultipop3.log -failures/mail/wmpop3.log -failures/misc/logjam.log -failures/misc/wmmand.log -failures/multimedia/audiopreview.log -failures/net/angst.log -failures/net/ekg.log -failures/net/ettercap,no_x11.log -failures/net/tcpreplay.log -failures/security/bsd-airtools.log -failures/security/foremost.log -failures/security/gringotts.log -failures/security/ossec-hids.log -failures/sysutils/radmind.log -failures/x11/agar/test.log -failures/x11/golem.log -failures/x11/wind.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 08:52:07 Modified files: www/p5-XML-Feed: Makefile distinfo Log message: update to p5-XML-Feed-0.61
Re: Build failures from -fno-common (2021-03-06)
Christian Weisgerber writes:
> What, you thought the last few would resolve themselves by magic?
> Here are the remaining ports that fail to build due to the new
> -fno-common compiler default:
>
> lang/moarvm
I took the patch from upstream. An update would've worked too, but this
is lower effort.
OK?
>From 71a2ee1c3316d5454b3ba60cb2678c4ec5e2642b Mon Sep 17 00:00:00 2001
From: Greg Steuck
Date: Sat, 6 Mar 2021 07:44:29 -0800
Subject: [PATCH] Mark cmp_tc static to avoid linker errors in lang/moarvm
---
lang/moarvm/Makefile | 2 +-
.../patches/patch-src_6model_reprs_MVMHash_c | 16
.../patches/patch-src_6model_serialization_c | 16
3 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 lang/moarvm/patches/patch-src_6model_reprs_MVMHash_c
create mode 100644 lang/moarvm/patches/patch-src_6model_serialization_c
diff --git a/lang/moarvm/Makefile b/lang/moarvm/Makefile
index 01bec4c4e9b..b30d5fce17b 100644
--- a/lang/moarvm/Makefile
+++ b/lang/moarvm/Makefile
@@ -8,7 +8,7 @@ COMMENT = virtual machine for nqp/rakudo
V =2018.12
DISTNAME = MoarVM-$V
PKGNAME = moarvm-$V
-REVISION = 0
+REVISION = 1
SHARED_LIBS = moar9.0
diff --git a/lang/moarvm/patches/patch-src_6model_reprs_MVMHash_c
b/lang/moarvm/patches/patch-src_6model_reprs_MVMHash_c
new file mode 100644
index 000..f552a58ba31
--- /dev/null
+++ b/lang/moarvm/patches/patch-src_6model_reprs_MVMHash_c
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+https://github.com/MoarVM/MoarVM/commit/978480b288971e0a5f635456a29b35249cfc23e3
+
+Index: src/6model/reprs/MVMHash.c
+--- src/6model/reprs/MVMHash.c.orig
src/6model/reprs/MVMHash.c
+@@ -181,7 +181,7 @@ static void deserialize(MVMThreadContext *tc, MVMSTabl
+ }
+
+ /* Serialize the representation. */
+-MVMThreadContext *cmp_tc;
++static MVMThreadContext *cmp_tc;
+ static int cmp_strings(const void *s1, const void *s2) {
+ return MVM_string_compare(cmp_tc, *(MVMString **)s1, *(MVMString **)s2);
+ }
diff --git a/lang/moarvm/patches/patch-src_6model_serialization_c
b/lang/moarvm/patches/patch-src_6model_serialization_c
new file mode 100644
index 000..cfbabe3b45f
--- /dev/null
+++ b/lang/moarvm/patches/patch-src_6model_serialization_c
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+https://github.com/MoarVM/MoarVM/commit/978480b288971e0a5f635456a29b35249cfc23e3
+
+Index: src/6model/serialization.c
+--- src/6model/serialization.c.orig
src/6model/serialization.c
+@@ -507,7 +507,7 @@ static void write_array_str(MVMThreadContext *tc, MVMS
+ }
+
+ /* Writes a hash where each key is a MVMString and each value a variant
reference. */
+-MVMThreadContext *cmp_tc;
++static MVMThreadContext *cmp_tc;
+ static int cmp_strings(const void *s1, const void *s2) {
+ return MVM_string_compare(cmp_tc, *(MVMString **)s1, *(MVMString **)s2);
+ }
--
2.30.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 08:49:16 Modified files: net/py-idna: Makefile distinfo Log message: update to py-idna-2.10 (skipping 3.x for now due to py2 deps)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 08:31:12 Modified files: textproc/p5-PDF-API2: Makefile distinfo Log message: update to p5-PDF-API2-2.039
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org 2021/03/06 08:29:07
Modified files:
games/f1spirit : Makefile distinfo
Log message:
f1spirit: rename the distfile.
if the contents of a distfile change under the same name upstream,
use DISTFILES=local{remote}suffix so that the fetched copy has a new
name.
Build failures from -fno-common (2021-03-06)
What, you thought the last few would resolve themselves by magic? Here are the remaining ports that fail to build due to the new -fno-common compiler default: games/oolite lang/moarvm multimedia/lives net/yersinia# update/fix on ports@ waiting for ok -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: [NEW] sysutils/oc 4.6.15
up
‐‐‐ Original Message ‐‐‐
On Friday, February 26, 2021 11:41 AM, Luca De Pandis
wrote:
> Hi,
> bumped to 4.7.0.
>
> Best regards,
> Luca De Pandis
>
> ‐‐‐ Original Message ‐‐‐
> On Thursday, February 18, 2021 5:58 PM, Rafael Sadowski raf...@sizeofvoid.org
> wrote:
>
> > On Thu Feb 18, 2021 at 08:37:54AM +, Luca De Pandis wrote:
> >
> > > Hi,
> > > bumped to 4.6.17.
> > > Could someone test it and if ok commit it, please?
> >
> > Still OK here!
> >
> > > Best regards,
> > > Luca De Pandis
> > > ‐‐‐ Original Message ‐‐‐
> > > On Thursday, February 11, 2021 2:40 PM, Luca De Pandis
> > > luca.depan...@protonmail.com wrote:
> > >
> > > > Hi,
> > > > could someone commit it please?
> > >
> > > > Best regards,
> > > > Luca De Pandis
> > >
> > > > ‐‐‐ Original Message ‐‐‐
> > > > On Tuesday, February 9, 2021 4:56 PM, Luca De Pandis
> > > > luca.depan...@protonmail.com wrote:
> > >
> > > > > Hi,
> > > > > thank you for your feedback.
> > > > > I attached the fixed package.
> > > > > Best regards,
> > > > > Luca De Pandis
> > > > > ‐‐‐ Original Message ‐‐‐
> > > > > On Tuesday, February 9, 2021 4:48 PM, Rafael Sadowski
> > > > > raf...@sizeofvoid.org wrote:
> > >
> > > > > > On Tue Feb 09, 2021 at 07:54:30AM +, Luca De Pandis wrote:
> > >
> > > > > > > Hi,
> > > > > > > bumped to 4.6.16.
> > > > > > > If ok, could someone commit it, please?
> > > > > > > Best regards,
> > > > > > > Luca De Pandis
> > >
> > > > > > Works fine here. Some notes/tweaks:
> > >
> > > > > > - Remove uncomment line
> > >
> > > > > > - Fix MAINTAINER syntax.
> > >
> > > > > > - I would suggest to remove BUILDDATE. This information is not
> > > > > > helpful
> > > > > > and it will change every time in a bulk build. oc runs and
> > > > > > build fine
> > > > > > without this information:
> > > > > > $ oc version -o yaml
> > > > > > clientVersion:
> > > > > > buildDate: ""
> > > > > > compiler: gc
> > > > > > gitCommit: 18d7461aca47e77cefb355339252a8d4c149188f
> > > > > > gitTreeState: clean
> > > > > > gitVersion: 4.6.16
> > > > > > goVersion: go1.15.7
> > > > > > major: "4"
> > > > > > minor: "6"
> > > > > > platform: openbsd/amd64
> > > > > > With this changes, OK rsadowski
> > > > > > --- Makefile.orig Tue Feb 9 16:35:47 2021
> > > > > > +++ Makefile Tue Feb 9 16:38:36 2021
> > > > > > @@ -7,21 +7,18 @@ GH_PROJECT = oc
> > > > > > VERSION = 4.6.16
> > > > > > GH_COMMIT = 18d7461aca47e77cefb355339252a8d4c149188f
> > > > > > DISTNAME = oc-${VERSION}
> > > > > > -#PKGNAME = oc-${VERSION}
> > > > > > CATEGORIES = sysutils
> > > > > > HOMEPAGE = https://www.openshift.com
> > > > > > -MAINTAINER = luca.depan...@protonmail.com
> > > > > > +MAINTAINER = Luca De Pandis luca.depan...@protonmail.com
> > > > > >
> > >
> > > > > >
> > >
> > > > > > Apache License 2.0
> > >
> > > > > > ===
> > >
> > > > > > PERMIT_PACKAGE = Yes
> > > > > > WANTLIB = c pthread
> > > > > > -BUILDDATE = $$(date -u +%Y-%m-%dT%H:%M:%SZ)
> > > > > > MODULES = lang/go
> > > > > > GO_PKGNAME = github.com/openshift/oc
> > > > > > @@ -29,7 +26,6 @@ WRKSRC = ${MODGO_WORKSPACE}/src/${GO_PKGNAME}
> > > > > > ALL_TARGET = ${GO_PKGNAME}/cmd/oc
> > > > > > MODGO_LDFLAGS += \
> > >
> > > > > > - -X ${GO_PKGNAME}/pkg/version.buildDate=${BUILDDATE} \
> > > > > > -X ${GO_PKGNAME}/pkg/version.commitFromGit=${GH_COMMIT} \
> > > > > > -X ${GO_PKGNAME}/pkg/version.versionFromGit=${VERSION} \
> > > > > > -X ${GO_PKGNAME}/pkg/version.majorFromGit=${VERSION:R:R} \
> > > > > >
oc.tar.gz
Description: application/gzip
publickey - luca.depandis@protonmail.com - 0xC73C26D2.asc
Description: application/pgp-keys
signature.asc
Description: OpenPGP digital signature
Re: [NEW] sysutils/hydroxide
up Sent with ProtonMail Secure Email. ‐‐‐ Original Message ‐‐‐ On Thursday, February 18, 2021 7:57 PM, Luca De Pandis wrote: > Here the tarball updated with the fix! > > Thank you for the feedback! > > Best regards, > Luca De Pandis > > On Thu, Feb 18, 2021 at 06:40:44PM +0100, Stuart Henderson wrote: > > > On 2021/02/18 16:11, Luca De Pandis wrote: > > > > > Hi, > > > in attachments the new port sysutils/hydroxide. > > > Hydroxide is an open source, third party ProtonMail bridge > > > written in Go. > > > Port has passed: > > > > > > - portcheck -N > > > - port-lib-depends-check > > > > > > Tested (I'm writing this email by using NeoMutt+hydroxide) on > > > amd64. > > > Feedback? Ok to commit? > > > If so, could someone commit it, please? > > > Best regards, > > > Luca De Pandis > > > > : COMMENT = A third-party, open-source ProtonMail bridge > > don't start with capitals / indefinite article. maybe just > > "third-party, open-source ProtonMail bridge" > > : CATEGORIES = sysutils > > not mail? > > : MODGO_MODULES = \ > > : github.com/emersion/go-imap v1.0.6 \ > > : github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342 \ > > : github.com/emersion/go-imap-specialuse v0.0.0-20201101201809-1ab93d3d150e > > \ > > [..] > > remove this and regenerate it with "make modgo-gen-modules > somefile" > > and add the contents of "somefile" into Makefile. this will give two > > sets, MODGO_MODULES (which download .mod and .zip) and MODGO_MODFILES > > (just .mod). hydroxide.tar.gz Description: application/gzip publickey - luca.depandis@protonmail.com - 0xC73C26D2.asc Description: application/pgp-keys signature.asc Description: OpenPGP digital signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/03/06 07:31:36 Modified files: security/py-tlsfuzzer: Makefile distinfo Log message: Update to tlsfuzzer 20210305
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 06:55:42 Modified files: net/ettercap : Makefile Log message: ettercap: remove Makefile junk from working on the previous update
Re: [maintainer update] herbstluftwm 0.9.2
Am Sat, 6 Mar 2021 12:02:00 + schrieb Stuart Henderson : > On 2021/03/06 00:12, Lucas wrote: > > For some reason, I'm getting a different PLIST after applying > > Florian's patch, missing this: > > > > > -share/bash-completion/ > > > -share/bash-completion/completions/ > > > > which sounds good for me, but explanations are appreciated. > > bash is a dependency, update-plist strips paths that come from a dep. > committed. > Thanks! -- greetings, Florian Viehweger
Re: cmake.port.mk cmake-configure-args improvement
On 2021/03/06 13:47, Rafael Sadowski wrote:
> On Wed Mar 03, 2021 at 06:21:35PM +, Stuart Henderson wrote:
> > On 2021/02/27 09:43, Rafael Sadowski wrote:
> > > +_MODCMAKE_ARGS +=-DCMAKE_C_COMPILER="${CC}" \
> > > + -DCMAKE_CXX_COMPILER="${CXX}" \
> > > + -DCMAKE_C_FLAGS="${CFLAGS}" \
> > > + -DCMAKE_C_FLAGS_DEBUG="${CFLAGS}" \
> > > + -DCMAKE_C_FLAGS_RELEASE="${CFLAGS}" \
> >
> > I just found something with
> >
> > -set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
>
> It is good if we override this, isn't?
Overriding -DNDEBUG in the above, or some of the other flags that a
build might set, is not good. And I don't think we can override the -O3
without also overriding these other things.
It's useful for porters to know they can set these in CONFIGURE_ARGS
so I think it would be helpful to call these out in port-modules(7) cmake
section so they're easy to find but automatically overriding (especially
by default) seems a step too far.
I guess I wouldn't object if it was disabled by default with an option
to enable it...MODCMAKE_OVERRIDE_CFLAGS or something...or provide a
variable to use like "CONFIGURE_ARGS= ${MODCMAKE_COMPILER_OVERRIDES}"
though I would worry a bit that a porter might set it and not notice
that an important flag gets removed from the build.
> > I worry that overriding this is going to cause things to quietly build
> > with bad flags..
>
> I see your point but I don't understand what you mine with "bad flags".
> Application build/link "bad" flags?
>
> In this example we can't override CMAKE_C_FLAGS_RELEASE because FORCE is
> set.
>
> net/ettercap/patches/patch-CMakeLists_txt
> +set(CMAKE_C_FLAGS_RELEASE "-w -D_FORTIFY_SOURCE=2" CACHE STRING "" FORCE)
>
..but in other examples they aren't forced. We can't expect every upstream
to know (and use) every cmake feature..
Re: [update] loki 2.1.0
On 2021/03/05 14:29, Landry Breuil wrote:
> On Fri, Mar 05, 2021 at 02:20:58PM +0100, Landry Breuil wrote:
> > Hi,
> >
> >
> > here's an update to loki 2.1.0, cf
> > https://github.com/grafana/loki/releases/ for the various relnotes since
> > the 1.4.1 we're having now. Totally untested on OpenBSD, but im using it
> > on debian .. so might as well update the port.
>
> Even better with non-ether diff.
OK.
While you're there, can you add daemon_logger="daemon.info" to loki.rc please?
(Not for promtail though, it could end up in a nasty loop..)
Pity promtail's syslog-over-TCP ingester (which uses influxdata/go-syslog)
only does RFC5424 and doesn't work with messages from OpenBSD syslogd though..
level=warn ts=2021-03-06T12:39:18.055119653Z caller=syslogtarget.go:183
msg="error parsing syslog stream" err="expecting a version value in the range
1-999 [col 7]"
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/loki/Makefile,v
> retrieving revision 1.2
> diff -u -r1.2 Makefile
> --- Makefile 29 May 2020 04:58:05 - 1.2
> +++ Makefile 5 Mar 2021 13:18:15 -
> @@ -4,7 +4,7 @@
>
> GH_ACCOUNT = grafana
> GH_PROJECT = loki
> -GH_TAGNAME = v1.4.1
> +GH_TAGNAME = v2.1.0
>
> CATEGORIES = sysutils
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/loki/distinfo,v
> retrieving revision 1.2
> diff -u -r1.2 distinfo
> --- distinfo 29 May 2020 04:58:05 - 1.2
> +++ distinfo 5 Mar 2021 13:18:15 -
> @@ -1,2 +1,2 @@
> -SHA256 (loki-1.4.1.tar.gz) = KjbjS16OPN0mon0tpcADEBo/YboFhsvrmAWdqGtZVIA=
> -SIZE (loki-1.4.1.tar.gz) = 16155273
> +SHA256 (loki-2.1.0.tar.gz) = zszE5CpxWMoLxJkDo/vjHIzVX4X1C6yKi7qYQ7T4zW8=
> +SIZE (loki-2.1.0.tar.gz) = 23316117
> Index: patches/patch-cmd_loki_loki-local-config_yaml
> ===
> RCS file:
> /cvs/ports/sysutils/loki/patches/patch-cmd_loki_loki-local-config_yaml,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 patch-cmd_loki_loki-local-config_yaml
> --- patches/patch-cmd_loki_loki-local-config_yaml 7 Mar 2020 10:12:55
> - 1.1.1.1
> +++ patches/patch-cmd_loki_loki-local-config_yaml 5 Mar 2021 13:18:15
> -
> @@ -3,16 +3,23 @@
> Index: cmd/loki/loki-local-config.yaml
> --- cmd/loki/loki-local-config.yaml.orig
> +++ cmd/loki/loki-local-config.yaml
> -@@ -27,10 +27,10 @@ schema_config:
> +@@ -29,15 +29,15 @@ schema_config:
>
> storage_config:
> - boltdb:
> --directory: /tmp/loki/index
> -+directory: /var/loki/index
> -
> + boltdb_shipper:
> +-active_index_directory: /tmp/loki/boltdb-shipper-active
> +-cache_location: /tmp/loki/boltdb-shipper-cache
> ++active_index_directory: /var/loki/boltdb-shipper-active
> ++cache_location: /var/loki/boltdb-shipper-cache
> + cache_ttl: 24h # Can be increased for faster performance over
> longer query periods, uses more disk space
> + shared_store: filesystem
> filesystem:
> -directory: /tmp/loki/chunks
> +directory: /var/loki/chunks
>
> + compactor:
> +- working_directory: /tmp/loki/boltdb-shipper-compactor
> ++ working_directory: /var/loki/boltdb-shipper-compactor
> + shared_store: filesystem
> +
> limits_config:
> - enforce_metric_name: false
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/loki/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -r1.2 PLIST
> --- pkg/PLIST 29 May 2020 04:58:05 - 1.2
> +++ pkg/PLIST 5 Mar 2021 13:18:15 -
> @@ -37,6 +37,5 @@
> @sample ${SYSCONFDIR}/promtail/promtail-config.yaml
> @mode 0750
> @owner _loki
> -@group _loki
> @sample /var/loki/
> @sample /var/promtail/
Re: cmake.port.mk cmake-configure-args improvement
On Wed Mar 03, 2021 at 06:21:35PM +, Stuart Henderson wrote:
> On 2021/02/27 09:43, Rafael Sadowski wrote:
> > +_MODCMAKE_ARGS += -DCMAKE_C_COMPILER="${CC}" \
> > + -DCMAKE_CXX_COMPILER="${CXX}" \
> > + -DCMAKE_C_FLAGS="${CFLAGS}" \
> > + -DCMAKE_C_FLAGS_DEBUG="${CFLAGS}" \
> > + -DCMAKE_C_FLAGS_RELEASE="${CFLAGS}" \
>
> I just found something with
>
> -set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
It is good if we override this, isn't?
>
> I worry that overriding this is going to cause things to quietly build
> with bad flags..
>
I see your point but I don't understand what you mine with "bad flags".
Application build/link "bad" flags?
In this example we can't override CMAKE_C_FLAGS_RELEASE because FORCE is
set.
net/ettercap/patches/patch-CMakeLists_txt
+set(CMAKE_C_FLAGS_RELEASE "-w -D_FORTIFY_SOURCE=2" CACHE STRING "" FORCE)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2021/03/06 05:26:26 Modified files: net/lagrange : Makefile distinfo Log message: Update to lagrange-1.2.1 fix a crash when making a bookmark.
Re: UPDATE archivers/zstd-1.4.9
On 2021/03/05 06:18, Bjorn Ketelaars wrote:
> Diff below updates zstd to 1.4.9, which is a bugfix release. Changelog
> can be found at [0].
>
> Visibility of symbols in shared library has been fixed [1] resulting in
> check_sym reporting removal of several symbols. The latter warrants a
> major bump of SHARED_LIBS.
>
> Regression tests pass on amd64, and build tested consumers.
I think a minor bump for the added function would actually be enough,
it doesn't seem likely that other software would be directly calling the
internal functions which are now hidden (especially as deps built ok),
but major bump doesn't hurt either.
> Do we need to test this update in a bulk? If not, comments/OK?
No need for that I think.
OK
>
> [0] https://github.com/facebook/zstd/blob/v1.4.9/CHANGELOG
> [1]
> https://github.com/facebook/zstd/commit/821d9acd17f251a8ee548eadbc3c5bccdfca7691
>
>
> diff --git Makefile Makefile
> index dd086cd73c5..2cf83bebb9b 100644
> --- Makefile
> +++ Makefile
> @@ -2,10 +2,10 @@
>
> COMMENT =zstandard fast real-time compression algorithm
>
> -V = 1.4.8
> +V = 1.4.9
> DISTNAME = zstd-${V}
>
> -SHARED_LIBS =zstd4.0 # 1.4.7
> +SHARED_LIBS =zstd5.0 # 1.4.9
>
> CATEGORIES = archivers
>
> diff --git distinfo distinfo
> index 4ee8dd4cb1c..1560e8c4b44 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zstd-1.4.8.tar.gz) = MkeCl8oVACEQCNWWJ29TZ8VBmElc9nfpQ59HkaTGnyQ=
> -SIZE (zstd-1.4.8.tar.gz) = 1803550
> +SHA256 (zstd-1.4.9.tar.gz) = Kax04Z6ihlkBc2GXYkDEtcXCTbO4kzhzGm/rl8A40pM=
> +SIZE (zstd-1.4.9.tar.gz) = 1821109
> diff --git patches/patch-lib_Makefile patches/patch-lib_Makefile
> index f95960697f1..e9190f82814 100644
> --- patches/patch-lib_Makefile
> +++ patches/patch-lib_Makefile
> @@ -25,7 +25,7 @@ Index: lib/Makefile
> -Wredundant-decls -Wmissing-prototypes -Wc++-compat
> CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
> FLAGS = $(CPPFLAGS) $(CFLAGS)
> -@@ -427,8 +427,6 @@ install-shared:
> +@@ -428,8 +428,6 @@ install-shared:
> [ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
> @echo Installing shared library
> $(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
> diff --git patches/patch-programs_Makefile patches/patch-programs_Makefile
> index 012a78ef64b..5c3c731488c 100644
> --- patches/patch-programs_Makefile
> +++ patches/patch-programs_Makefile
> @@ -12,5 +12,5 @@ Index: programs/Makefile
> --Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
> +-Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
> -Wredundant-decls -Wmissing-prototypes -Wc++-compat
> - CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
> - FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
> + CFLAGS += $(DEBUGFLAGS)
> + CPPFLAGS += $(MOREFLAGS)
> diff --git patches/patch-tests_Makefile patches/patch-tests_Makefile
> index b76add422ac..f00f0b5f39c 100644
> --- patches/patch-tests_Makefile
> +++ patches/patch-tests_Makefile
> @@ -12,5 +12,5 @@ Index: tests/Makefile
> - -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings
> \
> + -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
> -Wredundant-decls -Wmissing-prototypes
> - CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
> - FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
> + CFLAGS += $(DEBUGFLAGS)
> + CPPFLAGS += $(MOREFLAGS)
>
Re: [maintainer update] herbstluftwm 0.9.2
On 2021/03/06 00:12, Lucas wrote: > For some reason, I'm getting a different PLIST after applying Florian's > patch, missing this: > > > -share/bash-completion/ > > -share/bash-completion/completions/ > > which sounds good for me, but explanations are appreciated. bash is a dependency, update-plist strips paths that come from a dep. committed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 05:01:31 Modified files: x11/herbstluftwm: Makefile distinfo x11/herbstluftwm/pkg: PLIST Log message: update to herbstluftwm-0.9.2, from maintainers, plus regen plist
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 04:59:59 Modified files: cad/magic : Makefile distinfo cad/magic/patches: patch-magic_proto_magicrc_in patch-scripts_configure cad/magic/pkg : PLIST Log message: update to magic-8.3.137, from maintainer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 04:59:50 Modified files: cad/netgen : Makefile distinfo cad/netgen/patches: patch-Makefile Log message: update to netgen-1.5.171, from maintainer
[UPDATE] cad/netgen 1.5.138p0 -> 1.5.171
Greetings, The attached diff updates cad/netgen to the latest version. What's new upstream === See [1] for a complete list. OpenBSD side, the most relevant change is the fix of a missing prototype for ReadVerilogFile function, that should unbreak the port for mips64 arch (see [2]). What's new in the port == Very trivial update (DISTNAME, distinfo and the result of 'make update-patches') All the best [1] http://opencircuitdesign.com/netgen/history.html [2] https://marc.info/?l=openbsd-ports=160303328223947=2 -- Alessandro De Laurenzis [mailto:jus...@atlantide.mooo.com] Web: http://www.atlantide.mooo.com LinkedIn: http://it.linkedin.com/in/delaurenzis Index: Makefile === RCS file: /cvs/ports/cad/netgen/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- Makefile 23 Feb 2021 19:39:10 - 1.8 +++ Makefile 6 Mar 2021 09:23:16 - @@ -1,9 +1,8 @@ # $OpenBSD: Makefile,v 1.8 2021/02/23 19:39:10 sthen Exp $ COMMENT = tool for netlist comparison (LVS) and format manipulation -DISTNAME = netgen-1.5.138 +DISTNAME = netgen-1.5.171 EXTRACT_SUFX = .tgz -REVISION = 0 CATEGORIES = cad Index: distinfo === RCS file: /cvs/ports/cad/netgen/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo 22 Feb 2020 11:37:16 - 1.2 +++ distinfo 6 Mar 2021 09:23:16 - @@ -1,2 +1,2 @@ -SHA256 (netgen-1.5.138.tgz) = ntRrH+USG0pPs/k7+1X7WiNIY8w1z6fG4WsimCPKiHg= -SIZE (netgen-1.5.138.tgz) = 522205 +SHA256 (netgen-1.5.171.tgz) = 9Gl/2K3dareh1eQgc/jDTWO9+lsDfiFxhGbLj8FE9hI= +SIZE (netgen-1.5.171.tgz) = 530218 Index: patches/patch-Makefile === RCS file: /cvs/ports/cad/netgen/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-Makefile --- patches/patch-Makefile 22 Feb 2020 11:37:17 - 1.2 +++ patches/patch-Makefile 6 Mar 2021 09:23:16 - @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.2 2020/02/2 Index: Makefile --- Makefile.orig +++ Makefile -@@ -14,12 +14,10 @@ include defs.mak +@@ -14,12 +14,10 @@ INSTALL_CAD_DIRS = lib doc all: $(ALL_TARGET) standard:
[UPDATE] cad/magic 8.2.190 -> 8.3.137
Greetings,
The attached diff updates cad/magic to the latest release.
What's new upstream
===
This is a big jump. For a complete changelog, see [1].
What's new in the port
==
Trivial update (DISTNAME, distinfo, results of 'make update-patches' and
new PLIST).
Slightly tested on amd64 only.
All the best
[1] http://opencircuitdesign.com/magic/history.html
--
Alessandro De Laurenzis
[mailto:jus...@atlantide.mooo.com]
Web: http://www.atlantide.mooo.com
LinkedIn: http://it.linkedin.com/in/delaurenzis
Index: Makefile
===
RCS file: /cvs/ports/cad/magic/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 8 Mar 2020 12:47:35 - 1.5
+++ Makefile 6 Mar 2021 10:45:24 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.5 2020/03/08 12:47:35 sthen Exp $
COMMENT = interactive system for VLSI circuit layouts
-DISTNAME = magic-8.2.190
+DISTNAME = magic-8.3.137
EXTRACT_SUFX = .tgz
CATEGORIES = cad
Index: distinfo
===
RCS file: /cvs/ports/cad/magic/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 8 Mar 2020 12:47:35 - 1.2
+++ distinfo 6 Mar 2021 10:45:24 -
@@ -1,2 +1,2 @@
-SHA256 (magic-8.2.190.tgz) = BWy27LRp60DPIR6976S2l18qdGeLNx0sL26ZJ2r6Axc=
-SIZE (magic-8.2.190.tgz) = 4031738
+SHA256 (magic-8.3.137.tgz) = lXHTB4JIPUUXohngkJ4IKsVIAOttOhuMDePx/JtVNKw=
+SIZE (magic-8.3.137.tgz) = 4064629
Index: patches/patch-magic_proto_magicrc_in
===
RCS file: /cvs/ports/cad/magic/patches/patch-magic_proto_magicrc_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-magic_proto_magicrc_in
--- patches/patch-magic_proto_magicrc_in 8 Mar 2020 12:47:36 - 1.1
+++ patches/patch-magic_proto_magicrc_in 6 Mar 2021 10:45:24 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-magic_proto_magicrc_in,v 1.1 2020/03/08 12:47:36 sthen Exp $
+$OpenBSD$
Index: magic/proto.magicrc.in
--- magic/proto.magicrc.in.orig
@@ -171,20 +171,7 @@ Index: magic/proto.magicrc.in
macro XK_KP_Delete "box size 0 0"
macro XK_KP_Insert "box size 4 4"
macro XK_KP_0 "box size 7 2"
-@@ -164,10 +164,10 @@ macro XK_KP_8 "stretch u 1"
- macro Shift_XK_KP_8 "stretch u 1"
- macro XK_8 "stretch u 1"
- macro XK_KP_Prior "move ne 1"
--# Scroll wheel bindings
-+/* # Scroll wheel bindings */
- macro XK_Pointer_Button4 "scroll u .05 w"
- macro XK_Pointer_Button5 "scroll d .05 w"
--# Quick macro function keys for scmos tech (X11 versions only)
-+/* # Quick macro function keys for scmos tech (X11 versions only) */
- macro XK_F1 "paint ndiff"
- macro XK_F2 "paint pdiff"
- macro XK_F3 "paint poly"
-@@ -182,9 +182,9 @@ macro XK_F11 "paint pc"
+@@ -184,9 +184,9 @@ macro XK_F11 "paint pc"
macro XK_F12 "paint via"
#endif /* (XLIB) */
#else /* USE_NEW_MACROS */
@@ -197,7 +184,7 @@ Index: magic/proto.magicrc.in
echo ""
macro s "select"
macro S "select more"
-@@ -230,12 +230,12 @@ imacro XK_semicolon ":"
+@@ -232,12 +232,12 @@ imacro XK_semicolon ":"
macro ^R "iroute route -dBox"
macro ^N "iroute route -dSelection"
#endif /* USE_NEW_MACROS */
@@ -212,7 +199,7 @@ Index: magic/proto.magicrc.in
macro Button1 "*bypass box move bl cursor"
macro Shift_Button1 "*bypass box corner bl cursor"
macro Button2 "*bypass paint cursor"
-@@ -246,7 +246,7 @@ macro Shift_Button3 "*bypass box move ur cursor"
+@@ -248,7 +248,7 @@ macro Shift_Button3 "*bypass box move ur cursor"
macro Control_Button1 "box move bl cursor"
macro Control_Button2 "paint cursor"
macro Control_Button3 "box corner ur cursor"
@@ -221,7 +208,7 @@ Index: magic/proto.magicrc.in
macro Button1 "box move bl cursor"
macro Shift_Button1 "box corner bl cursor"
macro Button2 "paint cursor"
-@@ -254,7 +254,7 @@ macro Shift_Button2 "erase cursor"
+@@ -256,7 +256,7 @@ macro Shift_Button2 "erase cursor"
macro Button3 "box corner ur cursor"
macro Shift_Button3 "box move ur cursor"
#endif /* (!MAGIC_WRAPPER) */
@@ -230,7 +217,7 @@ Index: magic/proto.magicrc.in
macro color Button1 "pushbutton left"
macro color Button2 "pushbutton middle"
macro color Button3 "pushbutton right"
-@@ -262,11 +262,11 @@ macro color u "undo"
+@@ -264,11 +264,11 @@ macro color u "undo"
macro color U "redo"
macro color plus "color next"
macro color minus "color last"
@@ -244,7 +231,7 @@ Index: magic/proto.magicrc.in
macro wind3d L "level up"
macro wind3d l "level down"
macro wind3d C "cif"
-@@ -294,15 +294,15 @@ macro wind3d XK_equal "view 0 0 -1 rel"
+@@ -296,15 +296,15 @@ macro wind3d XK_equal "view 0 0 -1 rel"
macro wind3d XK_greater "zoom 1 2.0 rel"
macro wind3d XK_less "zoom 1 0.5 rel"
#endif /* (XLIB) */
@@ -266,7 +253,7 @@ Index: magic/proto.magicrc.in
#ifdef MAGIC_WRAPPER
magic::suspendout
if {![catch {set Opts(tools)}]} { magic::enable_tools }
-@@ -311,11 +311,10 @@ set VDD "vdd!"
+@@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2021/03/06 03:48:34 Modified files: www/hugo : Makefile distinfo Log message: update of www/hugo to 0.81.0 ok rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/06 02:43:14 Modified files: databases/recoll: Makefile distinfo databases/recoll/patches: patch-Makefile_in databases/recoll/pkg: PLIST Log message: update to recoll-1.28.6, build recollq tool. ok aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/03/06 02:35:09 Modified files: net/bro: Makefile distinfo net/bro/patches: patch-auxil_broker_CMakeLists_txt patch-auxil_zeek-archiver_zeek-archiver_cc net/bro/pkg: PLIST Added files: net/bro/patches: patch-CMakeLists_txt patch-auxil_broker_caf_CMakeLists_txt patch-src_ScannedFile_cc patch-src_zeek_bif Removed files: net/bro/patches: patch-auxil_broker_caf_libcaf_core_CMakeLists_txt patch-auxil_broker_caf_libcaf_io_CMakeLists_txt patch-auxil_broker_caf_libcaf_openssl_CMakeLists_txt patch-auxil_libkqueue_test_test_c patch-src_iosource_Packet_cc Log message: Update to zeek-4.0.0 (LTS version). The issue with cluster mode is still present unfortunately...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/03/06 01:18:20 Modified files: devel/ophis: Makefile distinfo Log message: one newer commit...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/03/06 01:13:44 Modified files: games/stone-soup: Makefile distinfo games/stone-soup/patches: patch-source_Makefile games/stone-soup/pkg: PFRAG.no-no_x11 PLIST Log message: update to stone-soup 0.26.1 for python3 support
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/03/06 01:09:01 Modified files: sysutils/libvirt-python: Makefile distinfo Log message: Update to py3-libvirt-7.1.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/03/06 01:08:51 Modified files: sysutils/libvirt: Makefile distinfo sysutils/libvirt/patches: patch-meson_build sysutils/libvirt/pkg: PLIST Removed files: sysutils/libvirt/patches: patch-src_cpu_cpu_arm_c Log message: Update to libvirt-7.1.0.
