UPDATE: libbluray 1.2.0
Here is an update to libbluray 1.2.0.
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/libbluray/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile24 Nov 2019 17:59:04 - 1.15
+++ Makefile24 Mar 2020 04:18:27 -
@@ -2,11 +2,11 @@
COMMENT = library supporting Blu-ray playback
-V =1.1.2
+V =1.2.0
DISTNAME = libbluray-${V}
CATEGORIES = multimedia
-HOMEPAGE = http://www.videolan.org/developers/libbluray.html
+HOMEPAGE = https://www.videolan.org/developers/libbluray.html
MASTER_SITES =
https://download.videolan.org/pub/videolan/libbluray/${V}/ \
ftp://ftp.videolan.org/pub/videolan/libbluray/${V}/
@@ -18,14 +18,17 @@ PERMIT_PACKAGE =Yes
WANTLIB += c expat fontconfig freetype iconv lzma m pthread
WANTLIB += xml2 z
-SHARED_LIBS += bluray 3.0 # 11.0
+SHARED_LIBS += bluray 3.1 # 11.0
LIB_DEPENDS = converters/libiconv \
textproc/libxml
BUILD_DEPENDS =devel/bison
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.16
+
SEPARATE_BUILD = Yes
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoreconf
YACC = ${LOCALBASE}/bin/bison -y
CONFIGURE_ARGS += --disable-bdjava-jar \
--disable-doxygen-doc \
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/libbluray/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo24 Nov 2019 17:59:04 - 1.7
+++ distinfo23 Mar 2020 18:44:41 -
@@ -1,2 +1,2 @@
-SHA256 (libbluray-1.1.2.tar.bz2) = o91FIjmxANydoNAbMOFpJpPiozKn0pkXv4S7EOp8C0I=
-SIZE (libbluray-1.1.2.tar.bz2) = 745779
+SHA256 (libbluray-1.2.0.tar.bz2) = zUHqBv0lEqd+v2OHKHNkGQjvgc4v5OTIQvYDWkdpbBE=
+SIZE (libbluray-1.2.0.tar.bz2) = 747265
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 24 Mar 2020 04:05:51 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+- Allow libbluray to be able to find mount points using the getfsstat() API.
+- Remove setting _POSIX_C_SOURCE as that breaks building some of the BSD
headers
+ due to BSD types.
+
+Index: Makefile.am
+--- Makefile.am.orig
Makefile.am
+@@ -25,7 +25,6 @@ AM_CFLAGS = \
+
+ AM_CPPFLAGS = \
+ -D_ISOC99_SOURCE \
+- -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) \
+ -D_REENTRANT \
+ \
+ -I$(top_srcdir)/src \
+@@ -200,7 +199,7 @@ libbluray_la_SOURCES+= \
+ src/file/dirs_xdg.c \
+ src/file/dl_posix.c \
+ src/file/file_posix.c \
+- src/file/mount.c
++ src/file/mount_getfsstat.c
+ endif
+ endif
+
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 24 Nov 2019 17:59:04 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,35 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2019/11/24 17:59:04 bcallah Exp $
-
-- Allow libbluray to be able to find mount points using the getfsstat() API.
-- Remove setting _POSIX_C_SOURCE as that breaks building some of the BSD
headers
- due to BSD types.
-
-Index: Makefile.in
Makefile.in.orig
-+++ Makefile.in
-@@ -152,7 +152,7 @@ host_triplet = @host@
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/dirs_xdg.c \
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/dl_posix.c \
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/file_posix.c \
--@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/mount.c
-+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/mount_darwin.c
-
- @USING_EXAMPLES_TRUE@noinst_PROGRAMS = bdj_test$(EXEEXT) \
- @USING_EXAMPLES_TRUE@ bdjo_dump$(EXEEXT) bdsplice$(EXEEXT) \
-@@ -327,7 +327,7 @@ am__dirstamp = $(am__leading_dot)dirstamp
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-dirs_xdg.lo \
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-dl_posix.lo \
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-file_posix.lo \
--@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-mount.lo
-+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-mount_darwin.lo
- am_libbluray_la_OBJECTS = src/file/libbluray_la-file.lo \
- src/file/libbluray_la-filesystem.lo \
- src/libbluray/libbluray_la-bluray.lo \
-@@ -845,7 +845,6 @@ AM_CFLAGS = \
-
- AM_CPPFLAGS = \
- -D_ISOC99_SOURCE \
-- -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) \
- -D_REENTRANT \
- \
- -I$(top_srcdir)/src \
Index: patches/patch-jni_jni_h
sparc64 bulk build report
Bulk build on sparc64-0.ports.openbsd.org Started : Sat Mar 21 02:30:19 MDT 2020 Finished: Mon Mar 23 16:16:55 MDT 2020 Duration: 2 Days 13 hours 47 minutes Built using OpenBSD 6.6-current (GENERIC.MP) #248: Wed Mar 18 21:32:03 MDT 2020 Built 10024 packages Number of packages built each day: Mar 21: 7865 Mar 22: 1832 Mar 23: 327 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2020-03-21/summary.log Build failures: 20 http://build-failures.rhaalovely.net/sparc64/2020-03-21/cad/qucs.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/devel/xtensa-esp32-elf/gcc-bootstrap.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/emulators/BasiliskII.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/games/xevil.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/geo/qgis.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/graphics/colord-gtk.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/mail/kopano/core.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/math/py-scikit-learn.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/misc/dtcltiny.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/net/dleyna/renderer.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/net/dleyna/server.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/net/telegram-purple.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/productivity/gnucash.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/telephony/iaxclient.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/x11/gnome/builder.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/x11/gnome/mutter.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/x11/gtk+4,-cloudprint.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/x11/libdbus-c++.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/x11/libhandy.log http://build-failures.rhaalovely.net/sparc64/2020-03-21/x11/tigervnc.log Recurrent failures: failures/cad/qucs.log failures/devel/xtensa-esp32-elf/gcc-bootstrap.log failures/emulators/BasiliskII.log failures/games/xevil.log failures/geo/qgis.log New failures: Resolved failures: -failures/devel/xtensa-lx106-elf/gcc.log Packages newly built: +audio/picard +benchmarks/netperf-wrapper,-gui +cad/klogic +devel/git-cola +devel/py-bencode,python3 +devel/qt-creator +devel/spyder/spyder,python3 +devel/xtensa-lx106-elf/gcc +devel/xtensa-lx106-elf/lx106-hal +editors/calligra +editors/py-qscintilla +editors/py-qscintilla,-common +editors/py-qscintilla,-main +editors/py-qscintilla,python3 +editors/py-qscintilla,python3,-common +editors/py-qscintilla,python3,-main +graphics/digikam +math/veusz +meta/kde4,,-admin +meta/kde4,,-extras +meta/kde4,,-games +meta/kde4,,-network +meta/kde4,-admin +meta/kde4,-extras +meta/kde4,-games +meta/kde4,-network +net/onionshare,-gui +print/hplip,-gui +productivity/kmymoney +security/py-dfvfs,python3 +security/py-dfwinreg,python3 +shells/py-qtconsole,python3 +sysutils/libfsapfs +sysutils/libluksde +textproc/calibre +www/weboob +x11/kde-applications/kajongg +x11/kde-applications/umbrello +x11/kde4/amor +x11/kde4/audiocd-kio +x11/kde4/ffmpegthumbs +x11/kde4/graphics-mobipocket +x11/kde4/graphics-thumbnailers +x11/kde4/jovie +x11/kde4/kaccessible +x11/kde4/kgamma +x11/kde4/kgpg +x11/kde4/kopete +x11/kde4/kopete,-main +x11/kde4/kopete,-sounds +x11/kde4/kpat +x11/kde4/kppp +x11/kde4/kscd +x11/kde4/kuser +x11/kde4/libs, +x11/kde4/libs,,-main +x11/kde4/mplayerthumbs +x11/kde4/pairs +x11/kde4/pim +x11/kde4/pim-runtime +x11/kde4/py-kde +x11/kde4/runtime +x11/kde4/runtime, +x11/kde4/runtime,,-locale +x11/kde4/runtime,,-main +x11/kde4/runtime,-locale +x11/kde4/runtime,-main +x11/kde4/superkaramba +x11/kde4/svgpart +x11/nagstamon +x11/py-qt5 +x11/py-qt5,python3 +x11/retrosmart-icon-theme Packages not built this time: -devel/py-bencode -devel/py-nbconvert -devel/py-rope -graphics/mirage -net/py-smbc -net/py-xmpp -net/spectrum -security/py-artifacts -security/py-dfdatetime -security/py-dfvfs -security/py-dfwinreg -sysutils/gamin,-python -sysutils/py-tsk -sysutils/py-vmomi -textproc/py-elasticsearch -textproc/py-xlrd
no sound with gcompris
Hi,
I guess I'm just missing a minor thing, but so far, gcompris is refusing to
play any sound.
In case it matters, I'm running a windowmaker desktop, other applications
have sound, i.e. firefox, witchblast, supertuxkart etc.
I've seen gcompris seems to rely on gstreamer to play audio,
so I tested games/gamine, which also seems to use gstreamer,
and that produces some background sound.
these are gstreamer related packages installed:
gstreamer-0.10.36p13 framework for streaming media
gstreamer-plugins-base-0.10.36p19 base elements for GStreamer
gstreamer1-1.16.2 framework for streaming media
gstreamer1-plugins-bad-1.16.2 bad elements for GStreamer
gstreamer1-plugins-base-1.16.2 base elements for GStreamer
gstreamer1-plugins-good-1.16.2 good elements for GStreamer
gstreamer1-plugins-libav-1.16.2 ffmpeg elements for GStreamer
gstreamer1mm-1.10.0p4 C++ bindings for GStreamer
phonon-gstreamer-icons-4.9.1-qt5 GStreamer-based Phonon backend icons
phonon-qt5-gstreamer-4.9.1 GStreamer-based Phonon backend
starting gcompris with debug, I get to see:
...
gcompris: Adding music/intro.ogg in the play list queue
gcompris: adding queue file (music/intro.ogg)
gcompris: ... get_next_sound_to_play : music/intro.ogg
gcompris: fx_play music/intro.ogg
(/usr/local/share/gcompris/boards/music/intro.ogg)
gcompris:uri 'file:///usr/local/share/gcompris/boards/music/intro.ogg'
gcompris: Adding voices/$LOCALE/misc/welcome.ogg in the play list queue
gcompris: adding queue file (voices/$LOCALE/misc/welcome.ogg)
...
but no errors or warnings regarding sound.
The only way I got gcompris to play audio was to switch
to sdl-mixer instead of gstreamer.
So, I guess I must just missing something, so a hit with a cluebat would be
appreciated.
I doubt it, but if there is no other way to get sound from gcompris, than to
switch to
sdl-mixer audio backend, would below patch OK?
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/games/gcompris/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- Makefile20 Mar 2020 16:44:23 - 1.72
+++ Makefile23 Mar 2020 22:06:20 -
@@ -4,7 +4,7 @@
DISTNAME= gcompris-17.05
EXTRACT_SUFX= .tar.bz2
-REVISION= 3
+REVISION= 4
CATEGORIES=games education
@@ -20,10 +20,12 @@
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender atk-1.0 c cairo cairo-gobject expat ffi fontconfig
WANTLIB += freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gstreamer-0.10 gthread-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
WANTLIB += gtk-x11-2.0 harfbuzz iconv intl lzma m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread rsvg-2
WANTLIB += sqlite3 util xcb xcb-render xcb-shm xml2 z
+WANTLIB += FLAC SDL SDL_mixer mikmod ogg smpeg sndio usbhid vorbis
+WANTLIB += vorbisfile
MASTER_SITES= http://gcompris.net/download/gtk/src/
@@ -55,6 +57,7 @@
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
CONFIGURE_ARGS=--enable-py-build-only \
+ --enable-sdlmixer \
--with-python=${MODPY_BIN}
# don't install under share/gnome/help/, there is no yelp (xml) file
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/gcompris/pkg/PLIST,v
retrieving revision 1.30
diff -u -r1.30 PLIST
--- pkg/PLIST 27 Jun 2018 21:03:46 - 1.30
+++ pkg/PLIST 23 Mar 2020 22:06:20 -
@@ -2,48 +2,48 @@
@bin bin/gcompris
@bin bin/gcompris-gnuchess
lib/gcompris/
-lib/gcompris/libalgebra.so
-lib/gcompris/libalgebra_guesscount.so
-lib/gcompris/libawele.so
-lib/gcompris/libbillard.so
-lib/gcompris/libcanal_lock.so
-lib/gcompris/libchess.so
-lib/gcompris/libclick_on_letter.so
-lib/gcompris/libclickgame.so
-lib/gcompris/libclockgame.so
-lib/gcompris/libcrane.so
-lib/gcompris/libenumerate.so
-lib/gcompris/liberase.so
-lib/gcompris/libfifteen.so
-lib/gcompris/libgletters.so
-lib/gcompris/libgoocanvas-gc.so
-lib/gcompris/libhanoi.so
-lib/gcompris/libhanoi_real.so
-lib/gcompris/libimageid.so
-lib/gcompris/libleftright.so
-lib/gcompris/libmagic_hat.so
-lib/gcompris/libmaze.so
-lib/gcompris/libmemory.so
-lib/gcompris/libmenu.so
-lib/gcompris/libmissingletter.so
-lib/gcompris/libmoney.so
-lib/gcompris/libparatrooper.so
-lib/gcompris/libphotohunter.so
-lib/gcompris/libplanegame.so
-lib/gcompris/libpython.so
-lib/gcompris/librailroad.so
-lib/gcompris/libreading.so
-lib/gcompris/libreversecount.so
-lib/gcompris/libscale.so
-lib/gcompris/libshapegame.so
-lib/gcompris/libsmallnumbers.so
-lib/gcompris/libsubmarine.so
-lib/gcompris/libsuperbrain.so
-lib/gcompris/libtangram.so
-lib/gcompris/libtarget.so
-lib/gcompris/libtraffic.so
-lib/gcompris/libwordprocessor.so
-lib/gcompris/libwordsgame.so
+@so lib/gcompris/libalg
Re: [UPDATE] python 3.7
On Mon, Mar 23, 2020 at 03:31:27PM +, Stuart Henderson wrote:
> On 2020/03/23 10:42, Kurt Mosiejczuk wrote:
> > Sorry I didn't commit my version earlier. I got bogged down in some
> > details when I did a portcheck before commit and got some complaints.
> > This still gets complaints and non-compiled .py files, but this does
> > properly move a bunch of tests from -main to -tests.
> You'll need to update the conflict in PLIST-tests, currently
> @conflict python->=3.6,<3.6.8p0
> will need to be <3.7.7
Better?
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.7/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile11 Feb 2020 20:43:11 - 1.15
+++ Makefile23 Mar 2020 18:32:40 -
@@ -6,13 +6,9 @@
# Python itself.
VERSION = 3.7
-PATCHLEVEL = .6
+PATCHLEVEL = .7
SHARED_LIBS = python3.7m 0.0
VERSION_SPEC = >=3.7,<3.8
-
-REVISION = 0
-REVISION-main =1
-REVISION-idle =1
CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.7/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo28 Dec 2019 18:35:39 - 1.4
+++ distinfo23 Mar 2020 18:32:40 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.7.6.tgz) = ru5oHCNa0zavEW8Iq2VjNhoMgcU3BywbMJ1uQFCqIRQ=
-SIZE (Python-3.7.6.tgz) = 23148187
+SHA256 (Python-3.7.7.tgz) = jIvpHNJkihoMJR8E6gu0wqVXD+ucReqqIkHHhVhbR1o=
+SIZE (Python-3.7.7.tgz) = 23161893
Index: pkg/PLIST-idle
===
RCS file: /cvs/ports/lang/python/3.7/pkg/PLIST-idle,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-idle
--- pkg/PLIST-idle 11 Feb 2020 20:43:12 - 1.7
+++ pkg/PLIST-idle 23 Mar 2020 18:32:40 -
@@ -3,12 +3,12 @@
@option is-branch
@conflict python-idle-${VERSION_SPEC}
@conflict python-idle->=3.2,<3.7
+@conflict python->=3.6,<3.6.8p0
@pkgpath lang/python/3.2,-idle
@pkgpath lang/python/3.3,-idle
@pkgpath lang/python/3.4,-idle
@pkgpath lang/python/3.5,-idle
@pkgpath lang/python/3.6,-idle
-@conflict python->=3.6,<3.6.8p0
bin/idle3
bin/idle3.7
lib/python3.7/idlelib/
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.7/pkg/PLIST-main,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-main
--- pkg/PLIST-main 11 Feb 2020 20:43:12 - 1.11
+++ pkg/PLIST-main 23 Mar 2020 18:32:41 -
@@ -893,220 +893,6 @@ lib/python3.7/ctypes/macholib/dylib.py
lib/python3.7/ctypes/macholib/fetch_macholib
lib/python3.7/ctypes/macholib/fetch_macholib.bat
lib/python3.7/ctypes/macholib/framework.py
-lib/python3.7/ctypes/test/
-lib/python3.7/ctypes/test/__init__.py
-lib/python3.7/ctypes/test/__main__.py
-lib/python3.7/ctypes/test/__pycache__/
-lib/python3.7/ctypes/test/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/__init__.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/__init__.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/__main__.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/__main__.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/__main__.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_anon.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_anon.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_anon.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_array_in_pointer.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_array_in_pointer.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_array_in_pointer.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_arrays.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_arrays.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_arrays.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_as_parameter.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_as_parameter.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_as_parameter.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bitfields.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bitfields.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bitfields.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_buffers.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_buffers.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_buffers.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bytes.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bytes.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bytes.cpython-37.pyc
-lib/py
UPDATE: libdvdread / libdvdnav 6.1.0
Here are updates to libdvdread and libdvdnav 6.1.0.
Index: devel/libdvdread/Makefile
===
RCS file: /home/cvs/ports/devel/libdvdread/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- devel/libdvdread/Makefile 21 Mar 2020 18:58:07 - 1.31
+++ devel/libdvdread/Makefile 23 Mar 2020 16:27:37 -
@@ -2,13 +2,13 @@
COMMENT = accessing DVD files
-VER = 6.0.2
+VER = 6.1.0
DISTNAME = libdvdread-${VER}
CATEGORIES = devel
MASTER_SITES = https://download.videolan.org/pub/videolan/libdvdread/${VER}/
EXTRACT_SUFX = .tar.bz2
-SHARED_LIBS = dvdread 8.0
+SHARED_LIBS = dvdread 8.1
HOMEPAGE = http://dvdnav.mplayerhq.hu/
Index: devel/libdvdread/distinfo
===
RCS file: /home/cvs/ports/devel/libdvdread/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- devel/libdvdread/distinfo 21 Mar 2020 18:58:07 - 1.13
+++ devel/libdvdread/distinfo 23 Mar 2020 16:22:11 -
@@ -1,2 +1,2 @@
-SHA256 (libdvdread-6.0.2.tar.bz2) =
+RQBryE7IZzd4ktGxQpX8pMB/rf5ZWePHX7UYyzG/rA=
-SIZE (libdvdread-6.0.2.tar.bz2) = 405298
+SHA256 (libdvdread-6.1.0.tar.bz2) =
UBu9fR59Xy0qD/jQpqwvvX5efg6A74L++Bj0OjC0dQw=
+SIZE (libdvdread-6.1.0.tar.bz2) = 391316
Index: devel/libdvdread/patches/patch-src_dvd_input_c
===
RCS file: /home/cvs/ports/devel/libdvdread/patches/patch-src_dvd_input_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_dvd_input_c
--- devel/libdvdread/patches/patch-src_dvd_input_c 1 May 2019 03:51:17
- 1.4
+++ devel/libdvdread/patches/patch-src_dvd_input_c 23 Mar 2020 16:22:43
-
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_dvd_input_c,v 1.4 20
Index: src/dvd_input.c
--- src/dvd_input.c.orig
+++ src/dvd_input.c
-@@ -282,7 +282,7 @@ int dvdinput_setup(void)
+@@ -324,7 +324,7 @@ int dvdinput_setup(void *priv, dvd_logger_cb *logcb)
#elif defined(__OS2__)
#define CSS_LIB "dvdcss2.dll"
#else
Index: devel/libdvdread/pkg/PLIST
===
RCS file: /home/cvs/ports/devel/libdvdread/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- devel/libdvdread/pkg/PLIST 1 May 2019 03:51:17 - 1.8
+++ devel/libdvdread/pkg/PLIST 23 Mar 2020 16:34:22 -
@@ -10,7 +10,7 @@ include/dvdread/nav_print.h
include/dvdread/nav_read.h
include/dvdread/nav_types.h
include/dvdread/version.h
-lib/libdvdread.a
+@static-lib lib/libdvdread.a
lib/libdvdread.la
@lib lib/libdvdread.so.${LIBdvdread_VERSION}
lib/pkgconfig/dvdread.pc
Index: multimedia/libdvdnav/Makefile
===
RCS file: /home/cvs/ports/multimedia/libdvdnav/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- multimedia/libdvdnav/Makefile 21 Mar 2020 18:58:07 - 1.27
+++ multimedia/libdvdnav/Makefile 23 Mar 2020 17:30:03 -
@@ -2,23 +2,23 @@
COMMENT= DVD navigation library
-VER= 6.0.1
+VER= 6.1.0
DISTNAME= libdvdnav-${VER}
EPOCH= 0
CATEGORIES=multimedia
MASTER_SITES= https://download.videolan.org/pub/videolan/libdvdnav/${VER}/
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= dvdnav 7.1
+SHARED_LIBS= dvdnav 7.2
HOMEPAGE= http://dvdnav.mplayerhq.hu/
# GPLv2+
PERMIT_PACKAGE=Yes
-WANTLIB= dvdread>=8.0 pthread
+WANTLIB= dvdread>=8.1 pthread
-LIB_DEPENDS= devel/libdvdread>=6.0.2
+LIB_DEPENDS= devel/libdvdread>=6.1.0
CONFIGURE_STYLE= gnu
Index: multimedia/libdvdnav/distinfo
===
RCS file: /home/cvs/ports/multimedia/libdvdnav/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- multimedia/libdvdnav/distinfo 21 Mar 2020 18:58:07 - 1.11
+++ multimedia/libdvdnav/distinfo 23 Mar 2020 16:31:06 -
@@ -1,2 +1,2 @@
-SHA256 (libdvdnav-6.0.1.tar.bz2) = 5WajlvGVABcIi/12A5WwVl20QjQZWtpUEzZsnSOSZzM=
-SIZE (libdvdnav-6.0.1.tar.bz2) = 378491
+SHA256 (libdvdnav-6.1.0.tar.bz2) = 9pexXqn3Xp82vfbsNyYwgWnxVOKx6Zhl0LvoI3IM7ls=
+SIZE (libdvdnav-6.1.0.tar.bz2) = 370145
Index: multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in
===
RCS file: /home/cvs/ports/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-misc_dvdnav_pc_in
--- multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in21 Mar 2020
18:58:07 - 1.4
+++ multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in23 Mar 2020
16:32:26 -
@@ -5,7 +5,7 @@ Index: misc/dvdnav.pc.in
+++ misc/dvdnav.pc.in
@@ -9,4 +9,5 @@ Version: @VERSION@
- Requires.private: dvdread >= 4.1.2
+ Requires.private
GnuPG port using wrong link for sendmail
Hi all, I seem to have some trouble getting GnuPG to work as it needs sendmail to be located in /usr/lib/sendmail. The upstream bug has been reported: https://dev.gnupg.org/T4886 It can be mitigated by building GnuPG by setting the --with-mailprog= Best, Aisha
Re: update: devel/py-wcwidth (cascading devel/{py-prompt_toolkit,ipython} dropping py2 support)
On Mon 23/03/2020 09:41, Paco Esteban wrote: > On Mon, 23 Mar 2020, Bjorn Ketelaars wrote: > > > On Sun 22/03/2020 18:39, Paco Esteban wrote: > > > Ping ? > > > > > > (This needs bket's diff discussed on another thread: > > > https://marc.info/?l=openbsd-ports&m=158464110714289&w=2) > > > > > > Find attached the (still relevant) parts for convenience. > > > > Output of 'show-reverse-deps devel/py-wcwidth' shows that there are > > other consumers that still need the python2-flavor. At least: > > - devel/bpython > > - devel/py-curtsies > > I sent those on another thread. > They are awaiting "ok". > > You can take a look if you want ;-) OK bket@, after devel/bpython and devel/py-curtsies have been migrated to py3-only.
Re: update devel/py-curtsies (triggers drop py2 support for devel/bpython)
On Sun 22/03/2020 18:41, Paco Esteban wrote:
> Ping ?
>
> Diffs attached again for convenience.
Comments inline
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/devel/py-curtsies/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 12 Jul 2019 20:45:47 - 1.9
> +++ Makefile 13 Mar 2020 14:32:06 -
> @@ -2,10 +2,9 @@
>
> COMMENT =curses-like terminal wrapper
>
> -MODPY_EGG_VERSION = 0.2.11
> +MODPY_EGG_VERSION = 0.3.1
> DISTNAME = curtsies-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> -REVISION = 1
> CATEGORIES = devel
>
> # MIT
> @@ -15,11 +14,16 @@ MODULES = lang/python
>
> MODPY_SETUPTOOLS = Yes
> MODPY_PI = Yes
> +MODPY_PYTEST = Yes
>
> FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> RUN_DEPENDS =devel/py-blessings${MODPY_FLAVOR} \
> devel/py-wcwidth${MODPY_FLAVOR}
> +
> +TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} \
> + devel/py-mock${MODPY_FLAVOR} \
> + devel/py-pyte${MODPY_FLAVOR}
I prefer to have dependencies sorted ^.
With the above OK bket@ for py-curtsies
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/devel/bpython/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile 22 Sep 2019 21:46:07 - 1.26
> +++ Makefile 15 Mar 2020 15:28:30 -
> @@ -5,6 +5,7 @@ COMMENT= fancy interface to the Python i
> MODPY_EGG_VERSION=0.18
> DISTNAME=bpython-${MODPY_EGG_VERSION}
> CATEGORIES= devel
> +REVISION = 0
>
> HOMEPAGE=https://bpython-interpreter.org/
> MAINTAINER= Brian Callahan
> @@ -19,11 +20,7 @@ MODULES= lang/python
> MODPY_SETUPTOOLS=Yes
>
> FLAVORS =python3
> -FLAVOR ?=
> -
> -.if ${FLAVOR:Mpython3}
> -PKGNAME =bpython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
'make install' results in a collision. Either set PKGNAME as above or
change the conflict marker (see below). Personally I prefer setting
PKGNAME.
> -.endif
> +FLAVOR = python3
>
> RUN_DEPENDS= devel/desktop-file-utils \
> devel/py-curtsies${MODPY_FLAVOR} \
> @@ -37,17 +34,5 @@ BUILD_DEPENDS= devel/py-babel${MODPY_FLA
>
> TEST_DEPENDS=devel/py-mock${MODPY_FLAVOR} \
> devel/py-twisted${MODPY_FLAVOR}
> -
> -# de-conflict flavors
> -post-install:
> -.for b in bpdb bpython bpython-curses bpython-urwid
> - mv ${PREFIX}/bin/$b{,${MODPY_BIN_SUFFIX}}
> -.endfor
> - mv ${PREFIX}/man/man1/bpython{,${MODPY_BIN_SUFFIX}}.1
> - mv ${PREFIX}/man/man5/bpython-config{,${MODPY_BIN_SUFFIX}}.5
> - mv
> ${PREFIX}/share/appinfo/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.appdata.xml
> - mv
> ${PREFIX}/share/applications/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.desktop
> - mv ${PREFIX}/share/pixmaps/bpython{,${MODPY_BIN_SUFFIX}}.png
> -
>
> .include
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/devel/bpython/pkg/PLIST,v
> retrieving revision 1.9
> diff -u -p -r1.9 PLIST
> --- pkg/PLIST 9 Aug 2019 00:00:40 - 1.9
> +++ pkg/PLIST 15 Mar 2020 16:07:07 -
> @@ -1,8 +1,10 @@
> @comment $OpenBSD: PLIST,v 1.9 2019/08/09 00:00:40 bcallah Exp $
> -bin/bpdb${MODPY_BIN_SUFFIX}
> -bin/bpython${MODPY_BIN_SUFFIX}
> -bin/bpython-curses${MODPY_BIN_SUFFIX}
> -bin/bpython-urwid${MODPY_BIN_SUFFIX}
> +@conflict bpython-*
As explained above: either set PKGNAME or change the @conflict-marker to
bpython3-*.
My proposal is to let the MAINTAINER decide which is the better
solution.
BTW, the quirk you need to add to devel/quirks is dependent on the above:
- PKGNAME option: 'bpython' => 'bpython3'.
- Updated conflict-marker: 'bpython3' => 'bpython'
Re: update devel/py-curtsies (triggers drop py2 support for devel/bpython)
On Sun, Mar 22 2020, Paco Esteban wrote: > Ping ? > > Diffs attached again for convenience. > > On Sun, 15 Mar 2020, Paco Esteban wrote: > >> Hi ports@, >> >> This complements an update sent previously for devel/py-wcwidth. >> Here's an update for devel/py-curtsies to 0.3.1. You can see the >> changelog here: >> >> https://github.com/bpython/curtsies/blob/master/CHANGELOG.md >> >> All tests pass. >> >> I've enabled pytest for tests and dropped py2 support for this port. >> This triggers drop py2 support for its only consumer devel/bpython (also >> attached). Maintainer (bcallah@) is ok with it. Four test fail, same >> as before the update. Tested it lightly, so more eyes on it are >> welcome. ok jca@ (can be committed right now) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update: devel/py-wcwidth (cascading devel/{py-prompt_toolkit,ipython} dropping py2 support)
On Sun, Mar 22 2020, Paco Esteban wrote: > Ping ? > > (This needs bket's diff discussed on another thread: > https://marc.info/?l=openbsd-ports&m=158464110714289&w=2) ok jca@ once ipython has been moved to python3 only. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [UPDATE] python 3.7
On 2020/03/23 10:42, Kurt Mosiejczuk wrote: > On Mon, Mar 23, 2020 at 07:45:45AM +0100, Remi Pointel wrote: > > Hi, > > > this is the diff to update python 3 to 3.7.7. > > > Could it be tested in a bulk build please? > > > Ok? > > Sorry I didn't commit my version earlier. I got bogged down in some > details when I did a portcheck before commit and got some complaints. > > This still gets complaints and non-compiled .py files, but this does > properly move a bunch of tests from -main to -tests. You'll need to update the conflict in PLIST-tests, currently @conflict python->=3.6,<3.6.8p0 will need to be <3.7.7
Re: NEW: devel/dwz
On Mon, Mar 23, 2020 at 11:21:40AM -0400, Brian Callahan wrote: > > > On 2020-03-23 11:11 AM, Marc Espie wrote: > > On Mon, Mar 23, 2020 at 11:08:16AM -0400, Brian Callahan wrote: > > > > > > On 2020-03-23 10:54 AM, Marc Espie wrote: > > > > On Fri, Mar 20, 2020 at 03:22:16PM -0400, Brian Callahan wrote: > > > > > Hello ports -- > > > > > > > > > > It was hinted at recently that a port of dwz might be desirable. Here > > > > > is > > > > > one. > > > > > > > > > > --- > > > > > pkg/DESCR: > > > > > dwz is a program that attempts to optimize DWARF debugging information > > > > > contained in ELF shared libraries and ELF executables for size, by > > > > > replacing DWARF information representation with equivalent smaller > > > > > representation where possible and by reducing the amount of > > > > > duplication > > > > > using techniques from DWARF standard appendix E - creating > > > > > DW_TAG_partial_unit compilation units (CUs) for duplicated information > > > > > and using DW_TAG_imported_unit to import it into each CU that needs > > > > > it. > > > > > --- > > > > > > > > > > Can verify that it does in fact do something with some test binaries > > > > > on > > > > > amd64 (diffing the output of `objdump -g' from a newer binutils does > > > > > show > > > > > substantial differences), but I don't know enough about DWARF symbols > > > > > to > > > > > authoritatively say anything more than that. Testing on other archs > > > > > would be > > > > > greatly appreciated. > > > > > > > > > > OK? > > > > Thanks for the initial work, but you're not thinking straight. > > > > > > > > Here's an updated port. > > > > > > > > You'll notice the dependencies on gmake and xz are gone, which is > > > > required if we want to use this for DEBUG_PACKAGES eventually ;) > > > Unless I'm missing something, you sent me back my own port without > > > changes. > > > I'm fine with switching to the gz tarball and removing the dependency on > > > gmake. I get why. > > Oops, bad tarball > > Like I said before, this is all fine. > At some point, perhaps someone should look into making the tests work. I > have never been able to figure out how to get dejagnu to work so I disabled > them but that might not be ideal. Oh, I'll have a look later. Please import this. This is mostly your work, I just did a wee little bit of tinkering ;)
Re: NEW: devel/dwz
On 2020-03-23 11:11 AM, Marc Espie wrote: On Mon, Mar 23, 2020 at 11:08:16AM -0400, Brian Callahan wrote: On 2020-03-23 10:54 AM, Marc Espie wrote: On Fri, Mar 20, 2020 at 03:22:16PM -0400, Brian Callahan wrote: Hello ports -- It was hinted at recently that a port of dwz might be desirable. Here is one. --- pkg/DESCR: dwz is a program that attempts to optimize DWARF debugging information contained in ELF shared libraries and ELF executables for size, by replacing DWARF information representation with equivalent smaller representation where possible and by reducing the amount of duplication using techniques from DWARF standard appendix E - creating DW_TAG_partial_unit compilation units (CUs) for duplicated information and using DW_TAG_imported_unit to import it into each CU that needs it. --- Can verify that it does in fact do something with some test binaries on amd64 (diffing the output of `objdump -g' from a newer binutils does show substantial differences), but I don't know enough about DWARF symbols to authoritatively say anything more than that. Testing on other archs would be greatly appreciated. OK? Thanks for the initial work, but you're not thinking straight. Here's an updated port. You'll notice the dependencies on gmake and xz are gone, which is required if we want to use this for DEBUG_PACKAGES eventually ;) Unless I'm missing something, you sent me back my own port without changes. I'm fine with switching to the gz tarball and removing the dependency on gmake. I get why. Oops, bad tarball Like I said before, this is all fine. At some point, perhaps someone should look into making the tests work. I have never been able to figure out how to get dejagnu to work so I disabled them but that might not be ideal. ~Brian
Re: NEW: devel/dwz
On Mon, Mar 23, 2020 at 11:08:16AM -0400, Brian Callahan wrote: > > > On 2020-03-23 10:54 AM, Marc Espie wrote: > > On Fri, Mar 20, 2020 at 03:22:16PM -0400, Brian Callahan wrote: > > > Hello ports -- > > > > > > It was hinted at recently that a port of dwz might be desirable. Here is > > > one. > > > > > > --- > > > pkg/DESCR: > > > dwz is a program that attempts to optimize DWARF debugging information > > > contained in ELF shared libraries and ELF executables for size, by > > > replacing DWARF information representation with equivalent smaller > > > representation where possible and by reducing the amount of duplication > > > using techniques from DWARF standard appendix E - creating > > > DW_TAG_partial_unit compilation units (CUs) for duplicated information > > > and using DW_TAG_imported_unit to import it into each CU that needs it. > > > --- > > > > > > Can verify that it does in fact do something with some test binaries on > > > amd64 (diffing the output of `objdump -g' from a newer binutils does show > > > substantial differences), but I don't know enough about DWARF symbols to > > > authoritatively say anything more than that. Testing on other archs would > > > be > > > greatly appreciated. > > > > > > OK? > > Thanks for the initial work, but you're not thinking straight. > > > > Here's an updated port. > > > > You'll notice the dependencies on gmake and xz are gone, which is > > required if we want to use this for DEBUG_PACKAGES eventually ;) > > Unless I'm missing something, you sent me back my own port without changes. > I'm fine with switching to the gz tarball and removing the dependency on > gmake. I get why. Oops, bad tarball dwz.tgz Description: dwz.tgz
Re: NEW: devel/dwz
On 2020-03-23 10:54 AM, Marc Espie wrote: On Fri, Mar 20, 2020 at 03:22:16PM -0400, Brian Callahan wrote: Hello ports -- It was hinted at recently that a port of dwz might be desirable. Here is one. --- pkg/DESCR: dwz is a program that attempts to optimize DWARF debugging information contained in ELF shared libraries and ELF executables for size, by replacing DWARF information representation with equivalent smaller representation where possible and by reducing the amount of duplication using techniques from DWARF standard appendix E - creating DW_TAG_partial_unit compilation units (CUs) for duplicated information and using DW_TAG_imported_unit to import it into each CU that needs it. --- Can verify that it does in fact do something with some test binaries on amd64 (diffing the output of `objdump -g' from a newer binutils does show substantial differences), but I don't know enough about DWARF symbols to authoritatively say anything more than that. Testing on other archs would be greatly appreciated. OK? Thanks for the initial work, but you're not thinking straight. Here's an updated port. You'll notice the dependencies on gmake and xz are gone, which is required if we want to use this for DEBUG_PACKAGES eventually ;) Unless I'm missing something, you sent me back my own port without changes. I'm fine with switching to the gz tarball and removing the dependency on gmake. I get why. ~Brian
Re: NEW: devel/dwz
On Fri, Mar 20, 2020 at 03:22:16PM -0400, Brian Callahan wrote: > Hello ports -- > > It was hinted at recently that a port of dwz might be desirable. Here is > one. > > --- > pkg/DESCR: > dwz is a program that attempts to optimize DWARF debugging information > contained in ELF shared libraries and ELF executables for size, by > replacing DWARF information representation with equivalent smaller > representation where possible and by reducing the amount of duplication > using techniques from DWARF standard appendix E - creating > DW_TAG_partial_unit compilation units (CUs) for duplicated information > and using DW_TAG_imported_unit to import it into each CU that needs it. > --- > > Can verify that it does in fact do something with some test binaries on > amd64 (diffing the output of `objdump -g' from a newer binutils does show > substantial differences), but I don't know enough about DWARF symbols to > authoritatively say anything more than that. Testing on other archs would be > greatly appreciated. > > OK? Thanks for the initial work, but you're not thinking straight. Here's an updated port. You'll notice the dependencies on gmake and xz are gone, which is required if we want to use this for DEBUG_PACKAGES eventually ;) dwz.tgz Description: dwz.tgz
Re: [UPDATE] python 3.7
On Mon, Mar 23, 2020 at 07:45:45AM +0100, Remi Pointel wrote:
> Hi,
> this is the diff to update python 3 to 3.7.7.
> Could it be tested in a bulk build please?
> Ok?
Sorry I didn't commit my version earlier. I got bogged down in some
details when I did a portcheck before commit and got some complaints.
This still gets complaints and non-compiled .py files, but this does
properly move a bunch of tests from -main to -tests.
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.7/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile11 Feb 2020 20:43:11 - 1.15
+++ Makefile23 Mar 2020 14:41:16 -
@@ -6,13 +6,9 @@
# Python itself.
VERSION = 3.7
-PATCHLEVEL = .6
+PATCHLEVEL = .7
SHARED_LIBS = python3.7m 0.0
VERSION_SPEC = >=3.7,<3.8
-
-REVISION = 0
-REVISION-main =1
-REVISION-idle =1
CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.7/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo28 Dec 2019 18:35:39 - 1.4
+++ distinfo23 Mar 2020 14:41:16 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.7.6.tgz) = ru5oHCNa0zavEW8Iq2VjNhoMgcU3BywbMJ1uQFCqIRQ=
-SIZE (Python-3.7.6.tgz) = 23148187
+SHA256 (Python-3.7.7.tgz) = jIvpHNJkihoMJR8E6gu0wqVXD+ucReqqIkHHhVhbR1o=
+SIZE (Python-3.7.7.tgz) = 23161893
Index: pkg/PLIST-idle
===
RCS file: /cvs/ports/lang/python/3.7/pkg/PLIST-idle,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-idle
--- pkg/PLIST-idle 11 Feb 2020 20:43:12 - 1.7
+++ pkg/PLIST-idle 23 Mar 2020 14:41:17 -
@@ -3,12 +3,12 @@
@option is-branch
@conflict python-idle-${VERSION_SPEC}
@conflict python-idle->=3.2,<3.7
+@conflict python->=3.6,<3.6.8p0
@pkgpath lang/python/3.2,-idle
@pkgpath lang/python/3.3,-idle
@pkgpath lang/python/3.4,-idle
@pkgpath lang/python/3.5,-idle
@pkgpath lang/python/3.6,-idle
-@conflict python->=3.6,<3.6.8p0
bin/idle3
bin/idle3.7
lib/python3.7/idlelib/
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.7/pkg/PLIST-main,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-main
--- pkg/PLIST-main 11 Feb 2020 20:43:12 - 1.11
+++ pkg/PLIST-main 23 Mar 2020 14:41:17 -
@@ -893,220 +893,6 @@ lib/python3.7/ctypes/macholib/dylib.py
lib/python3.7/ctypes/macholib/fetch_macholib
lib/python3.7/ctypes/macholib/fetch_macholib.bat
lib/python3.7/ctypes/macholib/framework.py
-lib/python3.7/ctypes/test/
-lib/python3.7/ctypes/test/__init__.py
-lib/python3.7/ctypes/test/__main__.py
-lib/python3.7/ctypes/test/__pycache__/
-lib/python3.7/ctypes/test/__pycache__/__init__.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/__init__.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/__init__.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/__main__.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/__main__.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/__main__.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_anon.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_anon.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_anon.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_array_in_pointer.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_array_in_pointer.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_array_in_pointer.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_arrays.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_arrays.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_arrays.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_as_parameter.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_as_parameter.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_as_parameter.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bitfields.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bitfields.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bitfields.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_buffers.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_buffers.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_buffers.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bytes.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bytes.cpython-37.opt-2.pyc
-lib/python3.7/ctypes/test/__pycache__/test_bytes.cpython-37.pyc
-lib/python3.7/ctypes/test/__pycache__/test_byteswap.cpython-37.opt-1.pyc
-lib/python3.7/ctypes/tes
[update] net/synapse -> 1.12.0
Hi,
Here is a diff for synapse to upgrade to version 1.12.0
Please note that Synapse may be vulnerable to request-smuggling attacks
when it is used with a reverse-proxy. The vulnerabilties are fixed in
Twisted 20.3.0, and are described in CVE-2020-10108 and CVE-2020-10109.
So we might need to upgrade py-twisted too
Regards
Index: Makefile
===
RCS file: /cvs/ports/net/synapse/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 8 Mar 2020 17:03:15 - 1.1.1.1
+++ Makefile 23 Mar 2020 14:00:07 -
@@ -2,7 +2,7 @@
COMMENT = open network for secure, decentralized communication
-MODPY_EGG_VERSION = 1.11.0
+MODPY_EGG_VERSION = 1.12.0
GH_ACCOUNT = matrix-org
GH_PROJECT = synapse
Index: distinfo
===
RCS file: /cvs/ports/net/synapse/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 8 Mar 2020 17:03:15 - 1.1.1.1
+++ distinfo 23 Mar 2020 14:00:07 -
@@ -1,2 +1,2 @@
-SHA256 (synapse-1.11.0.tar.gz) = SqyqZHy8OY7yqERic7n0SVSLZGrsYVucjmDan5iRZSM=
-SIZE (synapse-1.11.0.tar.gz) = 6363628
+SHA256 (synapse-1.12.0.tar.gz) = d56nHxnK72kBX2AIdqYXMV+KdJ/guxQ93swZe/4y4NU=
+SIZE (synapse-1.12.0.tar.gz) = 6381352
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/synapse/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 9 Mar 2020 08:17:59 - 1.2
+++ pkg/PLIST 23 Mar 2020 14:00:08 -
@@ -60,6 +60,7 @@
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}federation_reader.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}federation_sender.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}frontend_proxy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}generic_worker.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}homeserver.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}media_repository.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/app/${MODPY_PYCACHE}pusher.${MODPY_PYC_MAGIC_TAG}pyc
@@ -73,6 +74,7 @@
lib/python${MODPY_VERSION}/site-packages/synapse/app/federation_reader.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/federation_sender.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/frontend_proxy.py
+lib/python${MODPY_VERSION}/site-packages/synapse/app/generic_worker.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/homeserver.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/media_repository.py
lib/python${MODPY_VERSION}/site-packages/synapse/app/pusher.py
@@ -529,6 +531,7 @@
lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/registration_success.html
lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/room.html
lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/room.txt
+lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/saml_error.html
lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/sso_redirect_confirm.html
lib/python${MODPY_VERSION}/site-packages/synapse/rest/
lib/python${MODPY_VERSION}/site-packages/synapse/rest/__init__.py
@@ -760,6 +763,7 @@
lib/python${MODPY_VERSION}/site-packages/synapse/storage/${MODPY_PYCACHE}relations.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/storage/${MODPY_PYCACHE}roommember.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/storage/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/storage/_base.py
lib/python${MODPY_VERSION}/site-packages/synapse/storage/background_updates.py
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/
@@ -1100,6 +1104,8 @@
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/57/rooms_version_column.sql
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/57/rooms_version_column_2.sql.postgres
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/57/rooms_version_column_2.sql.sqlite
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/57/rooms_version_column_3.sql.postgres
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/57/rooms_version_column_3.sql.sqlite
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/full_schemas/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/full_schemas/16/
lib/python${MODPY_VERSION}/site-packages/synaps
Re: aircrack-ng-1.5.2p2 free(): chunk canary corrupted 0x11a3c50e6c00 0x2ac@0x2ac
On 2020/03/23 09:00, Martin wrote:
> It looks stupid, but I can't add DEBUG='-g' to aircrack-ng executable when
> built it from ports.
>
> I've tried to:
>
> 1. make DEBUG='-g'
> 2. in Makefile MAKE_FLAGS+= CC=${CC} DEBUG='-g'
>
> In both cases no egdb debug symbols added to the executable during build.
>
> Some search points me to kernel debugging by adding makeoptions DEBUG="-g"
> into kernel config file. But nothing found how to deal with port executable
> debugging.
>
> Please advice.
>
> Martin
>
> ‐‐‐ Original Message ‐‐‐
> On Friday, March 20, 2020 12:32 PM, Klemens Nanni wrote:
>
> > On Fri, Mar 20, 2020 at 10:33:51AM +, Martin wrote:
> >
> > > Tried with GDB from ports, no debugging symbols found.
> >
> > There is no debug-aircrack-ng package yet; you could work on that or
> > simply rebuild the port with DEBUG='-g' to get an executable with
> > symbols you can load from egdb using `symbol-file FILE'.
> >
> > > On Tuesday, March 10, 2020 2:16 PM, Martin martin...@protonmail.com wrote:
> > >
> > > > It seems malloc problem. aircrack-ng from packages.
> > > > 6.6-current amd64 setting is:
> > > > /etc/sysctl.conf
> > > > vm.malloc_conf=CF
> > > > Should I set different malloc rule or is it a bug?
> >
> > From malloc(3):
> >
> > If a program changes behavior if any of these options (except X) are
> > used, it is buggy.
>
>
The port needs this diff to honour CFLAGS, then you can "make clean;
make DEBUG=-g repackage reinstall".
benoit, ok?
Index: Makefile
===
RCS file: /cvs/ports/security/aircrack-ng/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile6 Dec 2019 14:29:40 - 1.29
+++ Makefile23 Mar 2020 14:01:42 -
@@ -2,7 +2,7 @@
COMMENT= 802.11 WEP and WPA-PSK keys cracking program
DISTNAME= aircrack-ng-1.5.2
-REVISION= 3
+REVISION= 4
CATEGORIES=security
HOMEPAGE= https://www.aircrack-ng.org/
@@ -39,7 +39,7 @@ CONFIGURE_STYLE= autoreconf
CONFIGURE_ENV+=ax_cv_neon_cflags=no ax_cv_neon_cxxflags=no
MAKE_ENV+= SQLITE=true UNSTABLE=true
-MAKE_FLAGS+= CC=${CC}
+MAKE_FLAGS+= CC="${CC}" CFLAGS="${CFLAGS}"
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
PKG_ARGS+= -Dx86=1
Re: [new] archivers/laszip 3.4.3
On Sun, Mar 22 2020, Landry Breuil wrote: > Hi, > > here's a port for https://laszip.org/, a library to compress point cloud > files (known as LAS) - will be useful for a geo/pdal update i'm working > on. Its source is also in geo/lastools, but there's no way yet to build > against this lib. It might be used by other geo/* bits too at some > point. > > ok to import ? - no HOMEPAGE? :) - NO_TESTS->NO_TEST (see infrastructure/templates/mk.conf.template) - c++11 -> no point in listing base-gcc in COMPILER - I found the Makefile ordering confusing (eg couldn't find WANTLIB at first) ok to import the attached tarball laszip-2.tgz Description: Binary data -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: aircrack-ng-1.5.2p2 free(): chunk canary corrupted 0x11a3c50e6c00 0x2ac@0x2ac
It looks stupid, but I can't add DEBUG='-g' to aircrack-ng executable when
built it from ports.
I've tried to:
1. make DEBUG='-g'
2. in Makefile MAKE_FLAGS+= CC=${CC} DEBUG='-g'
In both cases no egdb debug symbols added to the executable during build.
Some search points me to kernel debugging by adding makeoptions DEBUG="-g" into
kernel config file. But nothing found how to deal with port executable
debugging.
Please advice.
Martin
‐‐‐ Original Message ‐‐‐
On Friday, March 20, 2020 12:32 PM, Klemens Nanni wrote:
> On Fri, Mar 20, 2020 at 10:33:51AM +, Martin wrote:
>
> > Tried with GDB from ports, no debugging symbols found.
>
> There is no debug-aircrack-ng package yet; you could work on that or
> simply rebuild the port with DEBUG='-g' to get an executable with
> symbols you can load from egdb using `symbol-file FILE'.
>
> > On Tuesday, March 10, 2020 2:16 PM, Martin martin...@protonmail.com wrote:
> >
> > > It seems malloc problem. aircrack-ng from packages.
> > > 6.6-current amd64 setting is:
> > > /etc/sysctl.conf
> > > vm.malloc_conf=CF
> > > Should I set different malloc rule or is it a bug?
>
> From malloc(3):
>
> If a program changes behavior if any of these options (except X) are
> used, it is buggy.
Re: update: devel/py-wcwidth (cascading devel/{py-prompt_toolkit,ipython} dropping py2 support)
On Mon, 23 Mar 2020, Bjorn Ketelaars wrote: > On Sun 22/03/2020 18:39, Paco Esteban wrote: > > Ping ? > > > > (This needs bket's diff discussed on another thread: > > https://marc.info/?l=openbsd-ports&m=158464110714289&w=2) > > > > Find attached the (still relevant) parts for convenience. > > Output of 'show-reverse-deps devel/py-wcwidth' shows that there are > other consumers that still need the python2-flavor. At least: > - devel/bpython > - devel/py-curtsies I sent those on another thread. They are awaiting "ok". You can take a look if you want ;-) -- Paco Esteban. 0x5818130B8A6DBC03
