UPDATE: editors/tiled
Update tiled to 1.3.1 (Qt4 to Qt5).
Notable changes:
- Move to GH_*
- s/http/https/
- Tests are no longer build. I didn't get a good look at it. tiled works
fine for me in a simple run-time test.
- Set MODPY_DEFAULT_VERSION_3
OK?
Index: Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:46:06 - 1.15
+++ Makefile21 Feb 2020 07:10:16 -
@@ -2,36 +2,32 @@
COMMENT = tile map editor
-V =0.9.1
-DISTNAME = tiled-qt-${V}
-PKGNAME = tiled-${V}
-REVISION = 6
+GH_ACCOUNT = bjorn
+GH_PROJECT = tiled
+GH_TAGNAME = v1.3.1
-SHARED_LIBS += tiled 0.0 # 1.0
+SHARED_LIBS += tiled 1.0 # 1.0
CATEGORIES = editors games
-HOMEPAGE = http://www.mapeditor.org/
+HOMEPAGE = https://www.mapeditor.org/
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
-WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Widgets
+WANTLIB += c m ${MODPY_WANTLIB} z
-COMPILER = base-clang ports-gcc base-gcc
+MODULES = devel/qmake \
+ lang/python \
+ x11/qt5
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-MODULES = devel/qmake x11/qt4
# XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
DPB_PROPERTIES = nojunk
-
-do-test:
- cd ${WRKSRC}/tests/staggeredrenderer && ./staggeredrenderer && \
- cd ${WRKSRC}/tests/mapreader && ./mapreader
.include
Index: distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo28 Apr 2014 09:48:54 - 1.2
+++ distinfo21 Feb 2020 07:10:16 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-1.3.1.tar.gz) = s3Mh41vdt7yW+QaO3AYmiz8OuGMv5iBq7ilsjWw7pyI=
+SIZE (tiled-1.3.1.tar.gz) = 15728903
Index: patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
diff -N patches/patch-src_automappingconverter_automappingconverter_pro
--- patches/patch-src_automappingconverter_automappingconverter_pro 28 Apr
2014 09:48:54 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1
2014/04/28 09:48:54 bentley Exp $
src/automappingconverter/automappingconverter.pro.orig Mon Apr 28
02:32:11 2014
-+++ src/automappingconverter/automappingconverter.pro Mon Apr 28 02:32:17 2014
-@@ -48,7 +48,7 @@ HEADERS += \
- FORMS+= \
- converterwindow.ui
-
--manpage.path = $${PREFIX}/share/man/man1/
-+manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/automappingconverter.1
- INSTALLS += manpage
-
Index: patches/patch-src_tiled_tiled_pro
===
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_tiled_tiled_pro
--- patches/patch-src_tiled_tiled_pro 28 Apr 2014 09:48:54 - 1.2
+++ patches/patch-src_tiled_tiled_pro 21 Feb 2020 07:10:16 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-src_tiled_tiled_pro,v 1.2 2014/04/28 09:48:54 bentley Exp $
src/tiled/tiled.pro.orig Sat Jul 27 14:34:23 2013
-+++ src/tiled/tiled.proMon Apr 28 01:48:23 2014
-@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
- desktopfile.files += ../../docs/tiled.desktop
- INSTALLS += desktopfile
+Index: src/tiled/tiled.pro
+--- src/tiled/tiled.pro.orig
src/tiled/tiled.pro
+@@ -552,7 +552,7 @@ appdatafile.path = $${PREFIX}/share/metainfo/
+ appdatafile.files += ../../org.mapeditor.Tiled.appdata.xml
+ INSTALLS += appdatafile
-manpage.path = $${PREFIX}/share/man/man1/
+manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/tiled.1
+ manpage.files += ../../man/tiled.1
INSTALLS += manpage
Index: patches/patch-src_tmxrasterizer_tmxrasterizer_pro
===
RCS file:
/cvs/ports/editors/tiled/patches/patch-src_tmxrasterizer_tmxrasterizer_pro,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_tmxrasterizer_tmxrasterizer_pro
---
Qt4 to Qt5 switch in graphics/djview4
Simple switch form qt4 to qt5. Tested on amd64, OK?
Index: Makefile
===
RCS file: /cvs/ports/graphics/djview4/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- Makefile12 Jul 2019 20:46:57 - 1.37
+++ Makefile21 Feb 2020 06:28:15 -
@@ -4,7 +4,7 @@ COMMENT=portable DjVu viewer and browse
DISTNAME= djview-4.10.6
PKGNAME= ${DISTNAME:S/djview/djview4/}
-REVISION= 6
+REVISION= 7
CATEGORIES=graphics print
HOMEPAGE= http://djvu.sourceforge.net/djview4.html
@@ -12,15 +12,13 @@ HOMEPAGE= http://djvu.sourceforge.net/dj
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += GL ICE QtGui QtNetwork QtOpenGL SM X11 Xext Xi Xinerama
-WANTLIB += Xrender c djvulibre fontconfig freetype glib-2.0 iconv intl m
-WANTLIB += pcre pthread ${COMPILER_LIBCXX} tiff
-
-COMPILER = base-clang ports-gcc base-gcc
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5OpenGL
+WANTLIB += Qt5PrintSupport Qt5Widgets c djvulibre glib-2.0 iconv
+WANTLIB += intl m pcre tiff
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/}
-MODULES= x11/qt4
+MODULES= x11/qt5
LIB_DEPENDS= graphics/djvulibre
@@ -28,9 +26,12 @@ RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+3,-guic
USE_GMAKE= Yes
+
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--with-tiff=${LOCALBASE}
-CONFIGURE_ENV+=QTDIR="${MODQT4_QTDIR}" \
+
+CONFIGURE_ARGS=-with-tiff=${LOCALBASE}
+
+CONFIGURE_ENV+=QTDIR="${MODQT_QTDIR}" \
CPPFLAGS="-I${X11BASE}/include"
MAKE_ENV+= V=1
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/djview4/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 29 Jun 2018 22:16:16 - 1.10
+++ pkg/PLIST 21 Feb 2020 06:28:15 -
@@ -3,7 +3,7 @@
lib/mozilla/
lib/mozilla/plugins/
@comment lib/mozilla/plugins/nsdejavu.la
-lib/mozilla/plugins/nsdejavu.so
+@so lib/mozilla/plugins/nsdejavu.so
@man man/man1/djview.1
@man man/man1/nsdejavu.1
share/applications/djvulibre-djview4.desktop
UPDATE: editors/teaqt
Update tea-qt 50.0.4. Just another Qt5 update.
CC maintainer from homepage http://semiletov.org/tea/#downloads :-D
OK?
Index: Makefile
===
RCS file: /cvs/ports/editors/teaqt/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile12 Jul 2019 20:46:06 - 1.26
+++ Makefile21 Feb 2020 06:23:14 -
@@ -2,32 +2,41 @@
COMMENT = powerful and simple qt4 editor
-V =33.3.0
-REVISION = 2
-DISTNAME = tea-${V}
-PKGNAME = teaqt-${V}
+GH_ACCOUNT = psemiletov
+GH_PROJECT = tea-qt
+GH_TAGNAME = 50.0.4
+
+PKGNAME = teaqt-${GH_TAGNAME}
+
CATEGORIES = editors x11
-MASTER_SITES = http://semiletov.org/tea/dloads/ \
- ${MASTER_SITE_SOURCEFORGE:=tea-editor/}
-EXTRACT_SUFX = .tar.bz2
HOMEPAGE = http://semiletov.org/tea/
# GPLv3
PERMIT_PACKAGE = Yes
-LIB_DEPENDS = textproc/aspell/core
-WANTLIB += c m pthread ${COMPILER_LIBCXX} z QtGui QtXml aspell
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
+WANTLIB += aspell c djvulibre hunspell-1.6 m poppler-qt5 z
-COMPILER = base-clang ports-gcc base-gcc
+MODULES = devel/cmake \
+ x11/qt5
-MODULES = devel/qmake x11/qt4
-CONFIGURE_ENV =USE_ASPELL=true USE_HUNSPELL=false
+LIB_DEPENDS = graphics/djvulibre \
+ print/poppler,-qt5 \
+ textproc/aspell/core \
+ textproc/hunspell
+
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+3,-guic
+
+
+CONFIGURE_ARGS += -DCMAKE_C_FLAGS="${CFLAGS} \
+ -I${LOCALBASE}/include" \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} \
+ -I${LOCALBASE}/include" \
+ -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} \
+ -L${LOCALBASE}/lib"
NO_TEST = Yes
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/bin/tea ${PREFIX}/bin/tea
.include
Index: distinfo
===
RCS file: /cvs/ports/editors/teaqt/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo22 Nov 2012 10:45:46 - 1.12
+++ distinfo21 Feb 2020 06:23:14 -
@@ -1,2 +1,2 @@
-SHA256 (tea-33.3.0.tar.bz2) = FNVAzWgluUvSLmVbJiZFj9XGEefEzDEk/X2a8+t/Xqg=
-SIZE (tea-33.3.0.tar.bz2) = 310901
+SHA256 (tea-qt-50.0.4.tar.gz) = INH/whj203ijOvrExOtlIDYwWnI8O0Ce4q+8Tum9Hs4=
+SIZE (tea-qt-50.0.4.tar.gz) = 504276
Index: patches/patch-spellchecker_cpp
===
RCS file: patches/patch-spellchecker_cpp
diff -N patches/patch-spellchecker_cpp
--- patches/patch-spellchecker_cpp 22 Nov 2012 10:45:46 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-spellchecker_cpp,v 1.3 2012/11/22 10:45:46 landry Exp $
spellchecker.cpp.orig Tue Aug 28 21:01:31 2012
-+++ spellchecker.cpp Thu Nov 22 11:37:32 2012
-@@ -79,9 +79,6 @@ CSpellchecker::CSpellchecker (const QString , con
-
- CSpellchecker::~CSpellchecker()
- {
-- if (speller)
-- delete_aspell_speller (speller);
--
- if (spell_config)
- delete_aspell_config (spell_config);
-
Index: patches/patch-src_pro
===
RCS file: patches/patch-src_pro
diff -N patches/patch-src_pro
--- patches/patch-src_pro 22 Nov 2012 10:45:46 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_pro,v 1.3 2012/11/22 10:45:46 landry Exp $
src.pro.orig Tue Aug 28 21:01:31 2012
-+++ src.proThu Nov 22 11:37:32 2012
-@@ -138,12 +138,10 @@ DISTFILES += ChangeLog \
-
- unix: {
- contains(USE_ASPELL,true){
--exists("/usr/include/aspell.h") {
- message ("ASpell enabled")
- LIBS += -laspell
- DEFINES += ASPELL_ENABLE
- DEFINES += SPELLCHECK_ENABLE
--}
- }
- }
-
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/teaqt/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 20 Apr 2009 10:29:05 - 1.1.1.1
+++ pkg/PLIST 21 Feb 2020 06:23:14 -
@@ -1,2 +1,23 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/04/20 10:29:05 giovanni Exp $
@bin bin/tea
+share/applications/
+share/applications/tea.desktop
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/128x128/
+share/icons/hicolor/128x128/apps/
+share/icons/hicolor/128x128/apps/tea.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/tea.png
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/tea.png
+share/icons/hicolor/64x64/
+share/icons/hicolor/64x64/apps/
+share/icons/hicolor/64x64/apps/tea.png
Re: UPDATE: lang/quickjs 2019.10.27 => 2020.01.19
On Wed, 19 Feb 2020 21:20:46 -0500
George Koehler wrote:
> ... I fixed my macppc build by adding the line
> *arg++ = "-latomic";
> after -lm in qjsc.c
Bad news: my macppc qjsc needs /usr/ports/pobj/quickjs-2020.01.19/bin
in PATH, so it works during the build, but not after the install.
$ qjsc -o example example.js
...
/usr/local/include/quickjs/quickjs.h:168: warning: ...
...
/usr/bin/ld: cannot find -latomic
collect2: ld returned 1 exit status
When WRKDIR/bin is in the path, then qjsc works without any warnings
from quick.js. (The linker gives the usual warnings for calling
strcpy(), strcat(), sprintf() in libc.)
Good news: the only failing test is on macppc is test_typed_array in
test_builtin.js, and it only fails because it assumes little endian,
but QuickJS uses big endian. (ES2019 allows both.) If I skip or
modify the test, then all other tests pass.
Also, the tests write WRKDIR/qjs.core on both amd64 and macppc, but
this is only a side effect of a successful test to send SIGQUIT to a
cat(1) process. My macppc wrote qjs.core and not cat.core, because
the child never returned from fork(2).
Here's what I changed from Brian's update diff.
I added a CFLAGS line in the port Makefile:
# Fix "undefined reference to `__atomic_store_8'"
.if ${MACHINE_ARCH:Mpowerpc} || ${MACHINE_ARCH:Mhppa}
WANTLIB += atomic
CFLAGS += -DLINK_ATOMIC # for patch-qjsc_c
MAKE_FLAGS += LDFLAGS="${LDFLAGS} -latomic"
.endif
I can't put CFLAGS in MAKE_FLAGS, because that would disable some
"CFLAGS += ..." lines in WRKSRC/Makefile. Instead, I rely on
MAKE_ENV to forward CFLAGS. I edited the chunk in patch-qjsc_c:
@@ -446,7 +446,9 @@ static int output_executable(const char *out_filename,
lib_dir, bn_suffix, lto_suffix);
*arg++ = libjsname;
*arg++ = "-lm";
-*arg++ = "-ldl";
+#ifdef LINK_ATOMIC
+*arg++ = "-latomic";
+#endif
*arg = NULL;
if (verbose) {
I added a chunk to patch-tests_test_builtin_js:
@@ -410,7 +410,10 @@ function test_typed_array()
a = new Uint8Array(buffer);
-assert(a.toString(), "0,0,255,255,0,0,0,0,0,0,128,63,255,255,255,255");
+if (a[8] == 63) // big endian?
+assert(a.toString(), "0,0,255,255,0,0,0,0,63,128,0,0,255,255,255,255");
+else
+assert(a.toString(), "0,0,255,255,0,0,0,0,0,0,128,63,255,255,255,255");
assert(a.buffer, buffer);
Remove: databases/sqliteman
I would like to see sqliteman gone. My arguments:
- Upstream dead, last update 2010
- Qt4
- editors/qscintilla (Qt4) consumer -- Which should also disappear soon!
- Better alterntives in tree like databases/{sqlitebrowser,kexi} and
maybe more.
OK to remove with a suggestions line in quirks?
RS
UPDATE: net/weechat
Update weechat to 2.7.1 (security release)
This update fix three security problems.
- CVE-2020-8955
Buffer overflow when receiving a malformed IRC message 324 (channel
mode).
- Buffer overflow when a new IRC message 005 is received with longer
nick prefixes.
- Crash when receiving a malformed IRC message 352 (WHO).
OK? and also OK for -stable?
Index: Makefile
===
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 Makefile
--- Makefile11 Jan 2020 07:26:00 - 1.45
+++ Makefile21 Feb 2020 05:20:15 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 2.7
+V= 2.7.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 distinfo
--- distinfo11 Jan 2020 07:26:00 - 1.24
+++ distinfo21 Feb 2020 05:20:15 -
@@ -1,2 +1,2 @@
-SHA256 (weechat-2.7.tar.gz) = UDikfG6H5W/Nk3rMFZ2J92hFpBKJI8EAcAq6p8Xbeu0=
-SIZE (weechat-2.7.tar.gz) = 4393859
+SHA256 (weechat-2.7.1.tar.gz) = xBDqe4/ellP4yd+IZ9Pua0zI+4diYLZYhCJ6S/YTlaU=
+SIZE (weechat-2.7.1.tar.gz) = 4394236
Re: new: www/p5-Test-LWP-UserAgent
On Fri, Feb 21 2020, Paco Esteban wrote: > Hi ports@ > > This is a slightly modified version of a port I sent a long time ago: > > https://marc.info/?l=openbsd-ports=154246569216247=2 > > That even got an ok: > > https://marc.info/?l=openbsd-ports=154843970711942=2 > > About the port: > > This module is a subclass of LWP::UserAgent which overrides a few > key low-level methods that are concerned with actually sending your > request over the network, allowing an interception of that request and > simulating a particular response. This greatly facilitates testing of > client networking code where the server follows a known protocol. > > All test pass for me on amd64. > > comments and/or ok appreciated. With Makefile following the order of Makefile.template, ok jca@. Having a consistent order helps when you're looking at lots of ports. Updated tarball attached. p5-Test-LWP-UserAgent-2.tgz Description: Binary data -- 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: st...@cvs.openbsd.org 2020/02/20 17:56:29
Modified files:
x11/qt5/qttools: Makefile
Log message:
"x11/qt5/qtwebkit>=${QT5_WEBKIT_VERSION},<${QT5_NEXT_VERSION}" is no longer
valid now that the qtwebkit version is higher than the main Qt version.
Replace with "x11/qt5/qtwebkit>=${QT5_WEBKIT_VERSION}", unbreaking build.
Re: update request: net/mlvpn
On 2020/02/20 23:48, Laurent Coustet wrote:
> Hi ports@
>
> I've fixed the last version of net/mlvpn in order to support
> OpenBSD 6.6+.
>
> No major changes, just random fixes and version bump.
>
> Changes:
>
> - Send keepalives every 1s, detect timeouts at 2s (@stapelberg)
> - Fix calculation of loss ration with sequence of tunnel (@flohoff)
> - Fix compiler warning (switch fall through)
> - Fix: ERRMSGSIZ should be greather than PATHMAX
> - Fix: OpenBSD: fix bad usage of TUNSIFINFO: missing type
> - FIX: BSD: tun device name fix. (allow tun10+ to be used)
>
> --
> Laurent Coustet
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/mlvpn/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 12 Jul 2019 20:48:32 - 1.8
> +++ Makefile 20 Feb 2020 22:47:07 -
> @@ -2,7 +2,7 @@
>
> COMMENT =link-aggregation VPN software
>
> -V = 2.2.2
> +V = 2.3.4
> DISTNAME = mlvpn-$V
> DISTFILES = ${DISTNAME}{$V}.tar.gz
> WRKDIST =${WRKDIR}/MLVPN-$V
I've reworked this stuff now you provide proper tar.gz files rather
than the github auto-generated ones (thanks :-)
> @@ -26,9 +26,10 @@ CONFIGURE_STYLE = autoreconf
> CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
> ac_cv_header_valgrind_valgrind_h=no
> +CONFIGURE_ARGS +=--without-filters --without-control
That didn't build for me, needs --disable-filters not --without-filters.
Here's my diff (removed some things which aren't needed any more, regenerate
the PLIST on -current).
Updated diff (I haven't tested runtime) :-
Index: Makefile
===
RCS file: /cvs/ports/net/mlvpn/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile12 Jul 2019 20:48:32 - 1.8
+++ Makefile21 Feb 2020 00:28:22 -
@@ -2,38 +2,29 @@
COMMENT = link-aggregation VPN software
-V =2.2.2
+V =2.3.4
DISTNAME = mlvpn-$V
-DISTFILES =${DISTNAME}{$V}.tar.gz
-WRKDIST = ${WRKDIR}/MLVPN-$V
-REVISION = 3
CATEGORIES = net
-HOMEPAGE = http://www.mlvpn.fr/
+HOMEPAGE = https://zehome.github.io/MLVPN/
# BSD
PERMIT_PACKAGE = Yes
WANTLIB += c ev m sodium
-MASTER_SITES = https://github.com/zehome/MLVPN/archive/
+MASTER_SITES = https://github.com/zehome/MLVPN/releases/download/$V/
LIB_DEPENDS = devel/libev \
security/libsodium
-CONFIGURE_STYLE = autoreconf
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += --disable-control \
+ --disable-filters
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
ac_cv_header_valgrind_valgrind_h=no
-
-AUTOCONF_VERSION = 2.69
-AUTOMAKE_VERSION = 1.14
-AUTORECONF = ./autogen.sh
-
-post-patch:
- cd ${WRKSRC}; \
- [ -r .tarball-version ] || echo $V > .tarball-version
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mlvpn
Index: distinfo
===
RCS file: /cvs/ports/net/mlvpn/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo24 Oct 2015 08:32:14 - 1.2
+++ distinfo21 Feb 2020 00:28:22 -
@@ -1,2 +1,2 @@
-SHA256 (mlvpn-2.2.2.tar.gz) = +kVbV9jmdlUNAc/lUkjVtZX8qBLM69ql6tJBLEMgVF8=
-SIZE (mlvpn-2.2.2.tar.gz) = 78919
+SHA256 (mlvpn-2.3.4.tar.gz) = /Lomb9Y9HQkWGju7AIT6VX7k5ch27F68SjCp59BHgc4=
+SIZE (mlvpn-2.3.4.tar.gz) = 214706
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/mlvpn/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 23 Oct 2015 09:28:58 - 1.1.1.1
+++ pkg/PLIST 21 Feb 2020 00:28:22 -
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/10/23 09:28:58 sthen Exp $
@newgroup _mlvpn:758
@newuser _mlvpn:758:_mlvpn:daemon:mlvpn user:/var/empty:/sbin/nologin
+@rcscript ${RCDIR}/mlvpn
@man man/man1/mlvpn.1
@man man/man5/mlvpn.conf.5
@bin sbin/mlvpn
@@ -13,10 +14,11 @@ share/doc/mlvpn/README.debug.md
share/doc/mlvpn/README.md
share/doc/mlvpn/mlvpn.default
share/doc/mlvpn/mlvpn.init.d
+share/doc/mlvpn/mlvpn.rc
share/examples/mlvpn/
+@mode 770
@owner root
@group wheel
-@mode 770
@sample ${SYSCONFDIR}/mlvpn/
@mode
share/examples/mlvpn/mlvpn.conf
@@ -26,7 +28,3 @@ share/examples/mlvpn/mlvpn.conf
share/examples/mlvpn/mlvpn_updown.sh
@mode 700
@sample ${SYSCONFDIR}/mlvpn/mlvpn_updown.sh
-@mode
-@owner
-@group
-@rcscript ${RCDIR}/mlvpn
update request: net/mlvpn
Hi ports@
I've fixed the last version of net/mlvpn in order to support
OpenBSD 6.6+.
No major changes, just random fixes and version bump.
Changes:
- Send keepalives every 1s, detect timeouts at 2s (@stapelberg)
- Fix calculation of loss ration with sequence of tunnel (@flohoff)
- Fix compiler warning (switch fall through)
- Fix: ERRMSGSIZ should be greather than PATHMAX
- Fix: OpenBSD: fix bad usage of TUNSIFINFO: missing type
- FIX: BSD: tun device name fix. (allow tun10+ to be used)
--
Laurent Coustet
Index: Makefile
===
RCS file: /cvs/ports/net/mlvpn/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 12 Jul 2019 20:48:32 - 1.8
+++ Makefile 20 Feb 2020 22:47:07 -
@@ -2,7 +2,7 @@
COMMENT = link-aggregation VPN software
-V = 2.2.2
+V = 2.3.4
DISTNAME = mlvpn-$V
DISTFILES = ${DISTNAME}{$V}.tar.gz
WRKDIST = ${WRKDIR}/MLVPN-$V
@@ -26,9 +26,10 @@ CONFIGURE_STYLE = autoreconf
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
ac_cv_header_valgrind_valgrind_h=no
+CONFIGURE_ARGS += --without-filters --without-control
AUTOCONF_VERSION = 2.69
-AUTOMAKE_VERSION = 1.14
+AUTOMAKE_VERSION = 1.16
AUTORECONF = ./autogen.sh
post-patch:
Index: distinfo
===
RCS file: /cvs/ports/net/mlvpn/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 24 Oct 2015 08:32:14 - 1.2
+++ distinfo 20 Feb 2020 22:47:07 -
@@ -1,2 +1,2 @@
-SHA256 (mlvpn-2.2.2.tar.gz) = +kVbV9jmdlUNAc/lUkjVtZX8qBLM69ql6tJBLEMgVF8=
-SIZE (mlvpn-2.2.2.tar.gz) = 78919
+SHA256 (mlvpn-2.3.4.tar.gz) = cXmPLE9B5FCaLv1SmYaQGM9k0ZpnJjM7JQuFo2f5xYU=
+SIZE (mlvpn-2.3.4.tar.gz) = 88270
cvs server: Diffing pkg
new: www/p5-Test-LWP-UserAgent
Hi ports@ This is a slightly modified version of a port I sent a long time ago: https://marc.info/?l=openbsd-ports=154246569216247=2 That even got an ok: https://marc.info/?l=openbsd-ports=154843970711942=2 About the port: This module is a subclass of LWP::UserAgent which overrides a few key low-level methods that are concerned with actually sending your request over the network, allowing an interception of that request and simulating a particular response. This greatly facilitates testing of client networking code where the server follows a known protocol. All test pass for me on amd64. comments and/or ok appreciated. Cheers, -- Paco Esteban. 5818130B8A6DBC03 p5-Test-LWP-UserAgent.tar.gz Description: Binary data
Re: [net/zabbix] PSK support?
Whoops, Thunderbird mangled the line endings. Apparently it doesn't do
it if the extension is .txt? Hopefully this one is OK.
On 2/20/2020 4:11 PM, William Leuschner wrote:
robert@ and ports@,
What do you think about making gnutls the default cryptography library
for net/zabbix? I've attached a diff that changes it, if you think it's
a good idea.
Sincerely,
William Leuschner
Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.162
diff -u -p -r1.162 Makefile
--- Makefile3 Feb 2020 19:13:41 - 1.162
+++ Makefile20 Feb 2020 21:04:40 -
@@ -36,7 +36,7 @@ FLAVORS = mysql pgsql sqlite3
SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
-WANTLIB = c iconv kvm m execinfo lber ldap crypto ssl z \
+WANTLIB = c iconv kvm m execinfo lber ldap z \
curl nghttp2 pcre
LIB_DEPENDS = converters/libiconv \
@@ -51,12 +51,13 @@ LIB_DEPENDS-server =${LIB_DEPENDS} \
textproc/libxml \
net/net-snmp \
textproc/iksemel \
- security/libssh2
+ security/libssh2 \
+ security/gnutls
RUN_DEPENDS-server = net/fping
# we want the _zabbix user as well as README-main
RUN_DEPENDS-server += net/zabbix,-main>=${VERSION}
-WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp iksemel pthread \
- xml2 ssh2
+WANTLIB-server = ${WANTLIB} z netsnmp iksemel pthread \
+ xml2 ssh2 gnutls
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-server \
@@ -69,7 +70,7 @@ CONFIGURE_ARGS = --enable-server \
--with-ldap \
--with-jabber="${LOCALBASE}" \
--with-ssh2 \
- --with-openssl
+ --with-gnutls
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
ac_cv_search___res_query=no
@@ -84,8 +85,9 @@ ZABBIX_WEB = ${PREFIX-web}/zabbix
LIB_DEPENDS-proxy =${LIB_DEPENDS} \
net/net-snmp \
security/libssh2 \
+ security/gnutls \
textproc/libxml
-WANTLIB-proxy =${WANTLIB} netsnmp ssh2 xml2 pthread
+WANTLIB-proxy =${WANTLIB} netsnmp ssh2 gnutls xml2 pthread
RUN_DEPENDS-proxy =# empty
FLAVOR ?= no_server
Re: [net/zabbix] PSK support?
robert@ and ports@,
What do you think about making gnutls the default cryptography library
for net/zabbix? I've attached a diff that changes it, if you think it's
a good idea.
On 2/19/2020 6:06 PM, Stuart Henderson wrote:
On 2020/02/19 16:17, William Leuschner wrote:
Hello porters,
I'm trying to set up Zabbix with pre-shared keys so that:
* connections are encrypted, and
* the agent will reject connections from anyone without the key.
The configuration that should work currently fails with a library error.
According to this note from 2017[1], PSK support was removed from LibreSSL,
and the best choice would be building against gnutls. Has anything changed
since then, or is gnutls still the best option? If gnutls is the best bet,
would a gnutls flavor be welcome?
Thanks,
William Leuschner
[1]: https://marc.info/?l=openbsd-ports=148465399628705=2
It will be a pain to add a FLAVOR to this port (you will have to handle
the combination with existing flavours and multipackages, it's possible but
definitely non-trivial, and means ongoing work testing more combinations
of build options for every update).
I don't use this and am not the maintainer so there might be good reasons
not to, but as far as the port is concerned it would be much simpler to
switch completely to gnutls rather than make it optional.
Sincerely,
William Leuschner
Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.162
diff -u -p -r1.162 Makefile
--- Makefile3 Feb 2020 19:13:41 - 1.162
+++ Makefile20 Feb 2020 21:04:40 -
@@ -36,7 +36,7 @@ FLAVORS = mysql pgsql sqlite3
SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
-WANTLIB = c iconv kvm m execinfo lber ldap crypto ssl z \
+WANTLIB = c iconv kvm m execinfo lber ldap z \
curl nghttp2 pcre
LIB_DEPENDS = converters/libiconv \
@@ -51,12 +51,13 @@ LIB_DEPENDS-server =${LIB_DEPENDS} \
textproc/libxml \
net/net-snmp \
textproc/iksemel \
- security/libssh2
+ security/libssh2 \
+ security/gnutls
RUN_DEPENDS-server = net/fping
# we want the _zabbix user as well as README-main
RUN_DEPENDS-server += net/zabbix,-main>=${VERSION}
-WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp iksemel pthread \
- xml2 ssh2
+WANTLIB-server = ${WANTLIB} z netsnmp iksemel pthread \
+ xml2 ssh2 gnutls
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-server \
@@ -69,7 +70,7 @@ CONFIGURE_ARGS = --enable-server \
--with-ldap \
--with-jabber="${LOCALBASE}" \
--with-ssh2 \
- --with-openssl
+ --with-gnutls
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
ac_cv_search___res_query=no
@@ -84,8 +85,9 @@ ZABBIX_WEB = ${PREFIX-web}/zabbix
LIB_DEPENDS-proxy =${LIB_DEPENDS} \
net/net-snmp \
security/libssh2 \
+ security/gnutls \
textproc/libxml
-WANTLIB-proxy =${WANTLIB} netsnmp ssh2 xml2 pthread
+WANTLIB-proxy =${WANTLIB} netsnmp ssh2 gnutls xml2 pthread
RUN_DEPENDS-proxy =# empty
FLAVOR ?= no_server
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/02/20 13:19:23 Modified files: sysutils/py-ghmi: Makefile distinfo Log message: update to py-ghmi-1.5.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/02/20 13:16:50 Modified files: net: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm net/py-netmiko : Makefile distinfo net/py-netmiko/pkg: PLIST net/napalm : Makefile.inc net/napalm/py-napalm: Makefile net/napalm/py-napalm/pkg: PLIST net/py-IOSXR : Makefile net/py-IOSXR/pkg: PLIST Log message: update py-netmiko to 3.0.0 this drops support for python2, so adjust dependant ports accordingly (py-IOSXR and py-napalm). as discussed with stuart we will force the python3 flavor for these ports to make it easier in the future to add additional flavors when needed. add quirks as needed and remove the non-python3 entries from the category Makefiles ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2020/02/20 13:09:07 Modified files: devel/pyusb: Makefile distinfo Added files: devel/pyusb/patches: patch-usb_backend_libusb0_py Log message: update pyusb to a newer snapshot; upstream hasn't made a release available in some time while development has continued. ok sthen@
Re: [NEW] mail/aerc
On Mon, Feb 10, 2020 at 09:10:15AM -0700, Aaron Bieber wrote:
> On Sat, 01 Feb 2020 at 03:29:25 -0500, Raymond E. Pasco wrote:
> > - I used a modified distfile provided by abieber with a vendor directory,
> > which is necessary due to the large number of go package dependencies.
> >
> > - The custom version of go-libvterm used by aerc upstream includes an
> > (unmodified) bundled copy of libvterm itself, which causes issues with
> > the build. I instead link against devel/libvterm.
> >
> > - One filter script shipped with aerc (to display HTML email) depends on
> > socksify (provided by security/dante) and www/w3m. I did not include these
> > as RUN_DEPENDS because this is an optional script disabled by default,
> > but I'm not sure whether this approach is correct.
> >
> > - cgo in go 1.13 (but not go 1.14) considers ~ an invalid path character,
> > but the top-level package name here (and therefore WRKSRC) contains an ~.
> > I remedied this by moving the vendor directory contents up to the level
> > of the MODGO_WORKSPACE. This workaround shouldn't be necessary when go
> > 1.14 is released.
> >
> > - aerc can be built with notmuch support, but notmuch isn't in ports (yet?),
> > so I didn't bother with this.
>
> It looks good to me. I'd like to pass in MODGO_FLAGS so we can have verbose
> info when DEBUG is set. Something like:
> MAKE_ENV += GOFLAGS="${MODGO_FLAGS}"
>
> But it seems the "-p ${MAKE_JOBS}" bit from go.port.mk isn't getting parsed
> properly in this case.
>
> Anyway, if that bit can be sorted out, OK abieber@ for import!
ok jung@ as well (convinced by sthen's args earlier in this thread)
Re: [MAINTAINER UPDATE] zola-0.10.0
Updated patch attached. On Thu, Feb 20, 2020 at 10:51 AM Kurt Mosiejczuk wrote: > On Thu, Feb 20, 2020 at 10:30:51AM -0800, Peter Ezetta wrote: > > On Thu, Feb 20, 2020 at 10:18 AM Kurt Mosiejczuk > wrote: > > > > You've got a number of crates tagged with "# LICENSE" > > > I'm guessing those are placeholders. > > > Thanks for pointing that out, I hadn't noticed them. Looks like the > > modcargo-gen-crates-licenses target just tagged them with # LICENSE as > the > > three crates in question have non-standard licenses. > > > fuscia's license appears to be a Google license similar to the BSD > 3-Clause > > -- https://fuchsia.googlesource.com/fuchsia/+/master/LICENSE > > BSD 3-clause > > > ring's license is based on BoringSSL's, and is ISC-like -- > > https://github.com/briansmith/ring/blob/master/LICENSE > > I'd put "Old OpenSSL" > > > webpki's license is also ISC-like -- > > https://github.com/briansmith/webpki/blob/master/LICENSE > > I'd go with ISC-Style myself on this one. > > --Kurt > Index: Makefile === RCS file: /cvs/ports/www/zola/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 29 Oct 2019 10:51:49 - 1.1.1.1 +++ Makefile 20 Feb 2020 19:39:14 - @@ -1,12 +1,14 @@ # $OpenBSD: Makefile,v 1.1.1.1 2019/10/29 10:51:49 semarie Exp $ +BROKEN-sparc64 = ring-0.16.11 module fails build on sparc64 arch + COMMENT = static site generator -DISTNAME = zola-0.9.0 +DISTNAME = zola-0.10.0 GH_ACCOUNT = getzola GH_PROJECT = zola -GH_TAGNAME = v0.9.0 +GH_TAGNAME = v0.10.0 HOMEPAGE = https://www.getzola.org @@ -29,171 +31,150 @@ MODULES = devel/cargo CONFIGURE_STYLE = cargo -MODCARGO_CRATES += actix-codec 0.1.2 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-connect 0.2.5 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-files 0.1.4 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-http 0.2.10 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-router 0.1.5 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-rt 0.2.5 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-server 0.6.0 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-server-config 0.1.2 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-service 0.4.2 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-threadpool 0.1.2 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-utils 0.4.5 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-web 1.0.7 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-web-codegen 0.1.2 # MIT/Apache-2.0 MODCARGO_CRATES += adler32 1.0.4 # Zlib -MODCARGO_CRATES += aho-corasick 0.7.6 # Unlicense/MIT +MODCARGO_CRATES += aho-corasick 0.7.8 # Unlicense/MIT MODCARGO_CRATES += ammonia 3.0.0 # MIT OR Apache-2.0 MODCARGO_CRATES += ansi_term 0.11.0 # MIT -MODCARGO_CRATES += arc-swap 0.4.3 # Apache-2.0/MIT -MODCARGO_CRATES += arrayvec 0.4.11 # MIT/Apache-2.0 -MODCARGO_CRATES += atty 0.2.13 # MIT -MODCARGO_CRATES += autocfg 0.1.6 # Apache-2.0/MIT -MODCARGO_CRATES += backtrace 0.3.38 # MIT/Apache-2.0 -MODCARGO_CRATES += backtrace-sys 0.1.31 # MIT/Apache-2.0 +MODCARGO_CRATES += anyhow 1.0.26 # MIT OR Apache-2.0 +MODCARGO_CRATES += assert-json-diff 1.0.1 # MIT +MODCARGO_CRATES += atty 0.2.14 # MIT +MODCARGO_CRATES += autocfg 0.1.7 # Apache-2.0/MIT +MODCARGO_CRATES += autocfg 1.0.0 # Apache-2.0 OR MIT MODCARGO_CRATES += base64 0.10.1 # MIT/Apache-2.0 -MODCARGO_CRATES += bincode 1.2.0 # MIT -MODCARGO_CRATES += bitflags 1.2.0 # MIT/Apache-2.0 +MODCARGO_CRATES += base64 0.11.0 # MIT/Apache-2.0 +MODCARGO_CRATES += bincode 1.2.1 # MIT +MODCARGO_CRATES += bitflags 1.2.1 # MIT/Apache-2.0 MODCARGO_CRATES += block-buffer 0.7.3 # MIT OR Apache-2.0 -MODCARGO_CRATES += block-padding 0.1.4 # MIT OR Apache-2.0 -MODCARGO_CRATES += bstr 0.2.8 # MIT OR Apache-2.0 +MODCARGO_CRATES += block-padding 0.1.5 # MIT OR Apache-2.0 +MODCARGO_CRATES += bstr 0.2.11 # MIT OR Apache-2.0 +MODCARGO_CRATES += bumpalo 3.2.0 # MIT/Apache-2.0 MODCARGO_CRATES += byte-tools 0.3.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += byteorder 1.3.2 # Unlicense OR MIT +MODCARGO_CRATES += bytemuck 1.2.0 # Zlib +MODCARGO_CRATES += byteorder 1.3.4 # Unlicense OR MIT MODCARGO_CRATES += bytes 0.4.12 # MIT -MODCARGO_CRATES += c2-chacha 0.2.2 # MIT/Apache-2.0 -MODCARGO_CRATES += cc 1.0.45 # MIT/Apache-2.0 +MODCARGO_CRATES += bytes 0.5.4 # MIT +MODCARGO_CRATES += c2-chacha 0.2.3 # MIT/Apache-2.0 +MODCARGO_CRATES += cc 1.0.50 # MIT/Apache-2.0 MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0 -MODCARGO_CRATES += chrono 0.4.9 # MIT/Apache-2.0 +MODCARGO_CRATES += chrono 0.4.10 # MIT/Apache-2.0 MODCARGO_CRATES += chrono-tz 0.5.1 # MIT/Apache-2.0 MODCARGO_CRATES += clap 2.33.0 # MIT MODCARGO_CRATES += cloudabi 0.0.3 # BSD-2-Clause MODCARGO_CRATES += color_quant 1.0.1 # MIT -MODCARGO_CRATES += cookie 0.12.0 # MIT/Apache-2.0 -MODCARGO_CRATES += cookie_store 0.7.0 # MIT/Apache-2.0 -MODCARGO_CRATES += copyless 0.1.4 # MPL-2.0 +MODCARGO_CRATES += colored 1.9.2 # MPL-2.0 +MODCARGO_CRATES += config 0.1.0 # MIT MODCARGO_CRATES += core-foundation 0.6.4 # MIT / Apache-2.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/02/20 12:38:05 Modified files: devel/py-wheel : Makefile distinfo devel/py-wheel/pkg: PLIST Log message: update devel/py-wheel to 0.34.2 ok kmos@
Re: [MAINTAINER UPDATE] zola-0.10.0
On Thu, Feb 20, 2020 at 10:18 AM Kurt Mosiejczuk wrote: > You've got a number of crates tagged with "# LICENSE" > I'm guessing those are placeholders. > Thanks for pointing that out, I hadn't noticed them. Looks like the modcargo-gen-crates-licenses target just tagged them with # LICENSE as the three crates in question have non-standard licenses. fuscia's license appears to be a Google license similar to the BSD 3-Clause -- https://fuchsia.googlesource.com/fuchsia/+/master/LICENSE ring's license is based on BoringSSL's, and is ISC-like -- https://github.com/briansmith/ring/blob/master/LICENSE webpki's license is also ISC-like -- https://github.com/briansmith/webpki/blob/master/LICENSE Any recommendations on what the proper tags for these crates should be?
Re: [MAINTAINER UPDATE] zola-0.10.0
On Thu, Feb 20, 2020 at 10:06:23AM -0800, Peter Ezetta wrote: > Hi ports@, > I have updated the OpenSSL patch per Sebastien's recommendation. > On Tue, Feb 18, 2020 at 10:55 AM Jeremie Courreges-Anglas > wrote: > > However this zola update doesn't build on sparc64 because of the ring > > crate not supporting this architecture. > Also added BROKEN-sparc64 unless someone else has a workaround to get ring > to build on SPARC64? > Updated patch attached. You've got a number of crates tagged with "# LICENSE" I'm guessing those are placeholders. --Kurt > Index: Makefile > === > RCS file: /cvs/ports/www/zola/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 29 Oct 2019 10:51:49 - 1.1.1.1 > +++ Makefile 20 Feb 2020 17:52:19 - > @@ -1,12 +1,14 @@ > # $OpenBSD: Makefile,v 1.1.1.1 2019/10/29 10:51:49 semarie Exp $ > > +BROKEN-sparc64 = ring-0.16.11 module fails build on sparc64 arch > + > COMMENT =static site generator > > -DISTNAME = zola-0.9.0 > +DISTNAME = zola-0.10.0 > > GH_ACCOUNT = getzola > GH_PROJECT = zola > -GH_TAGNAME = v0.9.0 > +GH_TAGNAME = v0.10.0 > > HOMEPAGE = https://www.getzola.org > > @@ -29,75 +31,61 @@ MODULES = devel/cargo > > CONFIGURE_STYLE =cargo > > -MODCARGO_CRATES += actix-codec 0.1.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-connect 0.2.5 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-files 0.1.4 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-http 0.2.10 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-router0.1.5 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-rt0.2.5 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-server0.6.0 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-server-config 0.1.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-service 0.4.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-threadpool0.1.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-utils 0.4.5 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-web 1.0.7 # MIT/Apache-2.0 > -MODCARGO_CRATES += actix-web-codegen 0.1.2 # MIT/Apache-2.0 > MODCARGO_CRATES += adler32 1.0.4 # Zlib > -MODCARGO_CRATES += aho-corasick0.7.6 # Unlicense/MIT > +MODCARGO_CRATES += aho-corasick0.7.8 # Unlicense/MIT > MODCARGO_CRATES += ammonia 3.0.0 # MIT OR Apache-2.0 > MODCARGO_CRATES += ansi_term 0.11.0 # MIT > -MODCARGO_CRATES += arc-swap0.4.3 # Apache-2.0/MIT > -MODCARGO_CRATES += arrayvec0.4.11 # MIT/Apache-2.0 > -MODCARGO_CRATES += atty0.2.13 # MIT > -MODCARGO_CRATES += autocfg 0.1.6 # Apache-2.0/MIT > -MODCARGO_CRATES += backtrace 0.3.38 # MIT/Apache-2.0 > -MODCARGO_CRATES += backtrace-sys 0.1.31 # MIT/Apache-2.0 > +MODCARGO_CRATES += anyhow 1.0.26 # MIT OR Apache-2.0 > +MODCARGO_CRATES += assert-json-diff1.0.1 # MIT > +MODCARGO_CRATES += atty0.2.14 # MIT > +MODCARGO_CRATES += autocfg 0.1.7 # Apache-2.0/MIT > +MODCARGO_CRATES += autocfg 1.0.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += base64 0.10.1 # MIT/Apache-2.0 > -MODCARGO_CRATES += bincode 1.2.0 # MIT > -MODCARGO_CRATES += bitflags1.2.0 # MIT/Apache-2.0 > +MODCARGO_CRATES += base64 0.11.0 # MIT/Apache-2.0 > +MODCARGO_CRATES += bincode 1.2.1 # MIT > +MODCARGO_CRATES += bitflags1.2.1 # MIT/Apache-2.0 > MODCARGO_CRATES += block-buffer0.7.3 # MIT OR Apache-2.0 > -MODCARGO_CRATES += block-padding 0.1.4 # MIT OR Apache-2.0 > -MODCARGO_CRATES += bstr0.2.8 # MIT OR Apache-2.0 > +MODCARGO_CRATES += block-padding 0.1.5 # MIT OR Apache-2.0 > +MODCARGO_CRATES += bstr0.2.11 # MIT OR Apache-2.0 > +MODCARGO_CRATES += bumpalo 3.2.0 # MIT/Apache-2.0 > MODCARGO_CRATES += byte-tools 0.3.1 # MIT OR Apache-2.0 > -MODCARGO_CRATES += byteorder 1.3.2 # Unlicense OR MIT > +MODCARGO_CRATES += bytemuck1.2.0 # Zlib > +MODCARGO_CRATES += byteorder 1.3.4 # Unlicense OR MIT > MODCARGO_CRATES += bytes 0.4.12 # MIT > -MODCARGO_CRATES += c2-chacha 0.2.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += cc 1.0.45 # MIT/Apache-2.0 > +MODCARGO_CRATES += bytes 0.5.4 # MIT > +MODCARGO_CRATES += c2-chacha 0.2.3 # MIT/Apache-2.0 > +MODCARGO_CRATES += cc 1.0.50 # MIT/Apache-2.0 > MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0 > -MODCARGO_CRATES += chrono 0.4.9 # MIT/Apache-2.0 > +MODCARGO_CRATES += chrono 0.4.10 # MIT/Apache-2.0 > MODCARGO_CRATES += chrono-tz 0.5.1 # MIT/Apache-2.0 > MODCARGO_CRATES += clap2.33.0 # MIT > MODCARGO_CRATES += cloudabi0.0.3 # BSD-2-Clause > MODCARGO_CRATES += color_quant 1.0.1 # MIT > -MODCARGO_CRATES += cookie 0.12.0 # MIT/Apache-2.0 > -MODCARGO_CRATES += cookie_store0.7.0 # MIT/Apache-2.0 >
Re: update: devel/py-wheel
On Thu, Feb 20, 2020 at 12:07:41PM +0100, Paco Esteban wrote:
> Hi ports@,
> Here's an update for devel/py-wheel from 0.31.0 to 0.34.0
> This is the changelog:
> https://github.com/pypa/wheel/blob/master/docs/news.rst
> All tests pass both py2 and py3 on amd64.
> Those tests were not running for me before. Removing MODPY_PYTEST_ARGS
> made them run and pass.
Yes. They changed the layout of the extracted tarball.
All the tests pass on sparc64 too.
> These are the consumers for this port and the resutl of the regression
> tests, which are exactly the same before and after the update:
> devel/py-rencode
> Test don't really start because:
> E ImportError: cannot import name _rencode
> I tried to fix this quickly settingup PYTHONPATH on TEST_ENV without
> success. I may take a look later.
I fixed this. I couldn't do it with PYTHONPATH so I fell back to a
pre-test target that copied the compiled _rencode.so into the rencode
directory. Not as clean as I'd like, but it works.
> net/deluge
> tests fail because it cannot find pytest-twisted (which is not in
> ports)
> devel/py-argcomplete
> py2 FAILED (failures=17, errors=26, expected failures=5)
> py3 FAILED (failures=17, errors=6, expected failures=11)
Yeah. That's kindof a mess. It's that way before your update.
> textproc/yq
> all tests pass
> Cheers,
> Paco.
Looks good. ok kmos
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/devel/py-wheel/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 12 Jul 2019 20:45:56 - 1.8
> +++ Makefile 19 Feb 2020 22:54:33 -
> @@ -2,11 +2,10 @@
>
> COMMENT =built-package format for Python
>
> -MODPY_EGG_VERSION = 0.31.0
> +MODPY_EGG_VERSION = 0.34.2
> DISTNAME = wheel-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> CATEGORIES = devel
> -REVISION = 0
>
> # MIT
> PERMIT_PACKAGE = Yes
> @@ -16,7 +15,6 @@ MODULES = lang/python
> MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> MODPY_PYTEST = Yes
> -MODPY_PYTEST_ARGS = wheel
>
> FLAVORS =python3
> FLAVOR ?=
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/devel/py-wheel/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 26 Apr 2018 14:14:48 - 1.2
> +++ distinfo 19 Feb 2020 22:48:50 -
> @@ -1,2 +1,2 @@
> -SHA256 (wheel-0.31.0.tar.gz) = GugVO+1wHLBikTtyQpvPhUuoJPlzc1QnaBiCpojLVc4=
> -SIZE (wheel-0.31.0.tar.gz) = 38528
> +SHA256 (wheel-0.34.2.tar.gz) = h4jpFV/hT1QWTBuesKMZ2Y7wLBYHJVh61g8U3cV7b5Y=
> +SIZE (wheel-0.34.2.tar.gz) = 58330
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/devel/py-wheel/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 26 Apr 2018 14:14:49 - 1.2
> +++ pkg/PLIST 19 Feb 2020 22:49:36 -
> @@ -14,37 +14,29 @@ lib/python${MODPY_VERSION}/site-packages
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}archive.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}bdist_wheel.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}egg2wheel.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}install.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}macosx_libfile.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}paths.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}pep425tags.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}pkginfo.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}wininst2wheel.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/wheel/archive.py
> +lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}wheelfile.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/wheel/_version.py
> lib/python${MODPY_VERSION}/site-packages/wheel/bdist_wheel.py
>
Re: [MAINTAINER UPDATE] zola-0.10.0
Hi ports@, I have updated the OpenSSL patch per Sebastien's recommendation. On Tue, Feb 18, 2020 at 10:55 AM Jeremie Courreges-Anglas wrote: > > However this zola update doesn't build on sparc64 because of the ring > crate not supporting this architecture. > Also added BROKEN-sparc64 unless someone else has a workaround to get ring to build on SPARC64? Updated patch attached. Index: Makefile === RCS file: /cvs/ports/www/zola/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 29 Oct 2019 10:51:49 - 1.1.1.1 +++ Makefile 20 Feb 2020 17:52:19 - @@ -1,12 +1,14 @@ # $OpenBSD: Makefile,v 1.1.1.1 2019/10/29 10:51:49 semarie Exp $ +BROKEN-sparc64 = ring-0.16.11 module fails build on sparc64 arch + COMMENT = static site generator -DISTNAME = zola-0.9.0 +DISTNAME = zola-0.10.0 GH_ACCOUNT = getzola GH_PROJECT = zola -GH_TAGNAME = v0.9.0 +GH_TAGNAME = v0.10.0 HOMEPAGE = https://www.getzola.org @@ -29,75 +31,61 @@ MODULES = devel/cargo CONFIGURE_STYLE = cargo -MODCARGO_CRATES += actix-codec 0.1.2 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-connect 0.2.5 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-files 0.1.4 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-http 0.2.10 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-router 0.1.5 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-rt 0.2.5 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-server 0.6.0 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-server-config 0.1.2 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-service 0.4.2 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-threadpool 0.1.2 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-utils 0.4.5 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-web 1.0.7 # MIT/Apache-2.0 -MODCARGO_CRATES += actix-web-codegen 0.1.2 # MIT/Apache-2.0 MODCARGO_CRATES += adler32 1.0.4 # Zlib -MODCARGO_CRATES += aho-corasick 0.7.6 # Unlicense/MIT +MODCARGO_CRATES += aho-corasick 0.7.8 # Unlicense/MIT MODCARGO_CRATES += ammonia 3.0.0 # MIT OR Apache-2.0 MODCARGO_CRATES += ansi_term 0.11.0 # MIT -MODCARGO_CRATES += arc-swap 0.4.3 # Apache-2.0/MIT -MODCARGO_CRATES += arrayvec 0.4.11 # MIT/Apache-2.0 -MODCARGO_CRATES += atty 0.2.13 # MIT -MODCARGO_CRATES += autocfg 0.1.6 # Apache-2.0/MIT -MODCARGO_CRATES += backtrace 0.3.38 # MIT/Apache-2.0 -MODCARGO_CRATES += backtrace-sys 0.1.31 # MIT/Apache-2.0 +MODCARGO_CRATES += anyhow 1.0.26 # MIT OR Apache-2.0 +MODCARGO_CRATES += assert-json-diff 1.0.1 # MIT +MODCARGO_CRATES += atty 0.2.14 # MIT +MODCARGO_CRATES += autocfg 0.1.7 # Apache-2.0/MIT +MODCARGO_CRATES += autocfg 1.0.0 # Apache-2.0 OR MIT MODCARGO_CRATES += base64 0.10.1 # MIT/Apache-2.0 -MODCARGO_CRATES += bincode 1.2.0 # MIT -MODCARGO_CRATES += bitflags 1.2.0 # MIT/Apache-2.0 +MODCARGO_CRATES += base64 0.11.0 # MIT/Apache-2.0 +MODCARGO_CRATES += bincode 1.2.1 # MIT +MODCARGO_CRATES += bitflags 1.2.1 # MIT/Apache-2.0 MODCARGO_CRATES += block-buffer 0.7.3 # MIT OR Apache-2.0 -MODCARGO_CRATES += block-padding 0.1.4 # MIT OR Apache-2.0 -MODCARGO_CRATES += bstr 0.2.8 # MIT OR Apache-2.0 +MODCARGO_CRATES += block-padding 0.1.5 # MIT OR Apache-2.0 +MODCARGO_CRATES += bstr 0.2.11 # MIT OR Apache-2.0 +MODCARGO_CRATES += bumpalo 3.2.0 # MIT/Apache-2.0 MODCARGO_CRATES += byte-tools 0.3.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += byteorder 1.3.2 # Unlicense OR MIT +MODCARGO_CRATES += bytemuck 1.2.0 # Zlib +MODCARGO_CRATES += byteorder 1.3.4 # Unlicense OR MIT MODCARGO_CRATES += bytes 0.4.12 # MIT -MODCARGO_CRATES += c2-chacha 0.2.2 # MIT/Apache-2.0 -MODCARGO_CRATES += cc 1.0.45 # MIT/Apache-2.0 +MODCARGO_CRATES += bytes 0.5.4 # MIT +MODCARGO_CRATES += c2-chacha 0.2.3 # MIT/Apache-2.0 +MODCARGO_CRATES += cc 1.0.50 # MIT/Apache-2.0 MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0 -MODCARGO_CRATES += chrono 0.4.9 # MIT/Apache-2.0 +MODCARGO_CRATES += chrono 0.4.10 # MIT/Apache-2.0 MODCARGO_CRATES += chrono-tz 0.5.1 # MIT/Apache-2.0 MODCARGO_CRATES += clap 2.33.0 # MIT MODCARGO_CRATES += cloudabi 0.0.3 # BSD-2-Clause MODCARGO_CRATES += color_quant 1.0.1 # MIT -MODCARGO_CRATES += cookie 0.12.0 # MIT/Apache-2.0 -MODCARGO_CRATES += cookie_store 0.7.0 # MIT/Apache-2.0 -MODCARGO_CRATES += copyless 0.1.4 # MPL-2.0 +MODCARGO_CRATES += colored 1.9.2 # MPL-2.0 +MODCARGO_CRATES += config 0.1.0 # MIT MODCARGO_CRATES += core-foundation 0.6.4 # MIT / Apache-2.0 MODCARGO_CRATES += core-foundation-sys 0.6.2 # MIT / Apache-2.0 MODCARGO_CRATES += crc32fast 1.2.0 # MIT OR Apache-2.0 -MODCARGO_CRATES += crossbeam-channel 0.3.9 # MIT/Apache-2.0 AND BSD-2-Clause -MODCARGO_CRATES += crossbeam-deque 0.7.1 # MIT/Apache-2.0 -MODCARGO_CRATES += crossbeam-epoch 0.7.2 # MIT/Apache-2.0 -MODCARGO_CRATES += crossbeam-queue 0.1.2 # MIT/Apache-2.0 -MODCARGO_CRATES += crossbeam-utils 0.6.6 # MIT/Apache-2.0 -MODCARGO_CRATES += csv 1.1.1 # Unlicense/MIT -MODCARGO_CRATES += csv-core 0.1.6 # Unlicense/MIT +MODCARGO_CRATES += crossbeam-channel 0.4.0 # MIT/Apache-2.0 AND BSD-2-Clause +MODCARGO_CRATES +=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/02/20 10:47:44 Modified files: devel/py-rencode: Makefile Log message: Fix tests by copying .so file into WRKSRC/rencode (PYTHONPATH refused to do the right thing)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/02/20 10:31:50 Modified files: games/freeciv : Makefile distinfo games/freeciv/pkg: PLIST-main Log message: Update to freeciv-2.6.2 Changes: https://freeciv.fandom.com/wiki/NEWS-2.6.2 OK pirofti@
Unbreak lang/haxe
Hi,
TL;DR: Diff to unbreak lang/haxe by building the OCaml deps with the port.
Works, ok's and/or comments appreciated. The following provides details about
this large diff and justification.
Long version:
My mistake when initially importing haxe was assuming that the prebuilt,
bundled OCaml dependencies would be bytecode which they are not which is why
things fell apart immediately.
OCaml has made a switch from individual ports to relying primarily on opam
for the ecosystem (see [1]). Rather than re-adding ports like
devel/ocaml-extlib, the best way forward for haxe seems to be to build the
OCaml build dependencies with the port. This is what I've done and the diff
below is the result. It build and runs the hello world example [2] and passes
'make port-lib-depends-check' and portcheck (except for one line > 80; see
below).
My experience with OCaml is limited. That's why feedback would be appreciated.
Or ok's, if it looks acceptable.
Here the key points to understand the diff:
- OCaml deps are only built, and the long MAKE_FLAGS line provides all built
packages to OCAMLPATH (> 80 characters).
- OCaml sources are pulled from a bundle that I keep on Github [3]. This and
other submodules (haxelib and hx3compat) are pulled in with
MASTER_SITES{0,1,2} following the example in emulators/ppsspp by bentley@.
- ocaml-sha uses the deprecated jbuilder at this point. When jbuilder is
removed eventually, it seems that switching to dune is as simple as running
'dune upgrade' to use dune instead.
- The port applies patches to the symlinked ocamldeps directory, which works
fine, but 'make update-patches' doesn't work in it. I created the diffs
manually ('diff -upa' + manual filename and header), and it appears this
will be needed if changes to patches of the OCaml dependencies need to be made
in the future.
- post-extract follows the emulators/ppsspp example, too.
- do-build first builds the OCaml dependencies in the required order, then
haxe. The mv(1) commands change directory names so that they can be
recognized as the proper modules in OCAMLPATH.
- The META file for xml-light is created the same was as in its opam file.
- The META file for ptmap (in $FILESDIR/ptmap-META) is taken from what is
installed by opam(1) because the repo doesn't include a META file or a
recipe for it.
- BDEP shells/bash needed for the bootstrap for obuild.
- The patches are all pretty straightforward. Many are to workaround the
deprecated Pervasives lib, and to add verbosity (dune is silent by default).
ok's and/or comments welcome!
[1] https://marc.info/?l=openbsd-ports-cvs=155397217912244=mbox
[2] https://haxe.org/manual/introduction-hello-world.html
[3] https://github.com/rfht/haxe-ocamldeps
Index: Makefile
===
RCS file: /cvs/ports/lang/haxe/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile19 Jan 2020 18:52:55 - 1.2
+++ Makefile20 Feb 2020 17:20:59 -
@@ -1,33 +1,50 @@
# $OpenBSD: Makefile,v 1.2 2020/01/19 18:52:55 thfr Exp $
-BROKEN = OCaml dependencies need to be built instead of bundled
-
COMMENT = toolkit for the Haxe programming language
V =4.0.5
DISTNAME = haxe-${V}
+REVISION = 0
+
+GH_ACCOUNT = HaxeFoundation
+GH_PROJECT = haxe
+GH_TAGNAME = ${V}
+
+XML_LIGHT_V = 2.4
+HAXELIB = 4b27f91d8a4ff279d9903091680fee2c93a0d574
+HX3COMPAT =f1f18201e5c0479cb5adf5f6028788b37f37b730
+
+MASTER_SITES0 =
https://github.com/rfht/haxe-ocamldeps/releases/download/${V}/
+MASTER_SITES1 =https://github.com/HaxeFoundation/haxelib/archive/
+MASTER_SITES2 =https://github.com/haxefoundation/hx3compat/archive/
+
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
+ haxe-ocamldeps-${V}.tar.gz:0 \
+ ${HAXELIB}.tar.gz:1 \
+ ${HX3COMPAT}.tar.gz:2
+
CATEGORIES = lang devel
HOMEPAGE = https://haxe.org
MAINTAINER = Thomas Frohwein
# GPLv2+ (Haxe compiler), MIT (standard lib and Neko virtual machine)
+# OCaml build deps: LGPL 2.1, BSD-2-clause, ISC, MIT
PERMIT_PACKAGE = Yes
WANTLIB += c gc m neko pcre pthread z
-MASTER_SITES = https://thfr.info/distfiles/
-EXTRACT_SUFX = .tar.xz
-
MODULES = lang/ocaml
-BUILD_DEPENDS =devel/ocaml-ocamlbuild \
+BUILD_DEPENDS =devel/ocaml-cppo \
lang/nekovm \
lang/ocaml-camlp5 \
+ shells/bash \
sysutils/findlib
LIB_DEPENDS = devel/boehm-gc \
devel/pcre \
lang/nekovm
-MAKE_FLAGS = OCAMLPATH=${WRKSRC}/ocamldeps
+MAKE_FLAGS +=
Re: Debug packages vs. @shell annotation
Okay, I did something reasonably clean. Adding a second "special comment" @comment no debug and turning @shell into binaries (by default) was fairly straightforward. As long as we don't gain 20 extra special comments, we should be fine.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/02/20 09:48:04 Modified files: infrastructure/mk: bsd.port.mk Log message: don't rerun build-debug-info all the time, as discussed with sthen@ and pirofti@
Re: cookie for generating some debug info
On Thu, Feb 20, 2020 at 04:03:29PM +, Stuart Henderson wrote:
> On 2020/02/20 16:27, Marc Espie wrote:
> > Now that we have a settled down workflow, I think this should work just
> > fine, and avoid regenerating that Makefile 30 times in php...
> >
> > Specifically, that stuff only depends on static port information, it can't
> > be generated before fake because it lives in WRKINST, and it only needs
> > to be re-gen'd each time we run update-plist.
> >
> > That's assuming you don't change PKG_ARGS, but then, it's likely lots of
> > other things will fail as well.
>
> There is a possibility that somebody may edit the PLIST without using
> update-plist (e.g. run update-plist, make packages, notice a problem
> with the plist, edit by hand, repackage) - would it make sense to
> clean it here too?
>
> Otherwise, makes complete sense to me.
>
> Index: bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1517
> diff -u -p -r1.1517 bsd.port.mk
> --- bsd.port.mk 14 Feb 2020 13:06:29 - 1.1517
> +++ bsd.port.mk 20 Feb 2020 16:02:04 -
> @@ -3223,7 +3223,7 @@ _internal-clean:
> . endif
> .endif
> .if ${_clean:Mpackages} || ${_clean:Mpackage} && ${_clean:Msub}
> - ${_PBUILD} rm -f ${_PACKAGE_COOKIES}
> + ${_PBUILD} rm -f ${_PACKAGE_COOKIES} ${_WRKDEBUG}/Makefile
> ${_PFETCH} rm -f ${_CACHE_PACKAGE_COOKIES}
> rm -f ${_UPDATE_COOKIES}
> .elif ${_clean:Mpackage}
>
>
Yep, I was fiddling with this.
I did forget a _PBUILD in cleaning, I will commit with all this ;)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/02/20 09:41:16 Modified files: infrastructure/bin: build-debug-info Log message: allow nodebug to do its work
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/02/20 09:33:45 Modified files: infrastructure/bin: update-plist Log message: copy "no debug" over
Re: cookie for generating some debug info
On Thu, Feb 20, 2020 at 04:27:59PM +0100, Marc Espie wrote:
> Now that we have a settled down workflow, I think this should work just
> fine, and avoid regenerating that Makefile 30 times in php...
>
> Specifically, that stuff only depends on static port information, it can't
> be generated before fake because it lives in WRKINST, and it only needs
> to be re-gen'd each time we run update-plist.
>
> That's assuming you don't change PKG_ARGS, but then, it's likely lots of
> other things will fail as well.
Looks fine to me!
>
> Index: bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1515
> diff -u -p -r1.1515 bsd.port.mk
> --- bsd.port.mk 26 Jan 2020 12:51:47 - 1.1515
> +++ bsd.port.mk 20 Feb 2020 15:17:27 -
> @@ -2531,6 +2530,7 @@ _internal-plist _internal-update-plist:
> @mkdir -p ${PKGDIR}
> @${_MAKE} _internal-generate-readmes
> @${_update_plist}
> + @rm -f ${_WRKDEBUG}/Makefile
>
> update-patches:
> @toedit=`WRKDIST=${WRKDIST} PATCHDIR=${PATCHDIR} \
> @@ -2982,9 +2982,11 @@ ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
> @${_check_wrkdir} ${WRKDIR} ${_TS_COOKIE} ${WRKDIR_CHANGES_OKAY}
> @${_PBUILD} ${_MAKE_COOKIE} $@
>
> -_copy-debug-info: ${_FAKE_COOKIE}
> +${_WRKDEBUG}/Makefile: ${_FAKE_COOKIE}
> @mkdir -p ${_WRKDEBUG}
> @${_build_debug_info}
> +
> +_copy-debug-info: ${_FAKE_COOKIE} ${_WRKDEBUG}/Makefile
> @cd ${PREFIX} && \
> exec ${SETENV} ${MAKE} -r -f ${_WRKDEBUG}/Makefile \
> INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' all
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 09:15:55 Modified files: lang/lucee : Makefile distinfo Log message: update to lucee-5.3.4.77
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/02/20 09:10:07 Modified files: editors/py-qscintilla: Makefile Log message: ensure -common dont end up in BUILD_DEPENDS otherwise hilarity ensues, spotted by sthen@
Re: cookie for generating some debug info
On 2020/02/20 16:27, Marc Espie wrote:
> Now that we have a settled down workflow, I think this should work just
> fine, and avoid regenerating that Makefile 30 times in php...
>
> Specifically, that stuff only depends on static port information, it can't
> be generated before fake because it lives in WRKINST, and it only needs
> to be re-gen'd each time we run update-plist.
>
> That's assuming you don't change PKG_ARGS, but then, it's likely lots of
> other things will fail as well.
There is a possibility that somebody may edit the PLIST without using
update-plist (e.g. run update-plist, make packages, notice a problem
with the plist, edit by hand, repackage) - would it make sense to
clean it here too?
Otherwise, makes complete sense to me.
Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1517
diff -u -p -r1.1517 bsd.port.mk
--- bsd.port.mk 14 Feb 2020 13:06:29 - 1.1517
+++ bsd.port.mk 20 Feb 2020 16:02:04 -
@@ -3223,7 +3223,7 @@ _internal-clean:
. endif
.endif
.if ${_clean:Mpackages} || ${_clean:Mpackage} && ${_clean:Msub}
- ${_PBUILD} rm -f ${_PACKAGE_COOKIES}
+ ${_PBUILD} rm -f ${_PACKAGE_COOKIES} ${_WRKDEBUG}/Makefile
${_PFETCH} rm -f ${_CACHE_PACKAGE_COOKIES}
rm -f ${_UPDATE_COOKIES}
.elif ${_clean:Mpackage}
Re: py3-only ports
On 2020/02/20 10:12, Kurt Mosiejczuk wrote:
> > There is a possible future direction I've been considering of moving py2
> > ports from "unflavoured" to "FLAVOR=python2" (and possibly splitting
> > python3 into multiple versions e.g. python37/python38 as we do with ruby).
> > I'm unsure if it's worthwhile at the moment, but this method of converting
> > to py3-only at least doesn't get in the way of doing that later.
>
> I like the FLAVOR=python2. I'm a little wary of the python37/python38
> thing. It will introduce a *lot* of churn each time we introduce a
> new python 3.x version to the tree or when we retire one.
Me too, but other things being equal I'd prefer not to make changes
now that would interfere with it in case we did want to change it later.
(For example if we generally have things setup where py3=unflavoured,
that *would* get in the way).
+ easier to test new python releases
- more work bumping revision in dependencies and managing category Makefiles
- brings back the MODPY_BIN_SUFFIX problem that otherwise would be helped
by moving to 3-only
On 2020/02/20 16:25, Björn Ketelaars wrote:
> Sounds like a plan...
>
> What about lines in Makefile like the one below. Does it make sense to
> keep them around? There is no need to add a suffix to scripts in the
> case of py3-only.
>
> mv ${PREFIX}/bin/$i{,${MODPY_BIN_SUFFIX}}
exactly, getting rid of these is a big win :)
For ports containing scripts which remain as py2+py3 (the most obvious
example being py-sphinx, but there are many others) I'd like to have py3
as the "unsuffixed" version, but haven't figured out how to do this yet ;)
> > Obviously there are currently a number of py3-only ports which should end
> > up using the same flavour scheme (and dependency lines to fix), if there are
> > not objections I can either review diffs or take care of those myself.
>
> I'm not sure what is needed for ports that already made the jump from
> py2/py3 to py3-only (e.g. www/jupyter-notebook). More specific: these
> ports already do some funky PLIST and quirks stuff. Do these ports need
> special attention?
jupyter-notebook is a bit of a special case as it's more "end-user software"
rather than a module (which is acknowledged by not using the py- prefix on the
package name).
In other cases (some which come to mind are flake8 and beets), this type
of port doesn't normally support using multiple python versions via
flavours, jupyter-notebook is (was) special in that regard. So I think
it's ok to keep that as-is.
cookie for generating some debug info
Now that we have a settled down workflow, I think this should work just
fine, and avoid regenerating that Makefile 30 times in php...
Specifically, that stuff only depends on static port information, it can't
be generated before fake because it lives in WRKINST, and it only needs
to be re-gen'd each time we run update-plist.
That's assuming you don't change PKG_ARGS, but then, it's likely lots of
other things will fail as well.
Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1515
diff -u -p -r1.1515 bsd.port.mk
--- bsd.port.mk 26 Jan 2020 12:51:47 - 1.1515
+++ bsd.port.mk 20 Feb 2020 15:17:27 -
@@ -2531,6 +2530,7 @@ _internal-plist _internal-update-plist:
@mkdir -p ${PKGDIR}
@${_MAKE} _internal-generate-readmes
@${_update_plist}
+ @rm -f ${_WRKDEBUG}/Makefile
update-patches:
@toedit=`WRKDIST=${WRKDIST} PATCHDIR=${PATCHDIR} \
@@ -2982,9 +2982,11 @@ ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
@${_check_wrkdir} ${WRKDIR} ${_TS_COOKIE} ${WRKDIR_CHANGES_OKAY}
@${_PBUILD} ${_MAKE_COOKIE} $@
-_copy-debug-info: ${_FAKE_COOKIE}
+${_WRKDEBUG}/Makefile: ${_FAKE_COOKIE}
@mkdir -p ${_WRKDEBUG}
@${_build_debug_info}
+
+_copy-debug-info: ${_FAKE_COOKIE} ${_WRKDEBUG}/Makefile
@cd ${PREFIX} && \
exec ${SETENV} ${MAKE} -r -f ${_WRKDEBUG}/Makefile \
INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' all
Re: UPDATE: audio/mumble
On at Feb 15, 2020 at 05:47:51PM +0100, Solene Rapenne wrote:
> On Sat, Feb 15, 2020 at 04:00:31PM +0100, Rafael Sadowski wrote:
> > On Sat Feb 15, 2020 at 03:44:37PM +0100, Solene Rapenne wrote:
> > > On Sat, Feb 15, 2020 at 02:31:45PM +0100, Rafael Sadowski wrote:
> > > > On Sat Feb 15, 2020 at 02:15:45PM +0100, Solene Rapenne wrote:
> > > > > On Sat, Feb 15, 2020 at 07:18:45AM +0100, Rafael Sadowski wrote:
> > > > > > Update mumble to the latest stable version. I just tested the
> > > > > > start-up
> > > > > > on amd64. I have on clue how to test it and to be honest I don't
> > > > > > care.
> > > > > > I just want to get rid of Qt4. So mumble people, come out and test!
> > > > > >
> > > > > > OK, Feedback?
> > > > >
> > > > > your patch applies but then compilation fails due to a patch looking
> > > > > for
> > > > > a file
> > > > >
> > > > > solene@t480 /usr/ports/audio/mumble $ make
> > > > > ===> Patching for mumble-1.3.0
> > > > > ===> Applying OpenBSD patch patch-compiler_pri
> > > > > Hmm... Looks like a unified diff to me...
> > > > > The text leading up to this was:
> > > > > --
> > > > > |$OpenBSD: patch-compiler_pri,v 1.2 2017/02/28 15:35:22 dcoppa Exp $
> > > > > |--- compiler.pri.orig Fri Jan 27 13:29:08 2017
> > > > > |+++ compiler.pri Tue Feb 28 16:04:48 2017
> > > > > --
> > > > > File to patch:
> > > >
> > > > cvs is hard. New diff below with deleted old patches. Thanks for the
> > > > note.
> > > >
> > >
> > > thank you! Now I hit an error while compiling. I freshly updated my
> > > packages and also my ports tree
> > >
> >
> > Sorry Solene, no my ports day.
> >
> >
>
> this patch work :) Mumble 1.3.0 work correctly, but it can't connect to
> some older servers, it will complain that the server is using old
> crypto, I'm not sure it's worth an entry in current.html though. It's
> totally not an issue with mumble 1.3.0 of course.
I don't think that's necessary. If you want to write something, go
ahead.
>
> infrastructure/bin/portcheck says
> LIB_DEPENDS audio/portaudio-svn not needed for audio/mumble ?
Fixed that issue and also added jack as a dependency.
>
> Thank you for taking care of mumble, I really think it's important to
> keep it working :)
>
OK for the diff below?
Index: Makefile
===
RCS file: /cvs/ports/audio/mumble/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile6 Dec 2019 23:12:07 - 1.35
+++ Makefile20 Feb 2020 09:19:12 -
@@ -2,27 +2,23 @@
COMMENT = low-latency voice chat client
-GH_ACCOUNT = mumble-voip
-GH_PROJECT = mumble
-GH_TAGNAME = 1.2.19
-REVISION = 5
+DISTNAME = mumble-1.3.0
CATEGORIES = audio
HOMEPAGE = https://www.mumble.info/
+MASTER_SITES =
https://github.com/mumble-voip/mumble/releases/download/1.3.0/
+EXTRACT_SUFX = .zip
+
# BSD3
PERMIT_PACKAGE = Yes
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c crypto
-WANTLIB += fontconfig freetype lib/qt4/QtDBus lib/qt4/QtGui
-WANTLIB += lib/qt4/QtNetwork lib/qt4/QtSql lib/qt4/QtSvg
-WANTLIB += lib/qt4/QtXml m opus portaudio protobuf
-WANTLIB += pthread sndfile speex speexdsp ssl ${COMPILER_LIBCXX}
-
-COMPILER = base-clang ports-gcc
+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
-MODULES = devel/qmake x11/qt4
+MODULES = devel/qmake x11/qt5
SEPARATE_BUILD = No
BUILD_DEPENDS =audio/celt07 \
@@ -30,9 +26,10 @@ BUILD_DEPENDS = audio/celt07 \
LIB_DEPENDS = audio/libsndfile>=1.0.25p0 \
audio/opus \
- audio/portaudio-svn \
+ audio/jack \
audio/speex \
- devel/protobuf
+ devel/protobuf \
+ x11/qt5/qtsvg
RUN_DEPENDS = audio/celt07 \
audio/celt=0.11.1v1 \
Index: distinfo
===
RCS file: /cvs/ports/audio/mumble/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo28 Feb 2017 15:35:21 - 1.14
+++ distinfo20 Feb 2020 09:19:12 -
@@ -1,2 +1,2 @@
-SHA256 (mumble-1.2.19.tar.gz) = eDXpzseBhM1z8JFEjhTapFHNIGQxd1trq61wvIG2/VA=
-SIZE (mumble-1.2.19.tar.gz) = 3324626
+SHA256 (mumble-1.3.0.zip) = YMU5aHKnoQ2bzIyOEUfsBWMPnidI0SklncJvMkFWLxs=
+SIZE (mumble-1.3.0.zip) = 10392654
Index: patches/patch-compiler_pri
===
RCS file: patches/patch-compiler_pri
diff -N
Re: py3-only ports
On Thu 20/02/2020 13:55, Stuart Henderson wrote:
> Quite a few python modules are now py3-only, and more are switching
> over to that. The current ports setup where we use MODPY_VERSION=
> ${MODPY_DEFAULT_VERSION_3} and no FLAVOR isn't really very good,
> especially where dependencies are concerned with the error-prone
> combination of "py2+3 ports using ${MODPY_FLAVOR}" and "py3-only
> ports with just the port path/name".
>
> Before more are moved across I'd like to settle on a proper method.
> I've been discussing this with jasper@ (with some previous knowledge
> from adding a similar multi-version to pecl-* ports) and propose moving
> to a setup with:
>
> FLAVOR= python3
> FLAVORS= python3
>
> (and keep the ,python3 flavour in ../Makefile i.e. "SUBDIR +=
> py-Foo,python3").
> This also makes it easier to handle updates as we don't need to mess about
> with @pkgpath markers.
Sounds like a plan...
What about lines in Makefile like the one below. Does it make sense to
keep them around? There is no need to add a suffix to scripts in the
case of py3-only.
mv ${PREFIX}/bin/$i{,${MODPY_BIN_SUFFIX}}
> Obviously there are currently a number of py3-only ports which should end
> up using the same flavour scheme (and dependency lines to fix), if there are
> not objections I can either review diffs or take care of those myself.
I'm not sure what is needed for ports that already made the jump from
py2/py3 to py3-only (e.g. www/jupyter-notebook). More specific: these
ports already do some funky PLIST and quirks stuff. Do these ports need
special attention?
Re: CVS: cvs.openbsd.org: ports
On Thu, Feb 20, 2020 at 07:58:39AM -0700, James Turner wrote: > CVSROOT: /cvs > Module name: ports > Changes by: jtur...@cvs.openbsd.org 2020/02/20 07:58:39 > Added files: > sysutils/slant/patches: patch-slant-cgi_c > Log message: > Fix slant build after recent update. Broken so no need to bump. Pointed out > by kurt. That's kmos, actually :) --Kurt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2020/02/20 08:17:43 Modified files: sysutils/slant : Makefile distinfo Removed files: sysutils/slant/patches: patch-slant-cgi_c Log message: Update slant to 0.0.24. Removing the need for any patches.
Re: py3-only ports
On Thu, Feb 20, 2020 at 01:55:00PM +, Stuart Henderson wrote:
> Quite a few python modules are now py3-only, and more are switching
> over to that. The current ports setup where we use MODPY_VERSION=
> ${MODPY_DEFAULT_VERSION_3} and no FLAVOR isn't really very good,
> especially where dependencies are concerned with the error-prone
> combination of "py2+3 ports using ${MODPY_FLAVOR}" and "py3-only
> ports with just the port path/name".
> Before more are moved across I'd like to settle on a proper method.
> I've been discussing this with jasper@ (with some previous knowledge
> from adding a similar multi-version to pecl-* ports) and propose moving
> to a setup with:
> FLAVOR= python3
> FLAVORS= python3
> (and keep the ,python3 flavour in ../Makefile i.e. "SUBDIR +=
> py-Foo,python3").
> This also makes it easier to handle updates as we don't need to mess about
> with @pkgpath markers.
I like this very much. Simple. It makes it obvious and feels less like
stepping on rakes like the current scheme does. (Putting the obvious
MODPY_FLAVOR after a depends and having it fil and needing to figure out
why).
(More below)
> Just merge py-foo into py3-foo automatically.
> This was done with some py3 conversions in the past:
> files/Quirks.pm:'py-nmap' => 'py3-nmap',
> files/Quirks.pm:'py-link-grammar' => 'py3-link-grammar',
> files/Quirks.pm:'py-buildbot-www' => 'py3-buildbot-www',
> files/Quirks.pm:'py-buildbot-pkg' => 'py3-buildbot-pkg',
> files/Quirks.pm:'py-buildbot-grid-view' => 'py3-buildbot-grid-view',
> files/Quirks.pm:'py-buildbot-console-view' =>
> 'py3-buildbot-console-view',
> files/Quirks.pm:'py-buildbot-waterfall-view' =>
> 'py3-buildbot-waterfall-view',
> files/Quirks.pm:'py-pafy' => 'py3-pafy',
> files/Quirks.pm:'py-zeroconf' => 'py3-zeroconf',
> files/Quirks.pm:'py-xmldiff' => 'py3-xmldiff',
Much better.
> In cases where there are bin/ scripts where the py2 version will
> have a hard conflict with the py3 version it *has* to be done this way.
> In other cases there is a possible alternative: list in
> $obsolete_reasons and have the user manually delete the py2 version if
> they don't want it. This has been done for some ports more recently
> (e.g. py-semver) but I don't think we should generally continue with it.
> Admittedly it *is* more friendly to an user writing their own py2
> scripts using modules from ports, but the common use case for packages
> is a standard package user who just has things installed as a dependency
> of something else. In that case after a pkg_add -u they get e.g.
> Obsolete package: py-semver-2.8.1p0 (python2 port superseded by python3
> version)
> : FLAVORS = python3
> : -FLAVOR ?=
> : +FLAVOR = python3
> Just hardcode the flavour here so "make" directly in the port dir works
> sanely. Note this means that MODPY_VERSION=${MODPY_DEFAULT_VERSION_3} is
> not required.
This is much friendlier to do. The existing scheme was non-obvious.
> : diff -u -p -r1.8 PLIST
> : --- net/py-netmiko/pkg/PLIST13 Nov 2019 20:13:39 - 1.8
> : +++ net/py-netmiko/pkg/PLIST12 Feb 2020 19:14:28 -
> : @@ -1,4 +1,6 @@
> : @comment $OpenBSD: PLIST,v 1.8 2019/11/13 20:13:39 jasper Exp $
> : +@conflict py-netmiko-*
> : +@pkgpath net/py-netmiko
> Works with the quirks changes above to allow automatically replacing
> py-netmiko with py3-netmiko.
> In this particular case there aren't really conflicting files but I think
> it makes sense to do that as standard (in cases where there are scripts in
> bin/ without a suffix then there would be a conflict - easier to just
> always include it so people looking for examples to crib from have an
> easier time).
Yes. I agree.
> Obviously there are currently a number of py3-only ports which should end
> up using the same flavour scheme (and dependency lines to fix), if there are
> not objections I can either review diffs or take care of those myself.
No objections here.
> There is a possible future direction I've been considering of moving py2
> ports from "unflavoured" to "FLAVOR=python2" (and possibly splitting
> python3 into multiple versions e.g. python37/python38 as we do with ruby).
> I'm unsure if it's worthwhile at the moment, but this method of converting
> to py3-only at least doesn't get in the way of doing that later.
I like the FLAVOR=python2. I'm a little wary of the python37/python38
thing. It will introduce a *lot* of churn each time we introduce a
new python 3.x version to the tree or when we retire one.
--Kurt
oicb 1.2.3 port update
Haven't heard back from zhuk, but it's a straight forward update to oicb
and fixes the issue I opened on github.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/oicb/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jan 2020 23:50:55 - 1.6
+++ Makefile18 Feb 2020 20:59:31 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2020/01/12 23:50:55 zhuk Exp $
COMMENT = minimalistic command-line ICB client
-VERSION = 1.2.2
+VERSION = 1.2.3
DISTNAME = oicb-${VERSION}
CATEGORIES = net
MAINTAINER = Vadim Zhukov
@@ -9,7 +9,7 @@ MAINTAINER =Vadim Zhukov https://github.com/grayed/oicb/releases/download/v${VERSION}/
Index: distinfo
===
RCS file: /cvs/ports/net/oicb/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo12 Jan 2020 23:50:55 - 1.6
+++ distinfo18 Feb 2020 20:59:31 -
@@ -1,2 +1,2 @@
-SHA256 (oicb-1.2.2.tar.gz) = KzBI1stgI/yThDYH1Ynn2ymPIAuqyNEktgDTiY+w7zs=
-SIZE (oicb-1.2.2.tar.gz) = 23602
+SHA256 (oicb-1.2.3.tar.gz) = /4Eo2GCKdczNVIq1kLlvbYtd92mCsU01xKK+mP+8eMo=
+SIZE (oicb-1.2.3.tar.gz) = 23746
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2020/02/20 07:58:39 Added files: sysutils/slant/patches: patch-slant-cgi_c Log message: Fix slant build after recent update. Broken so no need to bump. Pointed out by kurt.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 07:57:21 Modified files: lang/php : Tag: OPENBSD_6_6 Makefile.inc lang/php/7.2 : Tag: OPENBSD_6_6 Makefile distinfo lang/php/7.3 : Tag: OPENBSD_6_6 Makefile distinfo Log message: update to php-7.2.28, php-7.3.15
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 07:57:17 Modified files: lang/php : Makefile.inc lang/php/7.2 : Makefile distinfo lang/php/7.3 : Makefile distinfo Log message: update to php-7.2.28, php-7.3.15
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 07:37:56 Modified files: mail/roundcubemail: Makefile distinfo mail/roundcubemail/pkg: PLIST Log message: update to roundcube 1.4.3
[archivers/unzip] fix CVE
Hi ports@,
the archivers/unzip port has two unfixed CVE:
CVE-2019-13232 and CVE-2018-135
Additionaly the bug bluhm@ patched in 2017 got a name too
CVE-2018-18384
The diff is attached, further info is included with the patches.
mbuhl
Index: archivers/unzip/Makefile
===
RCS file: /cvs/ports/archivers/unzip/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- archivers/unzip/Makefile12 Jul 2019 20:43:30 - 1.64
+++ archivers/unzip/Makefile20 Feb 2020 07:20:15 -
@@ -7,7 +7,7 @@ COMMENT = extract, list & test files in
VERSION = 6.0
DISTNAME = unzip${VERSION:S/.//}
PKGNAME = unzip-${VERSION}
-REVISION = 12
+REVISION = 13
CATEGORIES = archivers
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=infozip/} \
ftp://ftp.info-zip.org/pub/infozip/src/
Index: archivers/unzip/patches/patch-extract_c
===
RCS file: /cvs/ports/archivers/unzip/patches/patch-extract_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-extract_c
--- archivers/unzip/patches/patch-extract_c 23 Mar 2017 17:26:17 -
1.2
+++ archivers/unzip/patches/patch-extract_c 20 Feb 2020 08:49:05 -
@@ -12,6 +12,8 @@ Fix CVE-2015-7697: infinite loop when ex
https://bugs.debian.org/802160
https://bugzilla.redhat.com/show_bug.cgi?id=1260944
https://bugzilla.redhat.com/attachment.cgi?id=1073339
+Fix CVE-2019-13232: a zip bomb using overlapped entries
+https://github.com/madler/unzip/commit/47b3ceae397d21bf822bc2ac73052a4b1daf8e1c
--- extract.c.orig Sat Mar 14 02:32:52 2009
+++ extract.c Tue Mar 21 16:10:27 2017
@@ -31,6 +33,189 @@ Fix CVE-2015-7697: infinite loop when ex
static ZCONST char Far InvalidComprDataEAs[] =
" invalid compressed data for EAs\n";
# if (defined(WIN32) && defined(NTSD_EAS))
+@@ -321,11 +321,130 @@ static ZCONST char Far UnsupportedExtraField[] =
+ "\nerror: unsupported extra-field compression type (%u)--skipping\n";
+ static ZCONST char Far BadExtraFieldCRC[] =
+ "error [%s]: bad extra-field CRC %08lx (should be %08lx)\n";
++static ZCONST char Far NotEnoughMemCover[] =
++ "error: not enough memory for bomb detection\n";
++static ZCONST char Far OverlappedComponents[] =
++ "error: invalid zip file with overlapped components (possible zip bomb)\n";
+
+
+
+
+
++/* A growable list of spans. */
++typedef zoff_t bound_t;
++typedef struct {
++bound_t beg;/* start of the span */
++bound_t end;/* one past the end of the span */
++} span_t;
++typedef struct {
++span_t *span; /* allocated, distinct, and sorted list of spans */
++size_t num; /* number of spans in the list */
++size_t max; /* allocated number of spans (num <= max) */
++} cover_t;
++
++/*
++ * Return the index of the first span in cover whose beg is greater than val.
++ * If there is no such span, then cover->num is returned.
++ */
++static size_t cover_find(cover, val)
++cover_t *cover;
++bound_t val;
++{
++size_t lo = 0, hi = cover->num;
++while (lo < hi) {
++size_t mid = (lo + hi) >> 1;
++if (val < cover->span[mid].beg)
++hi = mid;
++else
++lo = mid + 1;
++}
++return hi;
++}
++
++/* Return true if val lies within any one of the spans in cover. */
++static int cover_within(cover, val)
++cover_t *cover;
++bound_t val;
++{
++size_t pos = cover_find(cover, val);
++return pos > 0 && val < cover->span[pos - 1].end;
++}
++
++/*
++ * Add a new span to the list, but only if the new span does not overlap any
++ * spans already in the list. The new span covers the values beg..end-1. beg
++ * must be less than end.
++ *
++ * Keep the list sorted and merge adjacent spans. Grow the allocated space for
++ * the list as needed. On success, 0 is returned. If the new span overlaps any
++ * existing spans, then 1 is returned and the new span is not added to the
++ * list. If the new span is invalid because beg is greater than or equal to
++ * end, then -1 is returned. If the list needs to be grown but the memory
++ * allocation fails, then -2 is returned.
++ */
++static int cover_add(cover, beg, end)
++cover_t *cover;
++bound_t beg;
++bound_t end;
++{
++size_t pos;
++int prec, foll;
++
++if (beg >= end)
++/* The new span is invalid. */
++return -1;
++
++/* Find where the new span should go, and make sure that it does not
++ overlap with any existing spans. */
++pos = cover_find(cover, beg);
++if ((pos > 0 && beg < cover->span[pos - 1].end) ||
++(pos < cover->num && end > cover->span[pos].beg))
++return 1;
++
++/* Check for adjacencies. */
++prec = pos > 0 && beg == cover->span[pos - 1].end;
++foll = pos < cover->num && end == cover->span[pos].beg;
++if (prec && foll) {
++/* The new span
Re: py3-only ports
All you're saying makes sense to me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 07:13:06 Added files: devel/acpica/patches: patch-generate_unix_iasl_Makefile Log message: some -Werror crept in with the last update, get rid of them again
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 07:00:52 Modified files: net/isc-bind : Tag: OPENBSD_6_6 Makefile distinfo Log message: update -stable to BIND 9.11.16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 07:00:32 Modified files: net/isc-bind : Makefile distinfo net/isc-bind/patches: patch-bin_dig_dig_c patch-bin_dig_host_c patch-bin_dig_nslookup_c patch-bin_named_include_named_globals_h patch-configure_ac patch-lib_dns_dst_openssl_h patch-lib_dns_openssldh_link_c patch-lib_dns_opensslrsa_link_c patch-lib_isc_Makefile_in patch-lib_isc_aes_c patch-lib_isc_unix_net_c patch-lib_isc_unix_socket_c net/isc-bind/pkg: PLIST Log message: update to BIND 9.16.0 (new stable/ESV release)
py3-only ports
Quite a few python modules are now py3-only, and more are switching
over to that. The current ports setup where we use MODPY_VERSION=
${MODPY_DEFAULT_VERSION_3} and no FLAVOR isn't really very good,
especially where dependencies are concerned with the error-prone
combination of "py2+3 ports using ${MODPY_FLAVOR}" and "py3-only
ports with just the port path/name".
Before more are moved across I'd like to settle on a proper method.
I've been discussing this with jasper@ (with some previous knowledge
from adding a similar multi-version to pecl-* ports) and propose moving
to a setup with:
FLAVOR= python3
FLAVORS=python3
(and keep the ,python3 flavour in ../Makefile i.e. "SUBDIR += py-Foo,python3").
This also makes it easier to handle updates as we don't need to mess about
with @pkgpath markers.
To demonstrate here's a diff that Jasper put together for py-napalm and
deps. The new version of py-netmiko is now py3-only, py-napalm depends on
this so needs to also move to py3-only, and py-IOSXR doesn't absolutely
need to move but it's not used for anything else in-tree so might as well
come along for the ride. I'll add some commentary inline.
: Index: net/Makefile
: ===
: RCS file: /cvs/ports/net/Makefile,v
: retrieving revision 1.1167
: diff -u -p -r1.1167 Makefile
: --- net/Makefile 31 Jan 2020 23:34:42 - 1.1167
: +++ net/Makefile 12 Feb 2020 19:14:28 -
: @@ -545,7 +545,6 @@
: SUBDIR += pure-ftpd,virtual_chroot
: SUBDIR += purple-rocketchat
: SUBDIR += putty
: - SUBDIR += py-IOSXR
: SUBDIR += py-IOSXR,python3
: SUBDIR += py-IP
: SUBDIR += py-IP,python3
: @@ -604,7 +603,6 @@
: SUBDIR += py-netaddr,python3
: SUBDIR += py-netifaces
: SUBDIR += py-netifaces,python3
: - SUBDIR += py-netmiko
: SUBDIR += py-netmiko,python3
: SUBDIR += py-nmap
: SUBDIR += py-nxos
obvious, drop py2 builds
: Index: devel/quirks/Makefile
: ===
: RCS file: /cvs/ports/devel/quirks/Makefile,v
: retrieving revision 1.841
: diff -u -p -r1.841 Makefile
: --- devel/quirks/Makefile 12 Feb 2020 14:34:05 - 1.841
: +++ devel/quirks/Makefile 12 Feb 2020 19:14:28 -
: @@ -5,7 +5,7 @@ CATEGORIES = devel databases
: DISTFILES =
:
: # API.rev
: -PKGNAME =quirks-3.232
: +PKGNAME =quirks-3.233
: PKG_ARCH = *
: MAINTAINER = Marc Espie
:
: Index: devel/quirks/files/Quirks.pm
: ===
: RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
: retrieving revision 1.859
: diff -u -p -r1.859 Quirks.pm
: --- devel/quirks/files/Quirks.pm 12 Feb 2020 14:34:05 - 1.859
: +++ devel/quirks/files/Quirks.pm 12 Feb 2020 19:14:28 -
: @@ -339,6 +339,9 @@ my $stem_extensions = {
: 'ilmbase' => 'OpenEXR',
: 'openexr-viewers' => 'OpenEXR-tools',
: 'libvirt-python' => 'py-libvirt',
: + 'py-netmiko' => 'py3-netmiko',
: + 'py-napalm' => 'py3-napalm',
: + 'py-IOSXR' => 'py3-IOSXR',
: };
:
: my $obsolete_reason = {
Just merge py-foo into py3-foo automatically.
This was done with some py3 conversions in the past:
files/Quirks.pm:'py-nmap' => 'py3-nmap',
files/Quirks.pm:'py-link-grammar' => 'py3-link-grammar',
files/Quirks.pm:'py-buildbot-www' => 'py3-buildbot-www',
files/Quirks.pm:'py-buildbot-pkg' => 'py3-buildbot-pkg',
files/Quirks.pm:'py-buildbot-grid-view' => 'py3-buildbot-grid-view',
files/Quirks.pm:'py-buildbot-console-view' =>
'py3-buildbot-console-view',
files/Quirks.pm:'py-buildbot-waterfall-view' =>
'py3-buildbot-waterfall-view',
files/Quirks.pm:'py-pafy' => 'py3-pafy',
files/Quirks.pm:'py-zeroconf' => 'py3-zeroconf',
files/Quirks.pm:'py-xmldiff' => 'py3-xmldiff',
In cases where there are bin/ scripts where the py2 version will
have a hard conflict with the py3 version it *has* to be done this way.
In other cases there is a possible alternative: list in
$obsolete_reasons and have the user manually delete the py2 version if
they don't want it. This has been done for some ports more recently
(e.g. py-semver) but I don't think we should generally continue with it.
Admittedly it *is* more friendly to an user writing their own py2
scripts using modules from ports, but the common use case for packages
is a standard package user who just has things installed as a dependency
of something else. In that case after a pkg_add -u they get e.g.
Obsolete package: py-semver-2.8.1p0 (python2 port superseded by python3 version)
and it sits around until they manually remove it. So for the standard
case I think we should just merge.
: Index: net/py-netmiko/Makefile
: ===
: RCS file: /cvs/ports/net/py-netmiko/Makefile,v
: retrieving revision
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/02/20 06:51:54 Modified files: math/udunits : Makefile distinfo math/udunits/pkg: PLIST Log message: Update to udunits-2.2.26.
[Update] PostgreSQL 11.7 for -stable
Hello,
Small diff to update Postgresql to the latest 11.7 version.
Tested on @amd64
Comments, ok ?
Regards,
Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.256.2.1
diff -u -p -u -p -r1.256.2.1 Makefile
--- Makefile 15 Nov 2019 13:21:09 - 1.256.2.1
+++ Makefile 20 Feb 2020 10:42:12 -
@@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
-VERSION= 11.6
+VERSION= 11.7
PREV_MAJOR= 10
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.80.2.1
diff -u -p -u -p -r1.80.2.1 distinfo
--- distinfo 15 Nov 2019 13:21:09 - 1.80.2.1
+++ distinfo 20 Feb 2020 10:42:12 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-11.6.tar.gz) = VkStP3W8mHPoDj1WnICtdYY0OLQmC/5MgvBWSG26kwg=
-SIZE (postgresql-11.6.tar.gz) = 26001678
+SHA256 (postgresql-11.7.tar.gz) = TbV5408dYUM9ufKZcbBJNOoeMxjkw5BbHm8kDluFNTk=
+SIZE (postgresql-11.7.tar.gz) = 26065946
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.92.2.1
diff -u -p -u -p -r1.92.2.1 PLIST-docs
--- pkg/PLIST-docs 15 Nov 2019 13:21:09 - 1.92.2.1
+++ pkg/PLIST-docs 20 Feb 2020 10:42:12 -
@@ -676,6 +676,7 @@ share/doc/postgresql/html/release-11-3.h
share/doc/postgresql/html/release-11-4.html
share/doc/postgresql/html/release-11-5.html
share/doc/postgresql/html/release-11-6.html
+share/doc/postgresql/html/release-11-7.html
share/doc/postgresql/html/release-11.html
share/doc/postgresql/html/release-prior.html
share/doc/postgresql/html/release.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/02/20 06:09:06 Modified files: net/nextcloudclient: Makefile distinfo net/nextcloudclient/pkg: PLIST Added files: net/nextcloudclient/patches: patch-src_csync_ConfigureChecks_cmake Log message: update to nextcloudclient-2.6.3 from maintainer Adriano Barbosa, thanks! with hints from sthen@ and rsadowski@ and tweaks by me
Re: UPDATE games/freeciv-2.6.2
On Thu, Feb 20, 2020 at 07:10:28AM +0100, Björn Ketelaars wrote:
> Enclosed diff updates freeciv to 2.6.2, which mainly fixes bugs in the
> client. More information can be found at
> https://freeciv.fandom.com/wiki/NEWS-2.6.2.
>
> Run tested on amd64.
>
> OK?
OK
>
>
> diff --git Makefile Makefile
> index e4a1cf3c37a..a58453b1108 100644
> --- Makefile
> +++ Makefile
> @@ -4,7 +4,7 @@ COMMENT-main= Civilization clone for X11; multiplayer; game
> server
> COMMENT-client= Freeciv client
> COMMENT-share= shared data files for Freeciv
>
> -VERSION= 2.6.1
> +VERSION= 2.6.2
> DISTNAME=freeciv-${VERSION}
> PKGNAME-main=freeciv-server-${VERSION}
> PKGNAME-client= freeciv-client-${VERSION}
> diff --git distinfo distinfo
> index d0d6b4c0e07..848a5abe056 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (freeciv-2.6.1.tar.bz2) = zOaEHaAZQTiq0mnMc1VX20OKRJCddf0D1NtnUHmGueI=
> -SIZE (freeciv-2.6.1.tar.bz2) = 51915573
> +SHA256 (freeciv-2.6.2.tar.bz2) = YYHvPTx2JkODqrvg6vFVDYplykJjnmwXzCk4Fl4XbI8=
> +SIZE (freeciv-2.6.2.tar.bz2) = 52139007
> diff --git pkg/PLIST-main pkg/PLIST-main
> index 8a96f345e6a..f1087483ca5 100644
> --- pkg/PLIST-main
> +++ pkg/PLIST-main
> @@ -36,6 +36,7 @@ share/doc/freeciv/README.effects
> share/doc/freeciv/README.fcdb
> share/doc/freeciv/README.governor
> share/doc/freeciv/README.graphics
> +share/doc/freeciv/README.modpack_installer
> share/doc/freeciv/README.msys2
> share/doc/freeciv/README.nations
> share/doc/freeciv/README.packaging
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 05:24:54 Modified files: graphics/gimp/stable: Makefile distinfo graphics/gimp/stable/patches: patch-etc_Makefile_in graphics/gimp/stable/pkg: PLIST Log message: update to gimp-2.10.16 doesn't help the (random?) crashes in file/open but doesn't seem worse
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/02/20 05:19:18 Modified files: devel/p5-Test-MockObject: Makefile distinfo Log message: Update to p5-Test-MockObject-1.20200122.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 05:17:38 Modified files: x11/xfce4/gtk-xfce-engine: Tag: OPENBSD_6_6 Makefile Log message: fix MASTER_SITES for -stable (this is removed in -current) reported by Justin Muir, alternative distfile source found by danj
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/02/20 05:08:34 Modified files: devel/p5-Test-MockModule: Makefile distinfo Log message: Update to p5-Test-MockModule-0.172.0.
security/zkt tests needed [st...@openbsd.org: CVS: cvs.openbsd.org: ports]
Since nobody already noticed that it has broken since net/isc-bind was updated I'll call it out here: zkt needs changes to work with newer versions of BIND. I've fixed the most obvious problem but there may be others. I don't run it myself so if anyone cares about it working in 6.7 then please test on -current including this commit and report back, if there are problems then send some files I can work with and I'll try to take a look but no promises. (It was removed from the BIND contrib directory and seems fairly dead upstream at this point, so if there's no interest then it probably makes sense to just remove the port). - Forwarded message from Stuart Henderson - From: Stuart Henderson Date: Thu, 20 Feb 2020 04:21:13 -0700 (MST) To: ports-chan...@openbsd.org Subject: CVS: cvs.openbsd.org: ports CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 04:21:13 Modified files: security/zkt : Makefile security/zkt/patches: patch-man_dnssec-zkt_8 patch-man_zkt-conf_8 patch-man_zkt-keyman_8 patch-man_zkt-ls_8 patch-man_zkt-signer_8 Added files: security/zkt/patches: patch-dki_c patch-misc_c patch-zconf_c Log message: security/zkt tweaks: - https homepage - time_t printf - fix stray semicolon in if - stop using dnssec-keygen -r, it was removed after BIND 9.12. I don't have a working setup to validate things so I'm not sure if this is enough to fix with the current version of bind+tools in ports so more work maybe needed, but at least it can't work without this. - End forwarded message -
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 04:50:20 Modified files: security/zkt : Makefile security/zkt/pkg: DESCR Log message: add a note to DESCR pointing out some more actively-maintained ways to do DNSSEC
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 04:41:59 Modified files: net/queryperf : Makefile net/queryperf/pkg: DESCR Log message: update DESCR. mention dnsperf as an alternative, which is probably what new users want.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 04:31:33 Modified files: net/queryperf : Makefile distinfo Log message: queryperf was removed from bind contrib; switch the port to the standalone repo instead
Re: UPDATE: nextcloudclient-2.6.3
Hi Kirill,
thanks for the patch. I can reproduce the problem and confirm that the
patch works.
ok.
Best.
Em qui., 20 de fev. de 2020 às 03:13, Kirill Bychkov
escreveu:
>
> On Wed, February 19, 2020 20:22, Rafael Sadowski wrote:
> > On Tue Feb 18, 2020 at 10:54:36PM -0300, Adriano Barbosa wrote:
> >> Hi,
> >> update for nextcloudclient to v2.6.3.
> >> Changelog: https://github.com/nextcloud/desktop/releases/tag/v2.6.3
> >>
> >> OK?
> >>
> >> --
> >> Adriano
> >
> > I ran into the following err (nextcloudclient is not installed):
> >
> > FAILED: test/csync/check_encoding_functions
> > : && /usr/ports/pobj/nextcloudclient-2.6.3/bin/c++ -O2 -pipe
> > -I/usr/local/include/inotify -I/usr/local/include/qtkeychain
> > -I/usr/local/include -pedantic -DNDEBUG -L/usr/local/lib/inotify
> > -L/usr/local/lib -linotify -Wl,-rpath=/usr/local/lib/inotify
> > test/csync/CMakeFiles/check_encoding_functions.dir/check_encoding_functions_autogen/mocs_compilation.cpp.o
> > test/csync/CMakeFiles/check_encoding_functions.dir/encoding_tests/check_encoding.cpp.o
> > -o test/csync/check_encoding_functions -L/usr/local/lib/qt5/.
> > -L/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
> > -L/usr/local/lib -L/usr/local/lib/inotify -L/usr/lib
> > -Wl,-z,origin,-rpath,/usr/local/lib/qt5/.:/usr/ports/pobj/nextcloudclient-2.6.3/build-amd64/src/csync
> > test/csync/libtorture.a -lQt5Core -locsync -lcmocka -lsqlite3
> > -lQt5Concurrent -lQt5Core /usr/lib/libz.so.5.0
> > -Wl,-rpath-link,/usr/X11R6/lib && :
> > ld: error: undefined symbol: argp_parse
> referenced by cmdline.c
> cmdline.c.o:(torture_cmdline_parse) in archive
> test/csync/libtorture.a
> > c++: error: linker command failed with exit code 1 (use -v to see
> > invocation)
> > ninja: build stopped: subcommand failed.
> >
> >
>
> Shoul not fail with the patch below:
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 Makefile
> --- Makefile7 Feb 2020 07:13:53 - 1.4
> +++ Makefile20 Feb 2020 06:11:05 -
> @@ -2,9 +2,8 @@
>
> COMMENT = desktop sync client for Nextcloud
>
> -V =2.6.2
> +V =2.6.3
> DISTNAME = nextcloudclient-${V}
> -REVISION = 0
>
> GH_ACCOUNT = nextcloud
> GH_PROJECT = desktop
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo28 Dec 2019 13:48:04 - 1.2
> +++ distinfo20 Feb 2020 06:11:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloudclient-2.6.2.tar.gz) =
> u8tlkxNINiJmQLEI2nrT2wYUF2geLYQ7w3Gx1pf7BVE=
> -SIZE (nextcloudclient-2.6.2.tar.gz) = 18982053
> +SHA256 (nextcloudclient-2.6.3.tar.gz) =
> Wpi4KAJ9Zad6Qdr/P2eMrO8SUlCZsf0vMRRVHbAf8pg=
> +SIZE (nextcloudclient-2.6.3.tar.gz) = 18983292
> Index: patches/patch-src_csync_ConfigureChecks_cmake
> ===
> RCS file: patches/patch-src_csync_ConfigureChecks_cmake
> diff -N patches/patch-src_csync_ConfigureChecks_cmake
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_csync_ConfigureChecks_cmake 20 Feb 2020 06:11:05
> -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/csync/ConfigureChecks.cmake
> +--- src/csync/ConfigureChecks.cmake.orig
> src/csync/ConfigureChecks.cmake
> +@@ -15,7 +15,7 @@ set(BINARYDIR ${CMAKE_CURRENT_BINARY_DIR})
> + set(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR})
> +
> + # HEADER FILES
> +-check_include_file(argp.h HAVE_ARGP_H)
> ++#check_include_file(argp.h HAVE_ARGP_H)
> +
> + # FUNCTIONS
> + if (NOT LINUX)
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- pkg/PLIST 28 Dec 2019 13:48:04 - 1.2
> +++ pkg/PLIST 20 Feb 2020 06:11:05 -
> @@ -35,6 +35,7 @@ share/icons/hicolor/64x64/apps/Nextcloud
> share/nextcloud/
> share/nextcloud/i18n/
> share/nextcloud/i18n/client_TW.qm
> +share/nextcloud/i18n/client_af.qm
> share/nextcloud/i18n/client_bg.qm
> share/nextcloud/i18n/client_ca.qm
> share/nextcloud/i18n/client_cs.qm
>
>
--
Adriano Barbosa
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 04:21:13 Modified files: security/zkt : Makefile security/zkt/patches: patch-man_dnssec-zkt_8 patch-man_zkt-conf_8 patch-man_zkt-keyman_8 patch-man_zkt-ls_8 patch-man_zkt-signer_8 Added files: security/zkt/patches: patch-dki_c patch-misc_c patch-zconf_c Log message: security/zkt tweaks: - https homepage - time_t printf - fix stray semicolon in if - stop using dnssec-keygen -r, it was removed after BIND 9.12. I don't have a working setup to validate things so I'm not sure if this is enough to fix with the current version of bind+tools in ports so more work maybe needed, but at least it can't work without this.
update: devel/py-wheel
Hi ports@,
Here's an update for devel/py-wheel from 0.31.0 to 0.34.0
This is the changelog:
https://github.com/pypa/wheel/blob/master/docs/news.rst
All tests pass both py2 and py3 on amd64.
Those tests were not running for me before. Removing MODPY_PYTEST_ARGS
made them run and pass.
These are the consumers for this port and the resutl of the regression
tests, which are exactly the same before and after the update:
devel/py-rencode
Test don't really start because:
E ImportError: cannot import name _rencode
I tried to fix this quickly settingup PYTHONPATH on TEST_ENV without
success. I may take a look later.
net/deluge
tests fail because it cannot find pytest-twisted (which is not in
ports)
devel/py-argcomplete
py2 FAILED (failures=17, errors=26, expected failures=5)
py3 FAILED (failures=17, errors=6, expected failures=11)
textproc/yq
all tests pass
Cheers,
Paco.
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-wheel/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile12 Jul 2019 20:45:56 - 1.8
+++ Makefile19 Feb 2020 22:54:33 -
@@ -2,11 +2,10 @@
COMMENT = built-package format for Python
-MODPY_EGG_VERSION =0.31.0
+MODPY_EGG_VERSION =0.34.2
DISTNAME = wheel-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
-REVISION = 0
# MIT
PERMIT_PACKAGE = Yes
@@ -16,7 +15,6 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
-MODPY_PYTEST_ARGS =wheel
FLAVORS = python3
FLAVOR ?=
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-wheel/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo26 Apr 2018 14:14:48 - 1.2
+++ distinfo19 Feb 2020 22:48:50 -
@@ -1,2 +1,2 @@
-SHA256 (wheel-0.31.0.tar.gz) = GugVO+1wHLBikTtyQpvPhUuoJPlzc1QnaBiCpojLVc4=
-SIZE (wheel-0.31.0.tar.gz) = 38528
+SHA256 (wheel-0.34.2.tar.gz) = h4jpFV/hT1QWTBuesKMZ2Y7wLBYHJVh61g8U3cV7b5Y=
+SIZE (wheel-0.34.2.tar.gz) = 58330
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-wheel/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 26 Apr 2018 14:14:49 - 1.2
+++ pkg/PLIST 19 Feb 2020 22:49:36 -
@@ -14,37 +14,29 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}archive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}bdist_wheel.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}egg2wheel.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}install.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}macosx_libfile.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}paths.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}pep425tags.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}pkginfo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}wininst2wheel.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wheel/archive.py
+lib/python${MODPY_VERSION}/site-packages/wheel/${MODPY_PYCACHE}wheelfile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wheel/_version.py
lib/python${MODPY_VERSION}/site-packages/wheel/bdist_wheel.py
-lib/python${MODPY_VERSION}/site-packages/wheel/egg2wheel.py
-lib/python${MODPY_VERSION}/site-packages/wheel/install.py
+lib/python${MODPY_VERSION}/site-packages/wheel/cli/
+lib/python${MODPY_VERSION}/site-packages/wheel/cli/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wheel/cli/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wheel/cli/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wheel/cli/${MODPY_PYCACHE}convert.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 02:37:20 Modified files: www/py-cheroot : Makefile Log message: bump needed, devel/py-jaraco-functools pkgname fix
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/02/20 02:36:56 Modified files: devel/py-tempora: Makefile Log message: bump needed, devel/py-jaraco-functools pkgname fix
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/02/20 02:24:52 Modified files: audio/libdiscid: Makefile Log message: Missing libutil in WANTLIB Spotted by Tom Murphy and jj@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/02/20 01:41:27 Modified files: databases/p5-DBD-Mock: Makefile distinfo databases/p5-DBD-Mock/pkg: PLIST Log message: Update to p5-DBD-Mock-1.55. from wen heping, afresh1@ and updated
