Re: UPDATE: libdvdread 6.0.2 / libdvdnav 6.0.1 / libdvdcss
ping ping. On 12/26/2019 12:11 AM, Kurt Mosiejczuk wrote: On Sun, Nov 24, 2019 at 01:47:47PM -0500, Brad Smith wrote: ping. On 11/2/2019 9:03 PM, Brad Smith wrote: Here is an update to libdvdread 6.0.2 / libdvdnav 6.0.1 and rolling in an snprintf conversion for libdvdcss from upstream. After installing these three updates, VLC still properly plays DVDs on my laptop. ok kmos --Kurt
Update: Python 3.7.6 -> 3.7.7
Straightforward point release of Python 3.7. Tests run the same as before. Little PLIST change, A conflict line moved and the usual line that has the full version number and patch level changed. cc maintainer ok? --Kurt
Re: mail/trojita: add patch from upstream
On Fri, Mar 13 2020, Caspar Schutijser wrote: > Hi ports@, > > I'd like to add the following patch from upstream to mail/trojita. It > fixes a crash that can occur when downloading an attachment in > combination with a recent version of Qt. > > Tested on amd64. Committed, thanks. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/13 19:17:13 Modified files: mail/trojita : Makefile Added files: mail/trojita/patches: patch-src_Imap_Network_FileDownloadManager_cpp Log message: Fix possible crash when downloading attachments frm maintainer Caspar Schutijser
Re: Unmaze Qt4 from x11/qwt
On Fri, Mar 13 2020, Rafael Sadowski wrote: > Is anyone willing to make x11/qwt qt5 only without -common etc.? The > difficult part is to set the right @pkgpath/@conflict.. foo and thus > enable a pkg_add update. > > No more customers available for the Qt4 (main) parts, only Qt5. Is that true? comms/gnuradio still depends on x11/qwt, default (qt4) flavor. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: CVS: cvs.openbsd.org: ports
On 2020/03/14 01:20, Jeremie Courreges-Anglas wrote: > On Fri, Mar 13 2020, Stuart Henderson wrote: > > On 2020/03/12 08:53, Raphael Graf wrote: > >> CVSROOT: /cvs > >> Module name: ports > >> Changes by:ra...@cvs.openbsd.org 2020/03/12 08:53:00 > >> > >> Modified files: > >>audio/vamp-plugin-sdk: Makefile distinfo > >>audio/vamp-plugin-sdk/patches: patch-Makefile_in > >> patch-pkgconfig_vamp-hostsdk_pc_in > >>audio/vamp-plugin-sdk/pkg: PLIST > >> > >> Log message: > >> update to vamp-plugin-sdk-2.9.0, help and ok jca@ > >> > > > > configure: error: libsndfile not found - cannot build example Vamp host! > > Thanks, and sorry for missing this. I just moved libsndfile to > BUILD_DEPENDS, it's only used to build the test program. > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE Thanks :)
Re: [NEW] net/anondate
Hello, I have another release update before the port is commited. Looked into OpenBSD ports some more and made a few changes: - Got rid of the post-install target. Example configuration is now installed by default in the "make install" phase. - Init script now fails if config file is invalid. - A few small security improvements. There are no other glaring issues with the port as far as I can see. Here is a newer diff for user.list: Index: infrastructure/db/user.list === RCS file: /cvs/ports/infrastructure/db/user.list,v retrieving revision 1.361 diff -u -p -r1.361 user.list --- infrastructure/db/user.list 11 Mar 2020 12:22:51 - 1.361 +++ infrastructure/db/user.list 12 Mar 2020 16:02:08 - @@ -358,3 +358,4 @@ id usergroup port 848 _loki _loki sysutils/loki 849 _synapse _synapsenet/synapse 850 _snare _snare devel/snare +851 _anondate _anondate net/anondate anondate.tar.gz Description: application/tar-gz
Re: update: math/libcerf and math/gnuplot
On Fri, Mar 13 2020, Paul Irofti wrote:
> Hi,
>
> Thank you for your effort! I have a few comments and questions.
I got curious about this proposal, mostly because of the COMPILER line
change.
> I see they switched to Gitlab (hence the url changes) and that the
> author set it up for continous integration and thus made it compile with
> clang.
>
> Why did you bump the major. I tried browsing the history on Gitlab to
> see what changed in the API, but couldn't see much. I am sure I missed
> something.
As shown by /usr/src/lib/check_sym ("No dynamic export changes"), and
a diff of the installed include file, the shared lib version bump
appears unnecessary.
> Is the gnuplot bump necessary? Why?
Maybe Yozo found it useful for testing, but it doesn't seem useful for
the ports tree.
The updated diff below has been stripped from the items that
I mentioned. It also updates WANTLIB, no need for COMPILER_LIBCXX since
this is a C-only port. Builds fine on sparc64 along with
gnuplot,no_x11. Paul, feel free to use the diff below.
Index: Makefile
===
RCS file: /cvs/ports/math/libcerf/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile12 Jul 2019 20:47:42 - 1.5
+++ Makefile14 Mar 2020 00:23:15 -
@@ -2,26 +2,24 @@
COMMENT = implementation of complex error functions
-V =1.11
-DISTNAME = libcerf-${V}
+V =1.13
+DISTNAME = libcerf-v${V}
+PKGNAME = libcerf-${V}
EXTRACT_SUFX = .tgz
CATEGORIES = math
-MASTER_SITES = http://apps.jcns.fz-juelich.de/src/libcerf/
-REVISION = 0
+MASTER_SITES = https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${V}/
-SHARED_LIBS += cerf 2.0 # 1.10
+SHARED_LIBS += cerf 2.0 # 1.13
-HOMEPAGE = http://apps.jcns.fz-juelich.de/doku/sc/libcerf
+HOMEPAGE = https://jugit.fz-juelich.de/mlz/libcerf/
MAINTAINER = Paul Irofti
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB += c m ${COMPILER_LIBCXX}
+WANTLIB += m
MODULES = devel/cmake
-
-COMPILER = ports-gcc # imaginary constants are a GNU extension
.include
Index: distinfo
===
RCS file: /cvs/ports/math/libcerf/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo29 Dec 2018 07:48:36 - 1.3
+++ distinfo14 Mar 2020 00:23:15 -
@@ -1,2 +1,2 @@
-SHA256 (libcerf-1.11.tgz) = cBAcrEoNeGMyLU0Gz5XFB6nP1k/JmtGzGoQlIEz9lnI=
-SIZE (libcerf-1.11.tgz) = 60066
+SHA256 (libcerf-v1.13.tgz) = 5Gmfga+Diu9bPncgn+yOmCCk9JLVmPtaBwgAhUl2owU=
+SIZE (libcerf-v1.13.tgz) = 60732
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: CVS: cvs.openbsd.org: ports
On Fri, Mar 13 2020, Stuart Henderson wrote: > On 2020/03/12 08:53, Raphael Graf wrote: >> CVSROOT: /cvs >> Module name: ports >> Changes by: ra...@cvs.openbsd.org 2020/03/12 08:53:00 >> >> Modified files: >> audio/vamp-plugin-sdk: Makefile distinfo >> audio/vamp-plugin-sdk/patches: patch-Makefile_in >> patch-pkgconfig_vamp-hostsdk_pc_in >> audio/vamp-plugin-sdk/pkg: PLIST >> >> Log message: >> update to vamp-plugin-sdk-2.9.0, help and ok jca@ >> > > configure: error: libsndfile not found - cannot build example Vamp host! Thanks, and sorry for missing this. I just moved libsndfile to BUILD_DEPENDS, it's only used to build the test program. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/13 18:18:25 Modified files: audio/vamp-plugin-sdk: Makefile Log message: This now requires libsndfile at build time just to build the test program Spotted by sthen@
Re: fix audio/mumble remove jack and add portaudio
On Thu, Mar 12 2020, Nam Nguyen wrote:
> Rafael Sadowski writes:
>
>> Fixed that issue and also added jack as a dependency.
>
> Here is a diff for audio/mumble that:
> - Removes jack.
> - Returns to portaudio-svn by bringing back a reduced patch from the
> attic.
>
> The patch is reduced because data collection is opt-in during audio
> wizard setup, the protobuf fix was added upstream, and text-to-speech
> does not work anyways. Audio wizard still crashes without this patch
> (https://github.com/mumble-voip/mumble/issues/1138).
>
> I tested for several hours tonight, and it seems much more stable. I did
> manage to crash it once when setting input shortcuts.
>
> I see that jakemsr@ wrote the sndio backend for jack, which was added
> upstream to jack. I propose keeping portaudio until sndio itself is
> added or the sndio backend for jack is fixed. The drawback is that this
> pull request mentions that PortAudio is "practically unmaintained."
>
> WIP sndio (2016): https://github.com/mumble-voip/mumble/pull/2676
>
> Feedback and tests are welcome.
Committed, thanks. jack output proved itself unreliable after a few
minutes of testing. I have also added a debug-mumble package since
I hit a crash I could not reproduce.
> Bug report:
>
> After 5-10 minutes mumble becomes unresponsive to my push-to-talk key
> and fails to receive audio from other users. Then I have to restart
> mumble and sndiod. It is hard to reproduce, but I managed to find a way
> that involves restarting mumble repeatedly. It usually triggers within
> 10 starts of mumble.
>
> 1. restart sndiod
> /etc/rc.d/sndiod restart
> 2. Start jackd: jackd -d sndio
> 3. Use mpv and youtube-dl on a youtube video
> 4. Start mumble
> 5. Keep restarting mumble until you see
> - mumble: "zombified - calling shutdown handler"
Spotted on my 2nd mumble run, no standalone jackd running, no need for
another program like mpv using sndiod.
> - jackd: "subgraph starting at mumble timed out (subgraph_wait_fd=9,
> status = 0, state = Running, pollret = 0 revents = 0x0)"
> 6. Once you see zombified, connect to a mumble server and try to input
> voice. It will not register the input.
>
> I also sometimes get in the jackd log:
> sndio_driver: poll() error: sndio_driver.c@422
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/mumble/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- Makefile 6 Mar 2020 12:00:09 - 1.37
> +++ Makefile 12 Mar 2020 07:21:18 -
> @@ -3,6 +3,7 @@
> COMMENT =low-latency voice chat client
>
> DISTNAME = mumble-1.3.0
> +REVISION = 0
>
> CATEGORIES = audio
>
> @@ -15,8 +16,8 @@ EXTRACT_SUFX = .zip
> PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network
> -WANTLIB += Qt5Sql Qt5Svg Qt5Widgets Qt5Xml X11 Xi c crypto jack
> -WANTLIB += m opus protobuf sndfile speex speexdsp ssl
> +WANTLIB += Qt5Sql Qt5Svg Qt5Widgets Qt5Xml X11 Xi c crypto
> +WANTLIB += m opus portaudio protobuf sndfile speex speexdsp ssl
>
> MODULES =devel/qmake x11/qt5
> SEPARATE_BUILD = No
> @@ -26,7 +27,7 @@ BUILD_DEPENDS = audio/celt07 \
>
> LIB_DEPENDS =audio/libsndfile>=1.0.25p0 \
> audio/opus \
> - audio/jack \
> + audio/portaudio-svn \
> audio/speex \
> devel/protobuf \
> x11/qt5/qtsvg
> @@ -49,6 +50,7 @@ MODQMAKE_ARGS = MUMBLE_PREFIX=${PREFIX}
> CONFIG+=no-crash-report \
> CONFIG+=no-embed-qt-translations \
> CONFIG+=no-g15 \
> + CONFIG+=no-jackaudio \
> CONFIG+=no-oss \
> CONFIG+=no-overlay \
> CONFIG+=no-pulseaudio \
> @@ -56,6 +58,7 @@ MODQMAKE_ARGS = MUMBLE_PREFIX=${PREFIX}
> CONFIG+=no-speechd \
> CONFIG+=no-update \
> CONFIG+=packaged \
> + CONFIG+=portaudio \
> CONFIG+=release \
> DEFINES+="LOCALE_PATH=${PREFIX}/share/mumble/locale" \
> DEFINES+="PLUGIN_PATH=${PREFIX}/lib/mumble"
> Index: patches/patch-src_mumble_AudioWizard_cpp
> ===
> RCS file: patches/patch-src_mumble_AudioWizard_cpp
> diff -N patches/patch-src_mumble_AudioWizard_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_mumble_AudioWizard_cpp 12 Mar 2020 07:21:18 -
> @@ -0,0 +1,25 @@
> +$OpenBSD: patch-src_mumble_AudioWizard_cpp,v 1.3 2019/08/05 17:42:40 sthen
> Exp $
> +
> +There's a convoluted threading issue: in PAAudio.cpp, around line 338,
> +it will get caught in an infinite loop. It relies on the
Re: CVS: cvs.openbsd.org: ports
On 2020/03/12 08:53, Raphael Graf wrote: > CVSROOT: /cvs > Module name: ports > Changes by: ra...@cvs.openbsd.org 2020/03/12 08:53:00 > > Modified files: > audio/vamp-plugin-sdk: Makefile distinfo > audio/vamp-plugin-sdk/patches: patch-Makefile_in > patch-pkgconfig_vamp-hostsdk_pc_in > audio/vamp-plugin-sdk/pkg: PLIST > > Log message: > update to vamp-plugin-sdk-2.9.0, help and ok jca@ > configure: error: libsndfile not found - cannot build example Vamp host!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/13 17:31:22 Modified files: audio/mumble : Makefile Added files: audio/mumble/patches: patch-src_mumble_AudioWizard_cpp Log message: Switch back to portaudio, jack output is unreliable Report and fix from Nam Nguyen. While here, provide debug-mumble.
Re: games/supertuxcart add Gamepad/Joystick support
Hi,
ping, anyone gaming?
patch reattached for convenience.
cheers,
Sebastian
Am Dienstag, März 10, 2020 20:47 CET, schrieb "Sebastian Reitenbach"
:
> Hi,
>
> attached patch switches the backend from LinuxX11 to SDL, and enables
> joystick support.
> With the LinuxX11 backend, it's not possible to enable Joystick/Gamepad
> support, since it
> relies on Linuxism (include linux/joystick.h etc.)
>
> Switching to SDL backend, allows me to play with two GamePads Logitech F310
> to have
> a nice race against each other.
>
> comments, tests, yay, nay, or even OK welcome ;)
>
> cheers,
> Sebastian
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/supertuxkart/Makefile,v
> retrieving revision 1.29
> diff -u -r1.29 Makefile
> --- Makefile 12 Jul 2019 20:46:25 - 1.29
> +++ Makefile 10 Mar 2020 19:46:59 -
> @@ -8,7 +8,7 @@
> BASENAME = supertuxkart-${V}
> DISTNAME = ${BASENAME}-src
> PKGNAME =${BASENAME}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = games
>
> @@ -20,7 +20,7 @@
> PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} GL X11 Xrandr c curl freetype jpeg
> -WANTLIB += m ogg openal png vorbis vorbisenc vorbisfile z
> +WANTLIB += m ogg openal png vorbis vorbisenc vorbisfile z SDL
>
> MASTER_SITES =
> ${MASTER_SITE_SOURCEFORGE:=supertuxkart/SuperTuxKart/}
> EXTRACT_SUFX = .tar.xz
> @@ -31,6 +31,7 @@
> RUN_DEPENDS =devel/desktop-file-utils
> LIB_DEPENDS =audio/openal>=0.0.8p7 \
> audio/libvorbis \
> + devel/sdl \
> net/curl \
> graphics/png \
> graphics/jpeg
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-CMakeLists_txt 10 Mar 2020 19:46:59 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> CMakeLists.txt
> +@@ -416,6 +416,7 @@ target_link_libraries(supertuxkart
> + ${JPEG_LIBRARIES}
> + ${TURBOJPEG_LIBRARY}
> + #${VPX_LIBRARIES}
> ++SDL
> + )
> +
> + if(NOT SERVER_ONLY)
> Index: patches/patch-lib_irrlicht_CMakeLists_txt
> ===
> RCS file:
> /cvs/ports/games/supertuxkart/patches/patch-lib_irrlicht_CMakeLists_txt,v
> retrieving revision 1.4
> diff -u -r1.4 patch-lib_irrlicht_CMakeLists_txt
> --- patches/patch-lib_irrlicht_CMakeLists_txt 27 Nov 2017 15:45:19 -
> 1.4
> +++ patches/patch-lib_irrlicht_CMakeLists_txt 10 Mar 2020 19:46:59 -
> @@ -13,12 +13,3 @@
> if(CMAKE_COMPILER_IS_GNUCC)
> set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexpensive-optimizations")
> endif()
> -@@ -86,7 +86,7 @@ if(USE_GLES2)
> - add_definitions(-D_IRR_COMPILE_WITH_OGLES2_
> -DNO_IRR_COMPILE_WITH_OPENGL_)
> - endif()
> -
> --if(CYGWIN)
> -+if(NOT LINUX)
> - add_definitions(-DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
> - endif()
> -
> Index: patches/patch-lib_irrlicht_include_IrrCompileConfig_h
> ===
> RCS file: patches/patch-lib_irrlicht_include_IrrCompileConfig_hdiff -N
> patches/patch-lib_irrlicht_include_IrrCompileConfig_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-lib_irrlicht_include_IrrCompileConfig_h 10 Mar 2020
> 19:46:59 -
> @@ -0,0 +1,26 @@
> +$OpenBSD$
> +
> +We want Joystick events, so have to use
> +SDL instead of X11 backend for Irrlicht
> +
> +Index: lib/irrlicht/include/IrrCompileConfig.h
> +--- lib/irrlicht/include/IrrCompileConfig.h.orig
> lib/irrlicht/include/IrrCompileConfig.h
> +@@ -44,7 +44,7 @@
> +
> +
> + //! Uncomment this line to compile with the SDL device
> +-//#define _IRR_COMPILE_WITH_SDL_DEVICE_
> ++#define _IRR_COMPILE_WITH_SDL_DEVICE_
> + #ifdef NO_IRR_COMPILE_WITH_SDL_DEVICE_
> + #undef _IRR_COMPILE_WITH_SDL_DEVICE_
> + #endif
> +@@ -111,7 +111,7 @@
> + #define _IRR_LINUX_PLATFORM_
> + #endif
> + #define _IRR_POSIX_API_
> +-#define _IRR_COMPILE_WITH_X11_DEVICE_
> ++//#define _IRR_COMPILE_WITH_X11_DEVICE_
> + //#define _IRR_COMPILE_WITH_WAYLAND_DEVICE_
> + #endif
> +
> Index: patches/patch-lib_irrlicht_source_Irrlicht_CIrrDeviceSDL_cpp
> ===
> RCS file: patches/patch-lib_irrlicht_source_Irrlicht_CIrrDeviceSDL_cpp
> diff -N patches/patch-lib_irrlicht_source_Irrlicht_CIrrDeviceSDL_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-lib_irrlicht_source_Irrlicht_CIrrDeviceSDL_cpp 10 Mar
> 2020 19:46:59 -
> @@ -0,0 +1,85 @@
> +$OpenBSD$
> +
> +Index: lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp
> +---
Re: Add joystick/gamecontroller support to multimedia/sfml
Hi,
ping, anyone gaming?
patches reattached for convenience.
cheers,
Sebastian
Am Montag, März 09, 2020 23:42 CET, schrieb "Sebastian Reitenbach"
:
> Hi,
>
> attached patch adds gamecontroller support for multimedia/sfml.
>
> My first attempt was to just enable the FreeBSD driver, with that, it detected
> my gamepads, however, no buttons, axis, hat, etc. worked.
>
> Then I looked at how the SDLs do it, adapted their logic, and finally, all
> the buttons,
> axis, hats now seem to do what they're supposed to.
>
> Tested with witchblast (buttons and hat), and extremetuxracer (analog
> joystick).
> Both games tested with Logitec F310 game controllers. Other ports depending on
> sfml don't seem to make use of its joystick/gamecontroller support.
>
> However, witchblast needs a patch (find it attached), otherwise in joystick
> configuration
> menu, it would take a button release as a valid input. No idea how it's
> supposed to work
> with other OSs joystick implementations from sfml without that patch.
>
> test reports, OKs, critics, anything welcome ;)
>
> cheers,
> Sebastian
? diff
? out
? sfml
? sfml-joystick-support.diff
Index: Makefile
===
RCS file: /cvs/ports/multimedia/sfml/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 12 Jul 2019 20:47:58 - 1.10
+++ Makefile 9 Mar 2020 22:09:10 -
@@ -6,7 +6,7 @@
DISTNAME = SFML-${V}-sources
PKGNAME = sfml-${V}
EXTRACT_SUFX = .zip
-REVISION = 1
+REVISION = 2
SHARED_LIBS += sfml-audio1.0 # 2.1
SHARED_LIBS += sfml-graphics 1.0 # 2.1
@@ -24,7 +24,7 @@
PERMIT_PACKAGE = Yes
WANTLIB += FLAC GL X11-xcb freetype jpeg m ogg openal vorbis vorbisenc
-WANTLIB += vorbisfile xcb xcb-image xcb-randr ${COMPILER_LIBCXX}
+WANTLIB += vorbisfile xcb xcb-image xcb-randr usbhid ${COMPILER_LIBCXX}
MASTER_SITES = https://www.sfml-dev.org/files/
@@ -51,6 +51,8 @@
post-extract:
find ${WRKSRC} -type f -exec perl -pi -e 's/\015//g' {} \;
+ mkdir ${WRKSRC}/src/SFML/Window/OpenBSD
+ cp ${FILESDIR}/JoystickImpl.* ${WRKSRC}/src/SFML/Window/OpenBSD
post-install:
find ${PREFIX}/include -name '*.orig' -exec rm {} \;
Index: files/JoystickImpl.cpp
===
RCS file: files/JoystickImpl.cpp
diff -N files/JoystickImpl.cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/JoystickImpl.cpp 9 Mar 2020 22:09:10 -
@@ -0,0 +1,443 @@
+
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2016 Laurent Gomila (laur...@sfml-dev.org)
+// 2013-2013 David Demelier (demelier.da...@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//you must not claim that you wrote the original software.
+//If you use this software in a product, an acknowledgment
+//in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+
+
+
+// Headers
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+
+/// \brief This file implements OpenBSD driver joystick
+///
+/// It has been tested on a Logitech F310 in gamepad and
+/// joystick mode.
+///
+
+
+#define HUG_DPAD_UP 0x90
+#define HUG_DPAD_DOWN 0x91
+#define HUG_DPAD_RIGHT 0x92
+#define HUG_DPAD_LEFT 0x93
+
+#define HAT_CENTERED0x00
+#define HAT_UP 0x01
+#define HAT_RIGHT 0x02
+#define HAT_DOWN0x04
+#define HAT_LEFT0x08
+#define HAT_RIGHTUP (HAT_RIGHT|HAT_UP)
+#define HAT_RIGHTDOWN (HAT_RIGHT|HAT_DOWN)
+#define HAT_LEFTUP (HAT_LEFT|HAT_UP)
+#define HAT_LEFTDOWN(HAT_LEFT|HAT_DOWN)
+
+/* calculate the value from the state of the dpad */
+int
+dpad_to_sfml(int32_t *dpad)
+{
+if (dpad[2]) {
+if (dpad[0])
+return HAT_RIGHTUP;
+else if (dpad[1])
+return HAT_RIGHTDOWN;
+else
+return HAT_RIGHT;
+}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/13 15:08:23 Modified files: sysutils/beats/filebeat: Makefile distinfo Log message: Update filebeat 7.6.0 -> 7.6.1 Relase notes: https://www.elastic.co/guide/en/beats/libbeat/7.6/release-notes-7.6.1.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/13 15:05:04 Modified files: sysutils/logstash: Makefile distinfo sysutils/logstash/pkg: PLIST Log message: Update logstash 7.6.0 -> 7.6.1 Relase notes: https://www.elastic.co/guide/en/logstash/7.6/logstash-7-6-1.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/13 15:01:21 Modified files: www/kibana : Makefile distinfo www/kibana/patches: patch-package_json www/kibana/pkg : PLIST Log message: Update kibana 7.6.0 -> 7.6.1 Relase notes: https://www.elastic.co/guide/en/kibana/7.6/release-notes-7.6.1.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/13 14:59:21 Modified files: textproc/elasticsearch: Makefile distinfo Log message: Update elasticsearch 7.6.0 -> 7.6.1 Relase notes: https://www.elastic.co/guide/en/elasticsearch/reference/7.6/release-notes-7.6.1.html No PLIST change.
Unmaze Qt4 from x11/qwt
Is anyone willing to make x11/qwt qt5 only without -common etc.? The difficult part is to set the right @pkgpath/@conflict.. foo and thus enable a pkg_add update. No more customers available for the Qt4 (main) parts, only Qt5. I'm looking forward to test diff. Rafael Sadowski
Re: audio/gqmpeg: add sndio volume backend and fixes crashes
On Sun Mar 08, 2020 at 04:45:44PM +0100, Alexandre Ratchov wrote:
> This diff makes gqmpeg use sndio to display and control the
> volume. This fixes the crash when the volume slider is touched. As a
> side effect, this makes gqmpeg use the right device (one that's
> playing) and nicely updates the slider position when other programs
> change the master volume.
>
> OK?
OK rsadowski@
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/gqmpeg/Makefile,v
> retrieving revision 1.64
> diff -u -p -r1.64 Makefile
> --- Makefile 12 Jul 2019 20:43:33 - 1.64
> +++ Makefile 8 Mar 2020 15:39:53 -
> @@ -3,7 +3,7 @@
> COMMENT= front-end to various audio players
>
> DISTNAME=gqmpeg-0.91.1
> -REVISION=14
> +REVISION=15
> CATEGORIES= audio
>
> HOMEPAGE=http://gqmpeg.sourceforge.net/
> Index: patches/patch-src_Makefile_in
> ===
> RCS file: patches/patch-src_Makefile_in
> diff -N patches/patch-src_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Makefile_in 8 Mar 2020 15:39:53 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/Makefile.in
> +--- src/Makefile.in.orig
> src/Makefile.in
> +@@ -342,7 +342,7 @@ gqmpeg_SOURCES = \
> + $(module_mpg123) $(module_xmp) $(module_ogg123) $(module_radio)
> +
> +
> +-gqmpeg_LDADD = $(GTK_LIBS) $(LIBPNG)
> ++gqmpeg_LDADD = $(GTK_LIBS) $(LIBPNG) -lsndio
> +
> + EXTRA_DIST = \
> + $(extra_SLIK) \
> Index: patches/patch-src_mixer_c
> ===
> RCS file: /cvs/ports/audio/gqmpeg/patches/patch-src_mixer_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_mixer_c
> --- patches/patch-src_mixer_c 14 Oct 2007 14:12:42 - 1.2
> +++ patches/patch-src_mixer_c 8 Mar 2020 15:39:53 -
> @@ -1,39 +1,288 @@
> $OpenBSD: patch-src_mixer_c,v 1.2 2007/10/14 14:12:42 jasper Exp $
> src/mixer.c.orig Tue Sep 10 16:16:26 2002
> -+++ src/mixer.c Sun Oct 14 15:47:27 2007
> -@@ -285,7 +285,11 @@ void mixer_init(gint init_device_id)
> -
> - mixer_device = getenv("MIXERDEVICE");
> - if (mixer_device == NULL)
> -+#ifdef __OpenBSD__
> -+mixer_device = "/dev/mixer";
> -+#else
> - mixer_device = "/dev/mixer0";
> -+#endif
> +Index: src/mixer.c
> +--- src/mixer.c.orig
> src/mixer.c
> +@@ -39,10 +39,16 @@
> + #include
> + #endif
>
> - if ((fd = open(mixer_device, O_RDWR)) == -1) {
> - perror(mixer_device);
> -@@ -362,7 +366,11 @@ static void mixer_set_vol(DeviceData *device, gint vol
> -
> - mixer_device = getenv("MIXERDEVICE");
> - if (mixer_device == NULL)
> -+#ifdef __OpenBSD__
> -+mixer_device = "/dev/mixer";
> -+#else
> - mixer_device = "/dev/mixer0";
> -+#endif
> +-#if defined(__NetBSD__) || defined(__OpenBSD__)
> ++#if defined(__NetBSD__)
> + #include
> + #endif
>
> - if ((fd = open(mixer_device, O_RDWR)) == -1) {
> - perror(mixer_device);
> -@@ -406,7 +414,11 @@ static gint mixer_get_vol(DeviceData *device)
> -
> - mixer_device = getenv("MIXERDEVICE");
> - if (mixer_device == NULL)
> -+#ifdef __OpenBSD__
> -+mixer_device = "/dev/mixer";
> -+#else
> - mixer_device = "/dev/mixer0";
> ++#if defined(__OpenBSD__)
> ++#include
> ++#include
> ++#include "display.h"
> +#endif
> ++
> + #if defined(sun) && defined(__svr4__)
> + #include
> + #endif
> +@@ -267,11 +273,11 @@ static gint mixer_get_vol(DeviceData *device)
> +
> + /*
> + *
> +- * NetBSD and OpenBSD
> ++ * NetBSD
> + *
> + */
> +
> +-#elif defined(__NetBSD__) || defined(__OpenBSD__)
> ++#elif defined(__NetBSD__)
> +
> + mixer_devinfo_t *infos;
> + mixer_ctrl_t *values;
> +@@ -442,6 +448,242 @@ static gint mixer_get_vol(DeviceData *device)
> +
> + /*
> + *
> ++ * OpenBSD
> ++ *
> ++ */
> ++
> ++#elif defined(__OpenBSD__)
> ++
> ++struct control {
> ++struct control *next;
> ++unsigned int addr;
> ++unsigned int max, value;
> ++};
> ++
> ++static struct control *controls;
> ++static struct sioctl_hdl *hdl;
> ++static struct pollfd *pfds;
> ++static int initialized;
> ++
> ++/*
> ++ * new control registered
> ++ */
> ++static void ondesc(void *unused, struct sioctl_desc *d, int val)
> ++{
> ++struct control *i, **pi;
> ++
> ++if (d == NULL)
> ++return;
> ++
> ++/*
> ++ * delete existing control with the same address
> ++ */
> ++for (pi = (i = *pi) != NULL; pi = >next) {
> ++if (d->addr == i->addr) {
> ++*pi = i->next;
> ++free(i);
> ++break;
> ++
mail/trojita: add patch from upstream
Hi ports@,
I'd like to add the following patch from upstream to mail/trojita. It
fixes a crash that can occur when downloading an attachment in
combination with a recent version of Qt.
Tested on amd64.
Thanks,
Caspar Schutijser
Index: Makefile
===
RCS file: /cvs/ports/mail/trojita/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile28 Feb 2020 19:30:31 - 1.32
+++ Makefile13 Mar 2020 20:27:37 -
@@ -3,7 +3,7 @@
COMMENT = fast Qt IMAP e-mail client
DISTNAME = trojita-0.7
-REVISION = 10
+REVISION = 11
SHARED_LIBS = trojita_plugins 2.0 # 2.0
Index: patches/patch-src_Imap_Network_FileDownloadManager_cpp
===
RCS file: patches/patch-src_Imap_Network_FileDownloadManager_cpp
diff -N patches/patch-src_Imap_Network_FileDownloadManager_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Imap_Network_FileDownloadManager_cpp 13 Mar 2020
20:27:37 -
@@ -0,0 +1,45 @@
+$OpenBSD$
+
+https://cgit.kde.org/trojita.git/commit/?id=cf2364b80fa8ae844df8350cd5833d47cce235f2
+
+commit cf2364b80fa8ae844df8350cd5833d47cce235f2
+Author: Jan Kundrát
+Date: Mon Mar 9 08:24:48 2020 -0700
+
+Fix possible crash when downloading attachments
+
+Turns out we've been happily deleting network replies from the
+QNetworkReply::finished(). That was never a good thing to do, but it did
+not use to crash with older Qt. Now it does.
+
+[...]
+
+Index: src/Imap/Network/FileDownloadManager.cpp
+--- src/Imap/Network/FileDownloadManager.cpp.orig
src/Imap/Network/FileDownloadManager.cpp
+@@ -139,7 +139,9 @@ void FileDownloadManager::downloadMessage()
+
+ void FileDownloadManager::onPartDataTransfered()
+ {
+-Q_ASSERT(reply);
++if (!reply) {
++return;
++}
+ if (reply->error() == QNetworkReply::NoError) {
+ if (!saving.open(QIODevice::WriteOnly)) {
+ emit transferError(saving.errorString());
+@@ -192,11 +194,11 @@ void FileDownloadManager::onCombinerTransferError(cons
+
+ void FileDownloadManager::deleteReply(QNetworkReply *reply)
+ {
+-if (reply == this->reply) {
++if (reply && reply == this->reply) {
+ if (!saved)
+ onPartDataTransfered();
+-delete reply;
+-this->reply = 0;
++reply->deleteLater();
++this->reply = nullptr;
+ }
+ }
+
Re: x11/i3status: add sndio volume backend
On Sun Mar 08, 2020 at 04:38:31PM +0100, Alexandre Ratchov wrote:
> This makes i3status display sndiod master volume knob. This makes it
> work by default with any audio device, including USB ones with no
> volume controls.
>
> OK?
OK rsadowski@, works fine here and helps me for my daily use.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/i3status/Makefile,v
> retrieving revision 1.58
> diff -u -p -r1.58 Makefile
> --- Makefile 27 Sep 2019 20:33:22 - 1.58
> +++ Makefile 8 Mar 2020 15:33:22 -
> @@ -5,7 +5,7 @@ ONLY_FOR_ARCHS= ${APM_ARCHS}
> COMMENT= generate a statusbar for use with i3/xmobar/dzen2
>
> DISTNAME=i3status-2.13
> -REVISION=1
> +REVISION=2
> CATEGORIES= x11 sysutils
>
> HOMEPAGE=https://i3wm.org/i3status/
> @@ -28,7 +28,9 @@ BUILD_DEPENDS= textproc/asciidoc>=8.6.8
> LIB_DEPENDS= devel/libconfuse \
> devel/libyajl
>
> -CONFIGURE_STYLE =gnu
> +AUTOCONF_VERSION = 2.69
> +AUTOMAKE_VERSION = 1.16
> +CONFIGURE_STYLE =autoreconf
> SEPARATE_BUILD = Yes
>
> FAKE_FLAGS +=sysconfdir=${PREFIX}/share/examples/i3status/
> Index: patches/patch-Makefile_am
> ===
> RCS file: patches/patch-Makefile_am
> diff -N patches/patch-Makefile_am
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Makefile_am 8 Mar 2020 15:33:22 -
> @@ -0,0 +1,37 @@
> +$OpenBSD$
> +
> +Index: Makefile.am
> +--- Makefile.am.orig
> Makefile.am
> +@@ -1,5 +1,3 @@
> +-@CODE_COVERAGE_RULES@
> +-
> + echo-version:
> + @echo "@I3STATUS_VERSION@"
> +
> +@@ -30,6 +28,7 @@ i3status_CFLAGS = \
> + $(PULSE_CFLAGS) \
> + $(NLGENL_CFLAGS) \
> + $(ALSA_CFLAGS) \
> ++$(SNDIO_CFLAGS) \
> + $(PTHREAD_CFLAGS)
> +
> + i3status_CPPFLAGS = \
> +@@ -42,6 +41,7 @@ i3status_LDADD = \
> + $(PULSE_LIBS) \
> + $(NLGENL_LIBS) \
> + $(ALSA_LIBS) \
> ++$(SNDIO_LIBS) \
> + $(PTHREAD_LIBS)
> +
> + i3status_SOURCES = \
> +@@ -69,7 +69,8 @@ i3status_SOURCES = \
> + src/print_wireless_info.c \
> + src/print_file_contents.c \
> + src/process_runs.c \
> +-src/pulse.c
> ++src/pulse.c \
> ++src/sndio.c
> +
> + dist_sysconf_DATA = \
> + i3status.conf
> Index: patches/patch-Makefile_in
> ===
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- patches/patch-Makefile_in 6 Jul 2019 20:20:27 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-Makefile_in,v 1.1 2019/07/06 20:20:27 jasper Exp $
> -
> -The CODE_COVERAGE_RULES fragment contains an unmatched "if" clause.
> -
> -Index: Makefile.in
> Makefile.in.orig
> -+++ Makefile.in
> -@@ -1851,7 +1851,6 @@ uninstall-man: uninstall-man1
> -
> - .PRECIOUS: Makefile
> -
> --@CODE_COVERAGE_RULES@
> -
> - echo-version:
> - @echo "@I3STATUS_VERSION@"
> Index: patches/patch-configure_ac
> ===
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-configure_ac8 Mar 2020 15:33:22 -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +Index: configure.ac
> +--- configure.ac.orig
> configure.ac
> +@@ -91,6 +91,13 @@ case $host_os in
> + ;;
> + esac
> +
> ++# if sndio is available, define USE_SNDIO
> ++AC_CHECK_HEADER(sndio.h,
> ++[AC_CHECK_LIB([sndio], [sio_open], [
> ++AC_SUBST(SNDIO_LIBS, "-lsndio")
> ++AC_DEFINE([USE_SNDIO], [], [Use sndio])
> ++], [])], [])
> ++
> + dnl TODO: check for libbsd for GNU/kFreeBSD
> +
> + # Checks for programs.
> Index: patches/patch-include_i3status_h
> ===
> RCS file: patches/patch-include_i3status_h
> diff -N patches/patch-include_i3status_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-include_i3status_h 8 Mar 2020 15:33:22 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: include/i3status.h
> +--- include/i3status.h.orig
> include/i3status.h
> +@@ -232,6 +232,7 @@ int volume_pulseaudio(uint32_t sink_idx, const char *s
> + bool description_pulseaudio(uint32_t sink_idx, const char *sink_name, char
> buffer[MAX_SINK_DESCRIPTION_LEN]);
> + bool pulse_initialize(void);
> + void print_file_contents(yajl_gen json_gen, char *buffer, const char
> *title, const char *path, const char *format, const char *format_bad, const
> int max_chars);
> ++int volume_sndio(void);
> +
> + /* socket file descriptor for general purposes */
> + extern int general_socket;
> Index: patches/patch-src_print_volume_c
> ===
> RCS file:
Re: sysutils/tray-app: use sndio
On Sun Mar 08, 2020 at 04:32:49PM +0100, Alexandre Ratchov wrote:
> This diff switches sysutils/tray-app to the new audio control API. Now
> the programm displays and controls the sndiod master volume knob. This
> has two advantages:
>
> - tray-app now works on any device, including those with no volume
> controls.
>
> - in case there are multiple audio devices, tray-app won't pick the
> wrong one anymore
>
> OK?
OK rsadowski@, works fine here. Thanks
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/tray-app/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 Makefile
> --- Makefile 12 Jul 2019 20:49:53 - 1.8
> +++ Makefile 8 Mar 2020 15:19:47 -
> @@ -5,7 +5,7 @@ ONLY_FOR_ARCHS= ${APM_ARCHS}
> COMMENT= small utilities for X11 system tray: eject, battery, mixer
>
> DISTNAME=tray-app-0.3.1
> -REVISION=0
> +REVISION=1
>
> CATEGORIES= sysutils x11
>
> Index: patches/patch-sound_Makefile
> ===
> RCS file: /cvs/ports/sysutils/tray-app/patches/patch-sound_Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-sound_Makefile
> --- patches/patch-sound_Makefile 17 Sep 2013 11:21:50 - 1.1.1.1
> +++ patches/patch-sound_Makefile 8 Mar 2020 15:19:47 -
> @@ -1,6 +1,7 @@
> $OpenBSD: patch-sound_Makefile,v 1.1.1.1 2013/09/17 11:21:50 sthen Exp $
> sound/Makefile.orig Mon Mar 12 08:46:04 2012
> -+++ sound/Makefile Tue Sep 17 11:39:18 2013
> +Index: sound/Makefile
> +--- sound/Makefile.orig
> sound/Makefile
> @@ -8,13 +8,13 @@ MAN=
>
> gtk_CFLAGS!= pkg-config --cflags gtk+-2.0
> @@ -8,7 +9,8 @@ $OpenBSD: patch-sound_Makefile,v 1.1.1.1
> -CFLAGS= -W -Wall -g -O0 -I../lib $(gtk_CFLAGS)
> +CFLAGS+= -W -Wall -I../lib $(gtk_CFLAGS)
> LDFLAGS= -L../lib $(gtk_LDFLAGS)
> - LDADD= -ltrayapp
> +-LDADD= -ltrayapp
> ++LDADD= -ltrayapp -lsndio
>
> -BINDIR=/usr/local/libexec/tray-app
> +BINDIR=${TRUEPREFIX}/libexec/tray-app
> Index: patches/patch-sound_sound_c
> ===
> RCS file: patches/patch-sound_sound_c
> diff -N patches/patch-sound_sound_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-sound_sound_c 8 Mar 2020 15:19:47 -
> @@ -0,0 +1,539 @@
> +$OpenBSD$
> +
> +Index: sound/sound.c
> +--- sound/sound.c.orig
> sound/sound.c
> +@@ -4,12 +4,13 @@
> + */
> + #include
> + #include
> +-#include
> ++#include
> +
> + #include
> +
> + #include
> + #include
> ++#include
> + #include
> + #include
> +
> +@@ -19,16 +20,20 @@
> + #include "sound-1.xpm"
> + #include "sound-2.xpm"
> +
> ++struct control {
> ++struct control *next;
> ++unsigned int addr;
> ++unsigned int value;
> ++unsigned int max;
> ++int ismute;
> ++};
> ++
> + static void usage(const char *prog);
> +-static int get_mixer_index(int fd, mixer_devinfo_t *devinfo);
> +-static int get_volume(int fd, mixer_devinfo_t *devinfo, u_char *volume);
> +-static int set_volume(int fd, mixer_devinfo_t *devinfo, u_char volume);
> +-static int get_mute(int fd, mixer_devinfo_t *devinfo, int *mute);
> +-static int set_mute(int fd, mixer_devinfo_t *devinfo, int mute);
> ++static void set_state(int ismute, int mute);
> ++static void get_state(int *rvolume, int *rmute);
> +
> + static void prepare_tooltip(int mute, u_char volume, char *text, size_t sz);
> +
> +-static gboolean cb_timer(GtkWidget *widget);
> + static void cb_button_toggled(GtkWidget *widget, gpointer data);
> + static void cb_scale_value_changed(GtkScale *scale, GtkAdjustment *adj);
> + static gboolean cb_window_delete(GtkWidget *widget,GdkEvent *event,
> +@@ -44,12 +49,13 @@ static gboolean cb_tray_query_tooltip(GtkStatusIcon *i
> + static int init_gui(void);
> + static void show_gui(void);
> + static void hide_gui(void);
> ++static void refresh_gui(void);
> +
> + static int init_tray(int doinvert);
> + static void set_tray_icon(u_char volume);
> +
> +-static int mixer_fd;
> +-static mixer_devinfo_t outputs_master_dev[2]; /* volume, mute */
> ++static struct sioctl_hdl *hdl;
> ++static struct control*controls;
> +
> + static GtkWidget*gui_window = NULL;
> + static GtkObject*gui_adj = NULL;
> +@@ -63,9 +69,6 @@ static GdkPixbuf *tray_pixbuf_0 = NULL;
> + static GdkPixbuf*tray_pixbuf_1 = NULL;
> + static GdkPixbuf*tray_pixbuf_2 = NULL;
> +
> +-static u_char current_volume = 0;
> +-static int current_mute = 0;
> +-
> + void
> + usage(const char *prog)
> + {
> +@@ -76,104 +79,134 @@ usage(const char *prog)
> + prog);
> + }
> +
> +-static int
> +-get_mixer_index(int fd, mixer_devinfo_t *devinfo)
> ++/*
> ++ * new control registered
> ++ */
> ++static void
> ++cb_control_desc(void *unused, struct sioctl_desc *d, int val)
> + {
> +-int
Re: UPDATE: audio/picard
On Sat Mar 07, 2020 at 06:54:49PM +0100, Rafael Sadowski wrote:
> Cause I'm testing right now. Works fine with upcoming py-qt,qt...
ping?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/picard/Makefile,v
> retrieving revision 1.33
> diff -u -p -u -p -r1.33 Makefile
> --- Makefile 3 Dec 2019 09:22:50 - 1.33
> +++ Makefile 7 Mar 2020 13:47:58 -
> @@ -2,7 +2,7 @@
>
> COMMENT =automatic audio files tagger using the MusicBrainz database
>
> -MODPY_EGG_VERSION = 2.2.3
> +MODPY_EGG_VERSION = 2.3.1
> DISTNAME = picard-${MODPY_EGG_VERSION}
>
> CATEGORIES = audio
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/picard/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo 2 Dec 2019 22:30:42 - 1.6
> +++ distinfo 7 Mar 2020 13:47:58 -
> @@ -1,2 +1,2 @@
> -SHA256 (picard-2.2.3.tar.gz) = izKOeOAuXAsSsQxLnDxW400gn6RwJBWRcELu2THk8UI=
> -SIZE (picard-2.2.3.tar.gz) = 2559540
> +SHA256 (picard-2.3.1.tar.gz) = x9K9BaEBggssJg89B0vHRp3qvqgAwT5tx/+SwY93BWw=
> +SIZE (picard-2.3.1.tar.gz) = 3072618
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/audio/picard/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 PLIST
> --- pkg/PLIST 2 Dec 2019 22:30:42 - 1.7
> +++ pkg/PLIST 7 Mar 2020 13:47:58 -
> @@ -31,6 +31,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}similarity.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}tagger.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}track.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/picard/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/picard/acoustid/
> lib/python${MODPY_VERSION}/site-packages/picard/acoustid/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/picard/acoustid/${MODPY_PYCACHE}/
> @@ -93,7 +94,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/picard/formats/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}aac.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}ac3.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}apev2.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}asf.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}id3.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -101,7 +102,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}mp4.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}vorbis.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/${MODPY_PYCACHE}wav.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/picard/formats/aac.py
> +lib/python${MODPY_VERSION}/site-packages/picard/formats/ac3.py
> lib/python${MODPY_VERSION}/site-packages/picard/formats/apev2.py
> lib/python${MODPY_VERSION}/site-packages/picard/formats/asf.py
> lib/python${MODPY_VERSION}/site-packages/picard/formats/id3.py
> @@ -111,8 +112,12 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/${MODPY_PYCACHE}aac.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/${MODPY_PYCACHE}ac3.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/${MODPY_PYCACHE}compatid3.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/${MODPY_PYCACHE}tak.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/aac.py
> +lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/ac3.py
>
> lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/compatid3.py
> lib/python${MODPY_VERSION}/site-packages/picard/formats/mutagenext/tak.py
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/13 14:17:54 Modified files: devel/netbeans : Makefile distinfo devel/netbeans/pkg: PLIST Log message: Update netbeans to 11.3 Remove giovanni@ as second maintainer at his request
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/13 14:08:35 Modified files: x11/i3-gaps: Makefile distinfo x11/i3-gaps/patches: patch-Makefile_in patch-etc_config patch-etc_config_keycodes patch-i3-dmenu-desktop patch-i3-msg_main_c patch-i3-nagbar_main_c patch-libi3_get_exe_path_c patch-man_i3-config-wizard_man patch-man_i3-dump-log_man patch-man_i3-nagbar_man patch-man_i3_man patch-src_bindings_c patch-src_config_parser_c patch-src_main_c Added files: x11/i3-gaps/patches: patch-parser-specs_config_spec patch-src_config_directives_c patch-testcases_t_201-config-parser_t Removed files: x11/i3-gaps/patches: patch-configure Log message: Update i3-gaps to 4.18 (sync with x11/i3)
UPDATE: net/bitcoin
Simple update to the latest stable version. OK?
Index: Makefile
===
RCS file: /cvs/ports/net/bitcoin/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile13 Jan 2020 19:59:26 - 1.21
+++ Makefile13 Mar 2020 05:54:09 -
@@ -6,7 +6,7 @@ COMMENT = P2P payment system
GH_ACCOUNT = bitcoin
GH_PROJECT = bitcoin
-GH_TAGNAME = v0.19.0.1
+GH_TAGNAME = v0.19.1
SHARED_LIBS += bitcoinconsensus 2.0 # 0.0
SHARED_LIBS += secp256k1 0.0 # 0.0
@@ -23,8 +23,8 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} boost_chrono-mt boost_filesystem
WANTLIB += boost_system boost_system-mt boost_thread-mt c crypto
-WANTLIB += db_cxx event_core event_extra event_pthreads m sodium
-WANTLIB += zmq
+WANTLIB += db_cxx event_core event_extra event_pthreads icuio
+WANTLIB += m sodium ssl zmq zstd
LIB_DEPENDS = devel/boost \
net/zeromq \
Index: distinfo
===
RCS file: /cvs/ports/net/bitcoin/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo13 Jan 2020 19:59:26 - 1.9
+++ distinfo13 Mar 2020 05:54:09 -
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.19.0.1.tar.gz) = GnL1g/dEizgI2E7X+NjrIk9EtRKR/ud0u5zsvU/Lrsc=
-SIZE (bitcoin-0.19.0.1.tar.gz) = 6647201
+SHA256 (bitcoin-0.19.1.tar.gz) = O51YK6NrUJVfbfrRLN8TlGLRmtMGBLSXZtwsohoaMiw=
+SIZE (bitcoin-0.19.1.tar.gz) = 6655953
Re: locks and FLAVORs
Update for those not in the know:
I think I figured out a limited way to tell dpb
"hey, use a different lock name for that port/flavor
combination please".
To be used *very* sparingly, especially for
multi-packages, because dpb will get 100% confused
if it sees the same fullpkgname attached to two
locks (it *will* build both at the same time).
It would probably look like
.if ${FLAVOR:Mthatflavor}
DPB_LOCKNAME = somethingelse
.endif
for very very few select ports.
(and with dpb only holding that extra
info, because you don't want to store extra
lock information for 1+ pkgpaths)
UPDATE: Tor Browser 9.0.6
Hi,
Below is a patch that updates Tor Browser to 9.0.6. Briefly tested on
amd64.
Note that I'm also removing aarch64 from ONLY_FOR_ARCHS. With the
recent big update of Tor Browser, I figured I would add aarch64 to see
what would happen (given that I do not have such a machine myself).
However, the aarch64 ports build logs [1] show that the bundled copy
of nspr is causing the build to fail. I see (at least) two options here:
1) we use nspr from devel/nspr; *however*, a comment in
tor-browser/browser/Makefile mentions that we "need" to use the bundled
nss, sqlite (and I assume nspr too). I don't know yet why that is the
case. If we really need the bundled nspr, we could ...
2) apply the patches from devel/nspr to this port too. I would like
to avoid this if possible.
But until then, Tor Browser is not buildable on aarch64. I would not
mind at all if someone interested in aarch64 support for this port
takes a look at this before I get a chance to do it :)
Thanks,
Caspar Schutijser
[1]
http://build-failures.rhaalovely.net/aarch64/2020-03-06/www/tor-browser/browser.log
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- meta/tor-browser/Makefile 16 Feb 2020 10:45:59 - 1.20
+++ meta/tor-browser/Makefile 13 Mar 2020 17:28:31 -
@@ -4,11 +4,11 @@ COMMENT= Tor Browser meta package
MAINTAINER=Caspar Schutijser
-PKGNAME= tor-browser-9.0.5
-ONLY_FOR_ARCHS = amd64 i386 aarch64
+PKGNAME= tor-browser-9.0.6
+ONLY_FOR_ARCHS = amd64 i386
-RUN_DEPENDS= www/tor-browser/browser>=9.0.5 \
- www/tor-browser/noscript>=11.0.13 \
+RUN_DEPENDS= www/tor-browser/browser>=9.0.6 \
+ www/tor-browser/noscript>=11.0.15 \
www/tor-browser/https-everywhere>=2019.11.7 \
net/tor>=0.4.2.5
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile.inc
--- www/tor-browser/Makefile.inc16 Feb 2020 10:45:59 - 1.20
+++ www/tor-browser/Makefile.inc13 Mar 2020 17:28:31 -
@@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 9.0.5
+TB_VERSION = 9.0.6
TB_PREFIX =tb
SUBST_VARS += BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- www/tor-browser/browser/Makefile16 Feb 2020 10:45:59 - 1.39
+++ www/tor-browser/browser/Makefile13 Mar 2020 17:28:31 -
@@ -4,7 +4,7 @@
# Makefile when editing this one (ESR versions not always the same).
COMMENT = modified version of Firefox ESR for browsing over Tor
-ONLY_FOR_ARCHS = amd64 i386 aarch64
+ONLY_FOR_ARCHS = amd64 i386
MOZILLA_VERSION = ${TB_VERSION}
MOZILLA_PROJECT = ${BROWSER_NAME}
@@ -15,7 +15,7 @@ EXTRACT_SUFX =.tar.xz
PATCHORIG =.pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-68.5.0esr-9.0-1-build2
+DISTNAME = src-firefox-tor-browser-68.6.0esr-9.0-1-build1
DISTFILES += ${DISTNAME}.tar.xz \
src-tor-launcher-${TL_VERSION}.tar.xz
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- www/tor-browser/browser/distinfo16 Feb 2020 10:45:59 - 1.18
+++ www/tor-browser/browser/distinfo13 Mar 2020 17:28:31 -
@@ -1,4 +1,4 @@
-SHA256 (mozilla/src-firefox-tor-browser-68.5.0esr-9.0-1-build2.tar.xz) =
v2YS7g9jlW3QkRcqhOYyzerXn7ceshEk1LALrlX2MVo=
+SHA256 (mozilla/src-firefox-tor-browser-68.6.0esr-9.0-1-build1.tar.xz) =
QpN2Gl6RT27dsENKLgZgHYxkjCdN/wlG/S87CCwbLLY=
SHA256 (mozilla/src-tor-launcher-0.2.20.5.tar.xz) =
LVEbHAxcGf49cC8NF4bVYfFD7k2GA8SX+f+VA5p7L4U=
-SIZE (mozilla/src-firefox-tor-browser-68.5.0esr-9.0-1-build2.tar.xz) =
347703552
+SIZE (mozilla/src-firefox-tor-browser-68.6.0esr-9.0-1-build1.tar.xz) =
348498152
SIZE (mozilla/src-tor-launcher-0.2.20.5.tar.xz) = 210916
Index: www/tor-browser/noscript/Makefile
===
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- www/tor-browser/noscript/Makefile 16 Feb 2020 10:45:59 - 1.18
+++ www/tor-browser/noscript/Makefile 13 Mar 2020 17:28:31
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/13 11:55:50 Modified files: www/gitea : Makefile distinfo www/gitea/pkg : PLIST Log message: Update gitea 1.11.1 -> 1.11.3 Changelog: https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md
Re: [update] redis 5.0.8
On Fri, 13 Mar 2020 17:53:12 +0100, Theo Buehler wrote: > Opinions? I vote for "move forward" :) Cheers, Daniel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/13 10:53:53 Modified files: x11/qt5: Makefile Makefile.inc Makefile.version x11/qt5/docs : Makefile distinfo x11/qt5/qt3d : Makefile distinfo x11/qt5/qt3d/pkg: PLIST-examples PLIST-main x11/qt5/qtbase : Makefile distinfo x11/qt5/qtbase/patches: patch-mkspecs_common_gcc-base_conf patch-mkspecs_features_create_cmake_prf patch-mkspecs_features_qt_module_prf patch-mkspecs_openbsd-g++_qmake_conf patch-qmake_generators_unix_unixmake2_cpp patch-qmake_generators_unix_unixmake_cpp patch-qmake_generators_unix_unixmake_h patch-src_corelib_global_global_pri patch-src_corelib_global_qversiontagging_cpp patch-src_network_ssl_qsslcontext_openssl_cpp patch-src_network_ssl_qsslsocket_openssl_symbols_cpp patch-src_network_ssl_qsslsocket_openssl_symbols_p_h patch-src_plugins_sqldrivers_configure_json x11/qt5/qtbase/pkg: PLIST-examples PLIST-global PLIST-main PLIST-mysql PLIST-psql PLIST-sqlite2 PLIST-tds x11/qt5/qtcanvas3d: Makefile x11/qt5/qtcanvas3d/pkg: PLIST-main x11/qt5/qtcharts: Makefile distinfo x11/qt5/qtcharts/pkg: PLIST-examples PLIST-main x11/qt5/qtconnectivity: Makefile distinfo x11/qt5/qtconnectivity/patches: patch-src_nfc_nfc_pro x11/qt5/qtconnectivity/pkg: PLIST-examples PLIST-main x11/qt5/qtdatavis3d: Makefile distinfo x11/qt5/qtdatavis3d/pkg: PLIST-main x11/qt5/qtdeclarative: Makefile distinfo x11/qt5/qtdeclarative/pkg: PLIST-examples PLIST-main x11/qt5/qtgamepad: Makefile distinfo x11/qt5/qtgamepad/pkg: PLIST-main x11/qt5/qtgraphicaleffects: Makefile distinfo x11/qt5/qtgraphicaleffects/pkg: PLIST x11/qt5/qtimageformats: Makefile distinfo x11/qt5/qtimageformats/pkg: PLIST x11/qt5/qtlocation: Makefile distinfo x11/qt5/qtlocation/pkg: PLIST-examples PLIST-main x11/qt5/qtmultimedia: Makefile distinfo x11/qt5/qtmultimedia/pkg: PLIST-examples PLIST-main x11/qt5/qtnetworkauth: Makefile distinfo x11/qt5/qtnetworkauth/pkg: PLIST-main x11/qt5/qtpurchasing: Makefile distinfo x11/qt5/qtpurchasing/pkg: PLIST-main x11/qt5/qtquickcontrols: distinfo x11/qt5/qtquickcontrols/pkg: PLIST-main x11/qt5/qtquickcontrols2: Makefile distinfo x11/qt5/qtquickcontrols2/pkg: PLIST-examples PLIST-main x11/qt5/qtremoteobjects: Makefile distinfo x11/qt5/qtremoteobjects/pkg: PLIST-examples PLIST-main x11/qt5/qtscript: Makefile distinfo x11/qt5/qtscript/patches: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h x11/qt5/qtscript/pkg: PLIST-main x11/qt5/qtscxml: Makefile distinfo x11/qt5/qtscxml/pkg: PLIST-main x11/qt5/qtsensors: Makefile distinfo x11/qt5/qtsensors/pkg: PLIST-main x11/qt5/qtserialbus: Makefile distinfo x11/qt5/qtserialbus/pkg: PLIST-examples PLIST-main x11/qt5/qtserialport: Makefile distinfo x11/qt5/qtserialport/pkg: PLIST-main x11/qt5/qtspeech: Makefile distinfo x11/qt5/qtspeech/pkg: PLIST-main x11/qt5/qtsvg : Makefile distinfo x11/qt5/qtsvg/pkg: PLIST-main x11/qt5/qttools: Makefile distinfo x11/qt5/qttools/pkg: PLIST-main PLIST-webview x11/qt5/qttranslations: distinfo x11/qt5/qttranslations/pkg: PLIST x11/qt5/qtvirtualkeyboard: Makefile distinfo x11/qt5/qtvirtualkeyboard/pkg: PLIST-examples PLIST-main x11/qt5/qtwebchannel: Makefile distinfo x11/qt5/qtwebchannel/pkg: PLIST-main x11/qt5/qtwebsockets: Makefile distinfo x11/qt5/qtwebsockets/pkg: PLIST-main x11/qt5/qtx11extras: Makefile distinfo x11/qt5/qtxmlpatterns: Makefile distinfo x11/qt5/qtxmlpatterns/pkg: PLIST-examples PLIST-main meta/qt5 : Makefile Added files: x11/qt5/qtbase/patches: patch-mkspecs_features_qmake_use_prf patch-mkspecs_features_qt_configure_prf patch-src_corelib_configure_json patch-src_gui_configure_json patch-src_network_configure_json
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/13 10:54:00 Modified files: x11: Makefile Log message: add py-sip-qt5 and py-sip-qt5,python3 OK sthen@, landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/13 10:54:08 Modified files: cad/openscad : Makefile multimedia/libde265: Makefile x11/vlc: Makefile Log message: double-conversion adaptations After math/double-conversion is no longer x11/qt dependency we need a little adjustment here. Diff from and OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/13 10:54:03 Modified files: devel/py-sip : Makefile distinfo Log message: Update py-sip to 4.19.19, required for the py-qt5/riverbankcomputing zoo OK sthen@, landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/13 10:54:12 Modified files: x11/py-qt5 : Makefile distinfo x11/py-qt5/patches: patch-configure_py x11/py-qt5/pkg : PLIST Log message: Update py-qt5 5.13.2 (Keep in sync with x11/qt5) With help and ok landry@
Re: [update] redis 5.0.8
> Built and regress tests run successfully on amd64, macppc and sparc64. > Some further light testing on amd64 with some toy databases. I have run the regression tests a few more times and it looks like I got lucky when running the tests on sparc64 the first two times. Running them results in one test failure seemingly a bit more often than not: *** [err]: pending querybuf: check size of pending_querybuf after set a big value in tests/unit/pendingquerybuf.tcl the used_memory of replica is much larger than master. Master:35666976 Replica:69051032 The numbers aren't exactly the same each time, but they're in the same ballpark. I've seen this test fail on sparc64 before (not sure if elsewhere). The update seems to trigger it far more often. I don't think we need to rush this update in, but I'm also not sure if reason enough to hold it back. Opinions?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/13 10:39:39 Log message: Import QtLottie 5.13.2 QML API for rendering graphics and animations Qt Lottie Animation provides a QML API for rendering graphics and animations that are exported in JSON format by the Bodymovin plugin for Adobe After Effects. OK sthen@, landry@ Status: Vendor Tag: rsadowski Release Tags: rsadowski_20200313 N ports/x11/qt5/qtlottie/Makefile N ports/x11/qt5/qtlottie/distinfo N ports/x11/qt5/qtlottie/pkg/DESCR N ports/x11/qt5/qtlottie/pkg/PLIST No conflicts created by this import
Re: Slight grafana file permissions improvement
On 2020-03-13 14:10, Kevin Chadwick wrote: > Grafana only runs as one user, so should work well. Ideally the config would > still be world readable and the secrets separated out. I should say that by ideally I just mean in case the config and anything else is useful to multiple users, rather than having a use case in mind. I think the config atleast can be taken from the http api anyway.
Re: Slight grafana file permissions improvement
On 2020-03-13 00:07, Eric Elena wrote: > Changing /etc/grafana to root:_grafana 750 looks reasonable, I'll try to send > a diff soon. v6.7.0-beta1 was released a few hours ago, maybe the fix can go > with v6.7.0 as we Grafana only runs as one user, so should work well. Ideally the config would still be world readable and the secrets separated out. I've sounded out on the Grafana slack channel whether to create a github issue but I get the feeling that container type systems are more their priority (ENV variables).
Re: update: math/libcerf and math/gnuplot
Hi,
Thank you for your effort! I have a few comments and questions.
I see they switched to Gitlab (hence the url changes) and that the
author set it up for continous integration and thus made it compile with
clang.
Why did you bump the major. I tried browsing the history on Gitlab to
see what changed in the API, but couldn't see much. I am sure I missed
something.
Is the gnuplot bump necessary? Why?
Paul
On Tue, Mar 10, 2020 at 10:44:55AM +0900, Yozo TODA wrote:
> (resending this from gmail, because my ISP's mailserver was blocked
> via UCEProtect Level1. I hope this will go through now...)
>
> Dear maintainer Paul Irofti, (Cc: ports@openbsd.org)
> here attached the patch to update libcerf and gnuplot;
> please check and commit this if it's OK?
>
> - updating libcerf 1.11p0 to 1.13
> - the upstream site looks renewed (apps.jcns... to jugit...)
> - I compiled 1.13 successfully with clang, hence removing COMPILER line.
> but I'm not sure it's OK for non-clang architectures...
> - just adding REVISION=0 to gnuplot to get along with libcerf update,
> and verify that this libcerf update works well.
> all demo work.
>
>
> In my environment (following -current, amd64)
> gcc-8 cannot compile for some weeks.
> (some error like "compiler internal error" in the middle of build.)
> So, I cannot rebuild math/maxima. Looking at the build log and Makefile,
> maxima depends on gnuplot depending on libcerf depending on gcc-8.
> That's why I examined libcerf port if it works with clang...
>
> -- yozo.
> Index: libcerf/Makefile
> ===
> RCS file: /cvs/ports/math/libcerf/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- libcerf/Makefile 12 Jul 2019 20:47:42 - 1.5
> +++ libcerf/Makefile 8 Mar 2020 07:08:56 -
> @@ -2,16 +2,16 @@
>
> COMMENT =implementation of complex error functions
>
> -V = 1.11
> -DISTNAME = libcerf-${V}
> +V = 1.13
> +DISTNAME = libcerf-v${V}
> +PKGNAME =libcerf-${V}
> EXTRACT_SUFX = .tgz
> CATEGORIES = math
> -MASTER_SITES = http://apps.jcns.fz-juelich.de/src/libcerf/
> -REVISION = 0
> +MASTER_SITES = https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${V}/
>
> -SHARED_LIBS += cerf 2.0 # 1.10
> +SHARED_LIBS += cerf 3.0 # 1.13
>
> -HOMEPAGE = http://apps.jcns.fz-juelich.de/doku/sc/libcerf
> +HOMEPAGE = https://jugit.fz-juelich.de/mlz/libcerf/
>
> MAINTAINER = Paul Irofti
>
> @@ -21,7 +21,5 @@ PERMIT_PACKAGE =Yes
> WANTLIB += c m ${COMPILER_LIBCXX}
>
> MODULES =devel/cmake
> -
> -COMPILER = ports-gcc # imaginary constants are a GNU extension
>
> .include
> Index: libcerf/distinfo
> ===
> RCS file: /cvs/ports/math/libcerf/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- libcerf/distinfo 29 Dec 2018 07:48:36 - 1.3
> +++ libcerf/distinfo 8 Mar 2020 07:08:56 -
> @@ -1,2 +1,2 @@
> -SHA256 (libcerf-1.11.tgz) = cBAcrEoNeGMyLU0Gz5XFB6nP1k/JmtGzGoQlIEz9lnI=
> -SIZE (libcerf-1.11.tgz) = 60066
> +SHA256 (libcerf-v1.13.tgz) = 5Gmfga+Diu9bPncgn+yOmCCk9JLVmPtaBwgAhUl2owU=
> +SIZE (libcerf-v1.13.tgz) = 60732
> Index: libcerf/patches/patch-man_CMakeLists_txt
> ===
> RCS file: /cvs/ports/math/libcerf/patches/patch-man_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-man_CMakeLists_txt
> --- libcerf/patches/patch-man_CMakeLists_txt 28 Dec 2018 16:28:44 -
> 1.1
> +++ libcerf/patches/patch-man_CMakeLists_txt 8 Mar 2020 07:08:56 -
> @@ -1,4 +1,4 @@
> -$OpenBSD: patch-man_CMakeLists_txt,v 1.1 2018/12/28 16:28:44 pirofti Exp $
> +$OpenBSD$
>
> Manual pages should go under ${PREFIX}/man/ rather than under
> ${PREFIX}/share/man/.
> Index: gnuplot/Makefile
> ===
> RCS file: /cvs/ports/math/gnuplot/Makefile,v
> retrieving revision 1.75
> diff -u -p -r1.75 Makefile
> --- gnuplot/Makefile 8 Nov 2019 23:29:56 - 1.75
> +++ gnuplot/Makefile 8 Mar 2020 07:08:56 -
> @@ -4,6 +4,7 @@ COMMENT = command-driven interactive fun
>
> V = 5.2
> PATCHLEVEL = 7
> +REVISION = 0
> DISTNAME = gnuplot-${V}.${PATCHLEVEL}
> CATEGORIES = math graphics
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
Re: WIP: Update of math/py-numpy to 1.16.5
On Fri, Mar 13 2020, Paul Irofti wrote:
> On Wed, Mar 11, 2020 at 08:58:27PM +0100, Martin Reindl wrote:
>> Am 11.03.20 um 18:53 schrieb Theo Buehler:
>> > On Wed, Mar 11, 2020 at 04:12:56AM +0100, Jeremie Courreges-Anglas wrote:
>> >> On Tue, Mar 10 2020, Theo Buehler wrote:
>> >>> On Tue, Mar 10, 2020 at 06:35:04PM +0100, Jeremie Courreges-Anglas wrote:
>> On Mon, Mar 09 2020, Stuart Henderson wrote:
>> > On 2020/03/09 10:42, Theo Buehler wrote:
>> >> On Mon, Jan 13, 2020 at 12:50:32PM +, Stuart Henderson wrote:
>> >>> 2/3 through a bulk build and I see that this breaks scipy (missing
>> >>> symbols,
>> >>> blas/cblas-related) so needs a bit more work, but I think it's
>> >>> generally
>> >>> along the right lines.
>> >>
>> >> Not sure if this provides any useful clue, but py-numpy doesn't build
>> >> at
>> >> all on sparc64 with this diff, also due to missing blas/cblas symbols:
>> >
>> > You'll probably see the same on amd64 with USE_LLD=no.
>>
>> I managed to build scipy with no changes on amd64, so I'm not sure what
>> the problem is on this arch (did not try with USE_LLD=No).
>>
>> However I took a look at the issue reported by tb on sparc64.
>>
>> --8<--
>> creating /tmp/tmpKcZ0cd/tmp
>> creating /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd
>> compile options: '-I/usr/local/include -I/usr/include -c'
>> cc: /tmp/tmpKcZ0cd/source.c
>> cc /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o -L/usr/local/lib -lcblas -o
>> /tmp/tmpKcZ0cd/a.out
>> /usr/local/lib/libcblas.so.1.0: undefined reference to `ztbsv_'
>> /usr/local/lib/libcblas.so.1.0: undefined reference to `dasum_'
>>
>> [...]
>>
>> /usr/local/lib/libcblas.so.1.0: undefined reference to `zsymm_'
>> /usr/local/lib/libcblas.so.1.0: undefined reference to `ztrsm_'
>> /usr/local/lib/libcblas.so.1.0: undefined reference to `sswap_'
>> collect2: error: ld returned 1 exit status
>> cc /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o -L/usr/local/lib -lblas -o
>> /tmp/tmpKcZ0cd/a.out
>> /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o: In function `main':
>> source.c:(.text.startup+0xdc): undefined reference to `cblas_ddot'
>> collect2: error: ld returned 1 exit status
>> -->8--
>>
>> libcblas.so doesn't depend on libblas.so so missing symbols are to be
>> expected if one links with -lcblas instead of -lcblas -lblas. The
>> second linking test fails because libblas.so doesn't provide cblas
>> symbols.
>> >>>
>> >>> Thanks, this makes sense. But why does this work with ld.lld?
>> >>
>> >> ld.lld doesn't bother checking that all symbols in libcblas.so can be
>> >> resolved, ld.bfd does. This means that if you link against a library
>> >> that references a bogus symbol or lacks some library interdependency
>> >> (DT_NEEDED) you only get a crash at run time.
>> >>
>> >> On amd64, using the testcase from numpy:
>> >>
>> >> --8<--
>> >> russell /tmp$ cat r.c
>> >> #include
>> >> int main(int argc, const char *argv[])
>> >> {
>> >> double a[4] = {1,2,3,4};
>> >> double b[4] = {5,6,7,8};
>> >> return cblas_ddot(4, a, 1, b, 1) > 10;
>> >> }
>> >> russell /tmp$ cc -I/usr/local/include r.c -L/usr/local/lib -lcblas
>> >> russell /tmp$ ./a.out
>> >> a.out:/usr/local/lib/libcblas.so.1.0: undefined symbol 'ddot_'
>> >> ld.so: a.out: lazy binding failed!
>> >> Killed
>> >> -->8--
>> >>
>> >> I suspect Stuart hit a similar problem with this numpy update and scipy.
>> >>
>> >> Using -fuse-ld=bfd in the testcase above would result in the same errors
>> >> as in your log.
>> >
>> > I see. Thank you very much for your explanations.
>> >
>> > FWIW your cblas diff is ok tb (also tested on macppc).
>> >
>>
>> Also tested on arm64, with numpy-1.16.6:
>> 42 failed, 7268 passed, 93 skipped, 168 deselected, 12 xfailed, 1
>> xpassed, 1 warnings
>>
>> I think this is ready to go into the tree with the cblas diff on top?
>> The update to 1.16.6 is straightforward if you want to stick to 1.16.5 now.
>
> Can you please commit this? Thank you!
By popular demand I have committed the cblas diff. I haven't looked
closely at the numpy update, you folks probably know better.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/13 07:36:42 Modified files: math/cblas : Makefile math/cblas/files: Makefile math/cblas/pkg : PLIST Log message: Register libcblas.so dependency on libblas.so This avoids a runtime error with software linked by ld.lld -lcblas, and a build error with ld.bfd -lcblas. Spotted by sthen@ and tb@ while working on a py-numpy update. Tests by tb@ and martin@, ok tb@ A bunch of people want to move forward with this, so I'm not waiting for Steven's ok.
Re: py-msgpack 1.0.0 upgrade broke salt
On Fri, Mar 13 2020, Stuart Henderson wrote: > On 2020/03/13 12:25, Jeremie Courreges-Anglas wrote: >> I *think* I've seen an EPOCH change where a bump was needed for >> consumers, but I have no idea which change and why. Anyway make >> repackage works fine in py-msgpack consumers, that's enough for me to >> say that a bump is not needed (of course that needs PLIST_DB). > > This should only be needed if there is a version number in a > dependency port and that has to change. > >> > # requirements/base.txt >> > RUN_DEPENDS = devel/py-futures \ >> > - net/py-msgpack \ >> > + net/py-msgpack<=0.6.2v0 \ >> >> This should be net/py-msgpack>=0.6.2v0 instead, 0.6.2v0 > 1.0.0. >> With this fixed, ok jca@ > > Depends on the purpose of the RUN_DEPENDS line... >From my PoV it's just about increasing the chances of pushing a working salt package to end users. > if it's to act as a > hint to future porters that py-msgpack can't be updated with this version > of salt, then bket's version makes a lot of sense. Or it could cover both > min and max versions with something like >=0.6.2v0,<1.0.0v0 (warning I have > not tested that :) Documenting the version requirement occurred to me but I failed to mention it. Your proposal seems to work correctly, ok jca@ I guess a comment in py-msgpack/Makefile would be needed too if the port didn't have a maintainer, but I'll just let Bjorn see what works best for him. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[new] devel/py-metallum
hello, py-metallum is a basic python API for querying the Encyclopedia Metallum (aka metal-archives.com). Tested, built and packaged on amd64. thanks, .jh py-metallum.tgz Description: application/tar-gz
Re: WIP: Update of math/py-numpy to 1.16.5
On Wed, Mar 11, 2020 at 08:58:27PM +0100, Martin Reindl wrote:
> Am 11.03.20 um 18:53 schrieb Theo Buehler:
> > On Wed, Mar 11, 2020 at 04:12:56AM +0100, Jeremie Courreges-Anglas wrote:
> >> On Tue, Mar 10 2020, Theo Buehler wrote:
> >>> On Tue, Mar 10, 2020 at 06:35:04PM +0100, Jeremie Courreges-Anglas wrote:
> On Mon, Mar 09 2020, Stuart Henderson wrote:
> > On 2020/03/09 10:42, Theo Buehler wrote:
> >> On Mon, Jan 13, 2020 at 12:50:32PM +, Stuart Henderson wrote:
> >>> 2/3 through a bulk build and I see that this breaks scipy (missing
> >>> symbols,
> >>> blas/cblas-related) so needs a bit more work, but I think it's
> >>> generally
> >>> along the right lines.
> >>
> >> Not sure if this provides any useful clue, but py-numpy doesn't build
> >> at
> >> all on sparc64 with this diff, also due to missing blas/cblas symbols:
> >
> > You'll probably see the same on amd64 with USE_LLD=no.
>
> I managed to build scipy with no changes on amd64, so I'm not sure what
> the problem is on this arch (did not try with USE_LLD=No).
>
> However I took a look at the issue reported by tb on sparc64.
>
> --8<--
> creating /tmp/tmpKcZ0cd/tmp
> creating /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd
> compile options: '-I/usr/local/include -I/usr/include -c'
> cc: /tmp/tmpKcZ0cd/source.c
> cc /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o -L/usr/local/lib -lcblas -o
> /tmp/tmpKcZ0cd/a.out
> /usr/local/lib/libcblas.so.1.0: undefined reference to `ztbsv_'
> /usr/local/lib/libcblas.so.1.0: undefined reference to `dasum_'
>
> [...]
>
> /usr/local/lib/libcblas.so.1.0: undefined reference to `zsymm_'
> /usr/local/lib/libcblas.so.1.0: undefined reference to `ztrsm_'
> /usr/local/lib/libcblas.so.1.0: undefined reference to `sswap_'
> collect2: error: ld returned 1 exit status
> cc /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o -L/usr/local/lib -lblas -o
> /tmp/tmpKcZ0cd/a.out
> /tmp/tmpKcZ0cd/tmp/tmpKcZ0cd/source.o: In function `main':
> source.c:(.text.startup+0xdc): undefined reference to `cblas_ddot'
> collect2: error: ld returned 1 exit status
> -->8--
>
> libcblas.so doesn't depend on libblas.so so missing symbols are to be
> expected if one links with -lcblas instead of -lcblas -lblas. The
> second linking test fails because libblas.so doesn't provide cblas
> symbols.
> >>>
> >>> Thanks, this makes sense. But why does this work with ld.lld?
> >>
> >> ld.lld doesn't bother checking that all symbols in libcblas.so can be
> >> resolved, ld.bfd does. This means that if you link against a library
> >> that references a bogus symbol or lacks some library interdependency
> >> (DT_NEEDED) you only get a crash at run time.
> >>
> >> On amd64, using the testcase from numpy:
> >>
> >> --8<--
> >> russell /tmp$ cat r.c
> >> #include
> >> int main(int argc, const char *argv[])
> >> {
> >> double a[4] = {1,2,3,4};
> >> double b[4] = {5,6,7,8};
> >> return cblas_ddot(4, a, 1, b, 1) > 10;
> >> }
> >> russell /tmp$ cc -I/usr/local/include r.c -L/usr/local/lib -lcblas
> >> russell /tmp$ ./a.out
> >> a.out:/usr/local/lib/libcblas.so.1.0: undefined symbol 'ddot_'
> >> ld.so: a.out: lazy binding failed!
> >> Killed
> >> -->8--
> >>
> >> I suspect Stuart hit a similar problem with this numpy update and scipy.
> >>
> >> Using -fuse-ld=bfd in the testcase above would result in the same errors
> >> as in your log.
> >
> > I see. Thank you very much for your explanations.
> >
> > FWIW your cblas diff is ok tb (also tested on macppc).
> >
>
> Also tested on arm64, with numpy-1.16.6:
> 42 failed, 7268 passed, 93 skipped, 168 deselected, 12 xfailed, 1
> xpassed, 1 warnings
>
> I think this is ready to go into the tree with the cblas diff on top?
> The update to 1.16.6 is straightforward if you want to stick to 1.16.5 now.
Can you please commit this? Thank you!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/03/13 07:15:58 Modified files: databases/evolution-data-server: Makefile Log message: unbreak after libgdata update; spotted by naddy@
UPDATE: Nextcloud-18.0.2
Hello,
Update for Nextcloud to 18.0.2:
https://nextcloud.com/changelog/#latest18
OK? Comments?
Cheers.-
--
- gonzalo
Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile18 Feb 2020 08:06:40 - 1.49
+++ Makefile13 Mar 2020 12:44:51 -
@@ -2,7 +2,7 @@
COMMENT= easy and universal access to shared and/or personal
files
-V= 18.0.1
+V= 18.0.2
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
Index: distinfo
===
RCS file: /cvs/ports/www/nextcloud/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo18 Feb 2020 08:06:40 - 1.33
+++ distinfo13 Mar 2020 12:44:51 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloud-18.0.1.tar.bz2) =
dw+vNLjw2BJzYj2u1NZOx5GcON/rBzKLYTBYrdvtGcA=
-SIZE (nextcloud-18.0.1.tar.bz2) = 85827287
+SHA256 (nextcloud-18.0.2.tar.bz2) =
0DNmCSPdJxBuxkv/Djr6L1lb0blmG36niCoaMwBuy4E=
+SIZE (nextcloud-18.0.2.tar.bz2) = 86105689
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
retrieving revision 1.36
diff -u -p -r1.36 PLIST
--- pkg/PLIST 18 Feb 2020 08:06:40 - 1.36
+++ pkg/PLIST 13 Mar 2020 12:44:52 -
@@ -6446,6 +6446,7 @@ nextcloud/apps/dav/lib/CalDAV/Search/Xml
nextcloud/apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php
nextcloud/apps/dav/lib/CalDAV/WebcalCaching/
nextcloud/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php
+nextcloud/apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php
nextcloud/apps/dav/lib/Capabilities.php
nextcloud/apps/dav/lib/CardDAV/
nextcloud/apps/dav/lib/CardDAV/AddressBook.php
@@ -10329,6 +10330,7 @@ nextcloud/apps/nextcloud_announcements/t
nextcloud/apps/nextcloud_announcements/templates/admin.php
nextcloud/apps/notifications/
nextcloud/apps/notifications/.babelrc.js
+nextcloud/apps/notifications/.eslintignore
nextcloud/apps/notifications/COPYING
nextcloud/apps/notifications/appinfo/
nextcloud/apps/notifications/appinfo/app.php
@@ -15112,6 +15114,9 @@ nextcloud/core/doc/user/_images/files_pa
nextcloud/core/doc/user/_images/files_versioning.png
nextcloud/core/doc/user/_images/gallery-1.png
nextcloud/core/doc/user/_images/gallery-2.png
+nextcloud/core/doc/user/_images/gnome-online-accounts.png
+nextcloud/core/doc/user/_images/goa-add-nextcloud-account.png
+nextcloud/core/doc/user/_images/goa-nextcloud-select.png
nextcloud/core/doc/user/_images/hidden_files.png
nextcloud/core/doc/user/_images/korganizer_credentials.png
nextcloud/core/doc/user/_images/korganizer_resource_choice.png
@@ -15168,6 +15173,7 @@ nextcloud/core/doc/user/_sources/pim/cal
nextcloud/core/doc/user/_sources/pim/contacts.rst.txt
nextcloud/core/doc/user/_sources/pim/index.rst.txt
nextcloud/core/doc/user/_sources/pim/sync_android.rst.txt
+nextcloud/core/doc/user/_sources/pim/sync_gnome.rst.txt
nextcloud/core/doc/user/_sources/pim/sync_ios.rst.txt
nextcloud/core/doc/user/_sources/pim/sync_kde.rst.txt
nextcloud/core/doc/user/_sources/pim/sync_osx.rst.txt
@@ -15288,6 +15294,7 @@ nextcloud/core/doc/user/pim/calendar.htm
nextcloud/core/doc/user/pim/contacts.html
nextcloud/core/doc/user/pim/index.html
nextcloud/core/doc/user/pim/sync_android.html
+nextcloud/core/doc/user/pim/sync_gnome.html
nextcloud/core/doc/user/pim/sync_ios.html
nextcloud/core/doc/user/pim/sync_kde.html
nextcloud/core/doc/user/pim/sync_osx.html
Re: Update MASTER_SITE_OSDN_JP
On Fri, Mar 13 2020, Stuart Henderson wrote: > On 2020/03/12 17:29, Christian Weisgerber wrote: >> This updates MASTER_SITE_OSDN_JP to a haphazardly chosen list of mirrors >> that >> - support https >> - resolve to different IP addresses >> - are geographically distributed >> - support IPv6 (except for the primary one, sigh) >> >> OK? > > OK. > >> Frankly I wonder if there is any point to maintaining such mirror >> lists... > > Am I the only person who chooses a local mirror to put at the top of > the list for some of the common ones? Nope. :) >> Index: network.conf >> === >> RCS file: /cvs/ports/infrastructure/db/network.conf,v >> retrieving revision 1.15 >> diff -u -p -r1.15 network.conf >> --- network.conf 6 Mar 2020 12:00:17 - 1.15 >> +++ network.conf 12 Mar 2020 16:22:10 - >> @@ -71,11 +71,11 @@ MASTER_SITE_SOURCEFORGE+=\ >> https://downloads.sourceforge.net/sourceforge/ >> >> MASTER_SITE_OSDN_JP+= \ >> -http://osdn.dl.osdn.jp/ \ >> -http://cznic.dl.osdn.jp/ \ >> -http://gigenet.dl.osdn.jp/ \ >> -http://rwthaachen.dl.osdn.jp/ \ >> -http://onet.dl.osdn.jp/ >> +https://osdn.dl.osdn.jp/ \ >> +https://mirrors.gigenet.com/OSDN/ \ >> +https://acc.dl.osdn.jp/ \ >> +https://mirrors.xtom.com/osdn/ \ >> +https://rwthaachen.dl.osdn.jp/ >> >> MASTER_SITE_GNOME+= \ >> https://download.gnome.org/ \ >> -- >> Christian "naddy" Weisgerber na...@mips.inka.de >> > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/03/13 06:41:03 Modified files: net/mosquitto : Makefile distinfo net/mosquitto/patches: patch-lib_CMakeLists_txt patch-src_CMakeLists_txt Log message: update to mosquitto-1.6.9
Re: ansible: remove py-cryptography from README
Jeremie, Klemens, Updated ansible to 2.9.6 with your fixes, thank you! On 03/12, Jeremie Courreges-Anglas wrote: > On Thu, Mar 12 2020, Klemens Nanni wrote: > > It's py3-cryptography by now and installed as dependency as one of the > > ansible dependencies by now, so no manual steps needed any longer. > > Maybe you could go one step further and explicitely add > py-cryptography to RUN_DEPENDS? -- With best regards, Pavel Korovin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/03/13 06:39:57 Modified files: graphics/clutter/cogl: Makefile graphics/clutter/core: Makefile devel/libgdata : Makefile Log message: set DEBUG_PACKAGES
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/03/13 06:35:30 Modified files: sysutils/py-ghmi: Makefile distinfo sysutils/py-ghmi/pkg: PLIST Log message: update to py-ghmi-1.5.12
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/03/13 06:34:10 Modified files: lang/elixir: Makefile distinfo Log message: update to elixir-1.10.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/03/13 06:34:42 Modified files: net/filezilla : Makefile distinfo Added files: net/filezilla/patches: patch-src_interface_Mainfrm_h Log message: Update to filezilla-3.47.2.1 Bugfix release. Changes: https://filezilla-project.org/versions.php
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/03/13 06:34:15 Modified files: net/libfilezilla: Makefile distinfo Log message: Update to libfilezilla-0.20.2 Changes: https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?revision=9669=markup Minor of libfilezilla has been bumped as symbols have been added.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/03/13 06:31:46 Modified files: net/py-msgpack : Makefile distinfo net/py-msgpack/pkg: PLIST sysutils/salt : Makefile Log message: Revert to py-msgpack-0.6.2 and set version requirement in sysutils/salt florian@ noticed that sysutils/salt does not like py-msgpack-1.0.0. Upstream of the latter dropped the encoding option from Packer and Unpacker causing a TypeError Comments and OK from jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/03/13 06:30:49 Modified files: graphics/clutter/cogl: Makefile distinfo graphics/clutter/cogl/pkg: PLIST Log message: update to cogl-1.22.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/03/13 06:31:07 Modified files: graphics/clutter/core: Makefile distinfo graphics/clutter/core/patches: patch-clutter_Makefile_in patch-configure_ac graphics/clutter/core/pkg: PLIST Log message: update to clutter-1.26.4
Re: Update MASTER_SITE_OSDN_JP
On 2020/03/12 17:29, Christian Weisgerber wrote: > This updates MASTER_SITE_OSDN_JP to a haphazardly chosen list of mirrors > that > - support https > - resolve to different IP addresses > - are geographically distributed > - support IPv6 (except for the primary one, sigh) > > OK? OK. > Frankly I wonder if there is any point to maintaining such mirror > lists... Am I the only person who chooses a local mirror to put at the top of the list for some of the common ones? > Index: network.conf > === > RCS file: /cvs/ports/infrastructure/db/network.conf,v > retrieving revision 1.15 > diff -u -p -r1.15 network.conf > --- network.conf 6 Mar 2020 12:00:17 - 1.15 > +++ network.conf 12 Mar 2020 16:22:10 - > @@ -71,11 +71,11 @@ MASTER_SITE_SOURCEFORGE+= \ > https://downloads.sourceforge.net/sourceforge/ > > MASTER_SITE_OSDN_JP+=\ > - http://osdn.dl.osdn.jp/ \ > - http://cznic.dl.osdn.jp/ \ > - http://gigenet.dl.osdn.jp/ \ > - http://rwthaachen.dl.osdn.jp/ \ > - http://onet.dl.osdn.jp/ > + https://osdn.dl.osdn.jp/ \ > + https://mirrors.gigenet.com/OSDN/ \ > + https://acc.dl.osdn.jp/ \ > + https://mirrors.xtom.com/osdn/ \ > + https://rwthaachen.dl.osdn.jp/ > > MASTER_SITE_GNOME+= \ > https://download.gnome.org/ \ > -- > Christian "naddy" Weisgerber na...@mips.inka.de >
Re: py-msgpack 1.0.0 upgrade broke salt
On 2020/03/13 12:25, Jeremie Courreges-Anglas wrote: > I *think* I've seen an EPOCH change where a bump was needed for > consumers, but I have no idea which change and why. Anyway make > repackage works fine in py-msgpack consumers, that's enough for me to > say that a bump is not needed (of course that needs PLIST_DB). This should only be needed if there is a version number in a dependency port and that has to change. > > # requirements/base.txt > > RUN_DEPENDS = devel/py-futures \ > > - net/py-msgpack \ > > + net/py-msgpack<=0.6.2v0 \ > > This should be net/py-msgpack>=0.6.2v0 instead, 0.6.2v0 > 1.0.0. > With this fixed, ok jca@ Depends on the purpose of the RUN_DEPENDS line... if it's to act as a hint to future porters that py-msgpack can't be updated with this version of salt, then bket's version makes a lot of sense. Or it could cover both min and max versions with something like >=0.6.2v0,<1.0.0v0 (warning I have not tested that :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2020/03/13 05:56:53 Log message: Import net/wormhole-william. ``` wormhole-william is a go (golang) implementation of magic wormhole. It provides secure end-to-end encrypted file transfers between computers. ``` With input from, and OK, abieber@. Thanks! Status: Vendor Tag: edd Release Tags: edd_20200313 N ports/net/wormhole-william/Makefile N ports/net/wormhole-william/distinfo N ports/net/wormhole-william/pkg/DESCR N ports/net/wormhole-william/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2020/03/13 05:57:42 Modified files: net: Makefile Log message: Link net/wormhole-william.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/13 05:38:47 Modified files: sysutils/ansible/pkg: README-main Log message: Oops, forgot to update README-main >From kn@, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/13 05:33:46 Modified files: sysutils/ansible: Makefile distinfo sysutils/ansible/pkg: PLIST-main Log message: Update ansible 2.9.5 -> 2.9.6 Changelog: https://github.com/ansible/ansible/blob/stable-2.9/changelogs/CHANGELOG-v2.9.rst#v2-9-6 Added py-cryptography indirect dependency (solved by py-paramiko) to RUN_DEPENDS as suggested by jca@
Re: py-msgpack 1.0.0 upgrade broke salt
On Fri, Mar 13 2020, Bjorn Ketelaars wrote:
> On Thu 12/03/2020 20:30, Jeremie Courreges-Anglas wrote:
>> >> >I discussed py-msgpack offlist with another user who needed
>> >> >py-msgpack-1.0.0 for an update of a vim plugin.
>>
>> I'm no salt or vim user but... I think having salt working properly is
>> much higher priority than an update for a vim plugin. Especially as 6.7
>> is approaching.
>>
>> >>> Although the update of
>> >> >py-msgpack has been tested this issue has not been seen.
>> >> >
>> >> >It seems that upstream of salt is still working on a solution [0]. Easy
>> >> >fix therefore is to revert py-msgpack to 0.6.2, and bump its
>> >> >consumers.
>>
>> Do you need to bump all consumers? I suspect it would be enough to
>> enforce the version requirements in sysutils/salt and bump its REVISION.
>
> Likely caused by my ignorance, but I thought that I needed to bump all
> consumers.
I *think* I've seen an EPOCH change where a bump was needed for
consumers, but I have no idea which change and why. Anyway make
repackage works fine in py-msgpack consumers, that's enough for me to
say that a bump is not needed (of course that needs PLIST_DB).
--8<--
russell /usr/ports/net/synapse$ make repackage
===> Cleaning for synapse-1.11.1
/usr/bin/doas -u _pbuild rm -f /usr/ports/packages/amd64/all/synapse-1.11.1.tgz
/usr/ports/packages/amd64/ftp/synapse-1.11.1.tgz
/usr/ports/pobj/synapse-1.11.1/fake-amd64/debug-pkg/Makefile
/usr/bin/doas -u _pfetch rm -f
/usr/ports/packages/amd64/cache/synapse-1.11.1.tgz
rm -f /usr/ports/update/amd64/synapse-1.11.1
`/usr/ports/pobj/synapse-1.11.1/fake-amd64/.fake_done' is up to date.
Installing /usr/ports/net/synapse/pkg/README as
/usr/ports/pobj/synapse-1.11.1/fake-amd64/usr/local/share/doc/pkg-readmes/synapse
Installing /usr/ports/net/synapse/pkg/synapse.rc as
/usr/ports/pobj/synapse-1.11.1/fake-amd64/etc/rc.d/synapse
===> Building package for synapse-1.11.1
Create /usr/ports/packages/amd64/all/synapse-1.11.1.tgz
Creating package synapse-1.11.1
/usr/ports/plist/amd64/synapse-1.11.1 was updated
@depend net/py-msgpack,python3:py3-msgpack-*:py3-msgpack-1.0.0 -> @depend
net/py-msgpack,python3:py3-msgpack-*:py3-msgpack-0.6.2v0
^^
Link to /usr/ports/packages/amd64/ftp/synapse-1.11.1.tgz
russell /usr/ports/net/synapse$
-->8--
> Enclosed a new diff which reverts py-msgpack to 0.6.2, and enforces
> version requirements in salt and bumps REVISION. I will commit this
> tonight unless someone has a better idea.
Please see below,
> diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
> index ea82fc3e07a..c06d478b9de 100644
> --- net/py-msgpack/Makefile
> +++ net/py-msgpack/Makefile
> @@ -2,7 +2,8 @@
>
> COMMENT =messagepack (de)serializer
>
> -MODPY_EGG_VERSION = 1.0.0
> +MODPY_EGG_VERSION = 0.6.2
> +EPOCH = 0
> DISTNAME = msgpack-${MODPY_EGG_VERSION}
> PKGNAME =py-msgpack-${MODPY_EGG_VERSION}
>
> diff --git net/py-msgpack/distinfo net/py-msgpack/distinfo
> index 5ec380d7403..8d9bdadf9d3 100644
> --- net/py-msgpack/distinfo
> +++ net/py-msgpack/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (msgpack-1.0.0.tar.gz) = lTTVzEgNSv9yAjNBGh92W+kIhXULB993I4CzTBDstcA=
> -SIZE (msgpack-1.0.0.tar.gz) = 232331
> +SHA256 (msgpack-0.6.2.tar.gz) = 6jwvhZNG/NVfxG6WiFMB2cL3o21FP12PKWeEDvoeGDA=
> +SIZE (msgpack-0.6.2.tar.gz) = 119062
> diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
> index 7d948a0df47..2f24d170108 100644
> --- net/py-msgpack/pkg/PLIST
> +++ net/py-msgpack/pkg/PLIST
> @@ -10,10 +10,8 @@
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE
>
> lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
> -${MODPY_COMMENT}@so
> lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
> +@so lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
> lib/python${MODPY_VERSION}/site-packages/msgpack/_version.py
> lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.py
> -lib/python${MODPY_VERSION}/site-packages/msgpack/ext.py
> lib/python${MODPY_VERSION}/site-packages/msgpack/fallback.py
> diff --git sysutils/salt/Makefile sysutils/salt/Makefile
> index 5129c2a60ad..d75547f2fbc 100644
> --- sysutils/salt/Makefile
> +++ sysutils/salt/Makefile
> @@ -19,7 +19,7 @@ COMMENT = remote execution and configuration
> management system
>
> MODPY_EGG_VERSION = 2018.3.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/03/13 05:27:27 Modified files: x11/tigervnc : Makefile Log message: tigervnc: more build fixes for Xvnc portion for problems that I didn't run into on my machine but seen on ports build machine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/03/13 05:02:44 Modified files: x11/tigervnc : Makefile Log message: x11/tigervnc: needs devel/libtool for libtoolize for Xvnc build (in case you're wondering, no, this one really can't use autoreconf ;-)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/03/13 04:24:08 Modified files: misc/p5-OPCUA-Open62541: Makefile distinfo misc/p5-OPCUA-Open62541/pkg: PLIST Log message: update p5-OPCUA-Open62541 to 0.005
Re: py-msgpack 1.0.0 upgrade broke salt
On Thu 12/03/2020 20:30, Jeremie Courreges-Anglas wrote:
> >> >I discussed py-msgpack offlist with another user who needed
> >> >py-msgpack-1.0.0 for an update of a vim plugin.
>
> I'm no salt or vim user but... I think having salt working properly is
> much higher priority than an update for a vim plugin. Especially as 6.7
> is approaching.
>
> >>> Although the update of
> >> >py-msgpack has been tested this issue has not been seen.
> >> >
> >> >It seems that upstream of salt is still working on a solution [0]. Easy
> >> >fix therefore is to revert py-msgpack to 0.6.2, and bump its
> >> >consumers.
>
> Do you need to bump all consumers? I suspect it would be enough to
> enforce the version requirements in sysutils/salt and bump its REVISION.
Likely caused by my ignorance, but I thought that I needed to bump all
consumers.
Enclosed a new diff which reverts py-msgpack to 0.6.2, and enforces
version requirements in salt and bumps REVISION. I will commit this
tonight unless someone has a better idea.
diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
index ea82fc3e07a..c06d478b9de 100644
--- net/py-msgpack/Makefile
+++ net/py-msgpack/Makefile
@@ -2,7 +2,8 @@
COMMENT = messagepack (de)serializer
-MODPY_EGG_VERSION =1.0.0
+MODPY_EGG_VERSION =0.6.2
+EPOCH =0
DISTNAME = msgpack-${MODPY_EGG_VERSION}
PKGNAME = py-msgpack-${MODPY_EGG_VERSION}
diff --git net/py-msgpack/distinfo net/py-msgpack/distinfo
index 5ec380d7403..8d9bdadf9d3 100644
--- net/py-msgpack/distinfo
+++ net/py-msgpack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (msgpack-1.0.0.tar.gz) = lTTVzEgNSv9yAjNBGh92W+kIhXULB993I4CzTBDstcA=
-SIZE (msgpack-1.0.0.tar.gz) = 232331
+SHA256 (msgpack-0.6.2.tar.gz) = 6jwvhZNG/NVfxG6WiFMB2cL3o21FP12PKWeEDvoeGDA=
+SIZE (msgpack-0.6.2.tar.gz) = 119062
diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
index 7d948a0df47..2f24d170108 100644
--- net/py-msgpack/pkg/PLIST
+++ net/py-msgpack/pkg/PLIST
@@ -10,10 +10,8 @@
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
-${MODPY_COMMENT}@so
lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
+@so lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
lib/python${MODPY_VERSION}/site-packages/msgpack/_version.py
lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/msgpack/ext.py
lib/python${MODPY_VERSION}/site-packages/msgpack/fallback.py
diff --git sysutils/salt/Makefile sysutils/salt/Makefile
index 5129c2a60ad..d75547f2fbc 100644
--- sysutils/salt/Makefile
+++ sysutils/salt/Makefile
@@ -19,7 +19,7 @@ COMMENT = remote execution and configuration
management system
MODPY_EGG_VERSION =2018.3.3
DISTNAME = salt-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = sysutils net devel
@@ -40,7 +40,7 @@ BUILD_DEPENDS = textproc/py-yaml \
# requirements/base.txt
RUN_DEPENDS = devel/py-futures \
- net/py-msgpack \
+ net/py-msgpack<=0.6.2v0 \
textproc/py-MarkupSafe \
textproc/py-yaml \
www/py-jinja2 \
