Re: update editors/TeXmacs 1.99.14
Nam Nguyen writes: > This is an update for editors/TeXmacs-1.99.14, released November 5, > 2020. Here is a diff for 1.99.15, which was just released on November 13, 2020. > > Changelog: https://texmacs.org/tmweb/about/changes.en.html > > Ports changes: > - reverts back to DISTNAME and PKGNAME as in revision 1.15 now that > distfile extracts to -src again. > - notes in README that octave plugin requires gnuplot. This fresh diff additionally: - compileall.py for a portcheck warning I used net/konversation as an example of compileall.py. It still complains about texmacs_reedit.py, but it is not worth a patch for the its strange combination of tabs and spaces. "Python module without compiled version, consider using ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py: share/TeXmacs/misc/inkscape_extension/texmacs_reedit.py" > > I tested with all plugins and it works. Feedback and tests are welcome. > It still works in brief testing of all plugins. Index: Makefile === RCS file: /cvs/ports/editors/TeXmacs/Makefile,v retrieving revision 1.18 diff -u -p -u -p -r1.18 Makefile --- Makefile1 Aug 2020 11:00:31 - 1.18 +++ Makefile14 Nov 2020 07:38:14 - @@ -2,8 +2,8 @@ COMMENT= wysiwyw (what you see is what you want) editing platform -DISTNAME= TeXmacs-1.99.13 -EXTRACT_SUFX= -src.tar.gz +DISTNAME= TeXmacs-1.99.15-src +PKGNAME= ${DISTNAME:S/-src//} CATEGORIES=editors print x11 HOMEPAGE= https://texmacs.org/ @@ -42,5 +42,9 @@ CXXFLAGS+=-Wno-deprecated-register post-extract: rm -f ${WRKDIST}/plugins/mathematica/bin/realpath.py + +post-install: + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \ + ${PREFIX}/share/TeXmacs/plugins/tmpy .include Index: distinfo === RCS file: /cvs/ports/editors/TeXmacs/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo1 Aug 2020 11:00:31 - 1.4 +++ distinfo14 Nov 2020 07:38:14 - @@ -1,2 +1,2 @@ -SHA256 (TeXmacs-1.99.13-src.tar.gz) = Aq0cS47QqmFQHelxRjANeJlgXCXagnYRykpAq7wHqbQ= -SIZE (TeXmacs-1.99.13-src.tar.gz) = 37181886 +SHA256 (TeXmacs-1.99.15-src.tar.gz) = bU8qNM3+i2JmN2vH0gRMRy/E6fon8a/rTXGHKaJHKCc= +SIZE (TeXmacs-1.99.15-src.tar.gz) = 36579717 Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/editors/TeXmacs/patches/patch-CMakeLists_txt,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt1 Aug 2020 11:00:31 - 1.3 +++ patches/patch-CMakeLists_txt14 Nov 2020 07:38:14 - @@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 202 Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -586,7 +586,7 @@ if (TEXMACS_GUI MATCHES "Qt.*") +@@ -591,7 +591,7 @@ if (TEXMACS_GUI MATCHES "Qt.*") set (TeXmacs_All_SRCS ${TeXmacs_All_SRCS} ${TeXmacs_Qt_SRCS} ${TeXmacs_Qt_Moc_HDRS}) set (TeXmacs_Include_Dirs ${TeXmacs_Include_Dirs} ${QT_INCLUDES}) Index: patches/patch-src_Plugins_Qt_qt_gui_cpp === RCS file: /cvs/ports/editors/TeXmacs/patches/patch-src_Plugins_Qt_qt_gui_cpp,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_Plugins_Qt_qt_gui_cpp --- patches/patch-src_Plugins_Qt_qt_gui_cpp 1 Aug 2020 11:00:31 - 1.4 +++ patches/patch-src_Plugins_Qt_qt_gui_cpp 14 Nov 2020 07:38:14 - @@ -2,12 +2,12 @@ $OpenBSD: patch-src_Plugins_Qt_qt_gui_cp Index: src/Plugins/Qt/qt_gui.cpp --- src/Plugins/Qt/qt_gui.cpp.orig +++ src/Plugins/Qt/qt_gui.cpp -@@ -838,7 +838,7 @@ qt_gui_rep::update () { +@@ -868,7 +868,7 @@ qt_gui_rep::update () { time_t delay = delayed_commands.lapse - texmacs_time(); if (needing_update) delay = 0; - elsedelay = max (0, min (std_delay, delay)); + elsedelay = max (static_cast(0), min (static_cast(std_delay), delay)); - if (postpone_treatment) delay= 100; // NOTE: force occasional display + if (postpone_treatment) delay= 9; // NOTE: force occasional display updatetimer->start (delay); Index: pkg/PLIST === RCS file: /cvs/ports/editors/TeXmacs/pkg/PLIST,v retrieving revision 1.8 diff -u -p -u -p -r1.8 PLIST --- pkg/PLIST 1 Aug 2020 11:00:31 - 1.8 +++ pkg/PLIST 14 Nov 2020 07:38:14 - @@ -651,6 +651,11 @@ share/TeXmacs/doc/devel/style/style.fr.t share/TeXmacs/doc/devel/style/style.pt.tm share/TeXmacs/doc/fdl.txt share/TeXmacs/doc/main/ +share/TeXmacs/doc/main/automated/ +share/TeXmacs/doc/main/automated/tag-help.en.tm +share/TeXmacs/doc/main/automated/tag-help.fr.tm +share/TeXmacs/doc/main/automated/top-help.en.tm +share/TeXmacs/doc/main/automated/top-help.fr.tm share/TeXmacs/doc/main/beamer/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/14 00:53:23 Modified files: games/rocksndiamonds: Makefile distinfo games/rocksndiamonds/pkg: PLIST Log message: Update to rocksndiamonds-4.2.0.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/14 00:44:59 Modified files: textproc/highlight: Makefile distinfo textproc/highlight/patches: patch-src_makefile textproc/highlight/pkg: PLIST Log message: Update to highlight-3.59.
Re: [macppc] www/webkitgtk4: fix javascript runtime and colors
On Fri, Nov 13, 2020 at 09:55:01PM -0500, George Koehler wrote: > On Wed, 11 Nov 2020 01:38:04 +0100 > Charlene Wendling wrote: > > > On Tue, 10 Nov 2020 07:50:26 +0100 > > Charlene Wendling wrote: > > > > New diff with aja's and sthen's suggestions. I tested on macppc and, even > > if it has no impact there, amd64. > > I built webkitgtk4 on macppc after you committed your fixes, and with > one more change: I deleted the -mlongcall flag. I suggest to keep > -mlongcall for now, but the next person to edit webkitgtk4/Makefile > should remove -mlongcall at the same time. > > Below the diff, I explain -mlongcall and -Wl,--relax flags. > > Index: Makefile > === > RCS file: /cvs/ports/www/webkitgtk4/Makefile,v > retrieving revision 1.130 > diff -u -p -r1.130 Makefile > --- Makefile 11 Nov 2020 21:27:03 - 1.130 > +++ Makefile 13 Nov 2020 20:45:24 - > @@ -119,8 +119,6 @@ LDFLAGS +=-Wl,--no-keep-memory > .if ${MACHINE_ARCH} == "powerpc" > # XXX fix colors being off, it would be nice to fix the code > CONFIGURE_ARGS +=-DENABLE_GRAPHICS_CONTEXT_GL=OFF > -CFLAGS +=-mlongcall > -CXXFLAGS += -mlongcall > LDFLAGS += -Wl,--relax > PATCH_LIST = patch-* powerpc-patch-* > .endif > > In powerpc and powerpc64 code, the "bl" instruction for a direct > function call uses a signed 26-bit offset. This limits the branch > distance to plus or minus 32 megabytes. This works well when each > program or shared lib has less than 32M of code. > > libwebkit2gtk-4.0.so.3.3 is too big, because its LOAD segment with > the E flag (for code) has size > 32M = 0x2_000_000 bytes: > > $ readelf -l libwebkit2gtk-4.0.so.3.3|head > ... > Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align > LOAD 0x00 0x 0x 0x2e979e4 0x2e979e4 R E > 0x1 > > With cc -mlongcall, each function call is indirect through a function > pointer. This would get around the 32M limit, but it doesn't work > because /usr/lib/crt*.o don't use -mlongcall. My test program with > code over 32M got linker errors from crtbegin.o and crt0.o. > > With cc -Wl,--relax, the linker ld.bfd can pass the 32M limit by > inserting a thunk (or branch island) between the "bl" and its > destination. This doesn't need -mlongcall and does work with crt*.o. > We use -Wl,--relax without -mlongcall in devel/llvm on powerpc. > > cc -Wl,--relax causes an error with ld.lld on powerpc64 (or with > cc -fuse-ld=lld on powerpc), but lld inserts thunks (branch islands) > by default. If macppc switches to lld, we would remove -Wl,--relax > from ports.--George This reminds me I had a diff I was going to send out after I saw the recent discussion about webkitgtk4. There appear to be only two instances left in the tree. Index: games/godot/Makefile === RCS file: /home/cvs/ports/games/godot/Makefile,v retrieving revision 1.16 diff -u -p -u -p -r1.16 Makefile --- games/godot/Makefile19 Sep 2020 06:37:23 - 1.16 +++ games/godot/Makefile14 Nov 2020 03:20:12 - @@ -5,6 +5,7 @@ COMMENT = 2D and 3D game engine V =3.2.3 DISTNAME = godot-${V}-stable PKGNAME = godot-${V} +REVISION = 0 CATEGORIES = games HOMEPAGE = https://godotengine.org/ MAINTAINER = Omar Polo @@ -78,8 +79,6 @@ WANTLIB += atomic # Fix relocation overflows .if ${MACHINE_ARCH:Mpowerpc} -CFLAGS += -mlongcall -CXXFLAGS +=-mlongcall LDFLAGS += -Wl,--relax .endif Index: www/webkitgtk4/Makefile === RCS file: /home/cvs/ports/www/webkitgtk4/Makefile,v retrieving revision 1.130 diff -u -p -u -p -r1.130 Makefile --- www/webkitgtk4/Makefile 11 Nov 2020 21:27:03 - 1.130 +++ www/webkitgtk4/Makefile 13 Nov 2020 06:04:51 - @@ -14,7 +14,7 @@ PORTROACH = limitw:1,even COMMENT = GTK+ port of the WebKit rendering engine V =2.30.2 -REVISION = 0 +REVISION = 1 DISTNAME = webkitgtk-${V} PKGNAME = webkitgtk4-${V} EXTRACT_SUFX = .tar.xz @@ -119,8 +119,6 @@ LDFLAGS += -Wl,--no-keep-memory .if ${MACHINE_ARCH} == "powerpc" # XXX fix colors being off, it would be nice to fix the code CONFIGURE_ARGS += -DENABLE_GRAPHICS_CONTEXT_GL=OFF -CFLAGS += -mlongcall -CXXFLAGS +=-mlongcall LDFLAGS += -Wl,--relax PATCH_LIST = patch-* powerpc-patch-* .endif
Re: [UPDATE] audio/lmms 1.2.0 -> 1.2.2
Ping On Sat, November 7, 2020 06:06, Dimitri Karamazov wrote: > Update audio/lmms to 1.2.2 > > > I'll take MAINTAINER if no one minds. > I'm considering adding carla to expand the plugin > compatibility. After that maybe be zynaddsubfx as a separate port could be > loaded as a plugin. > > Changelog: https://github.com/LMMS/lmms/releases > > Index: Makefile === RCS file: /cvs/ports/audio/lmms/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile30 Jan 2020 14:13:47 - 1.23 +++ Makefile7 Nov 2020 05:52:36 - @@ -2,17 +2,24 @@ COMMENT = music studio with tracking, sampling and MIDI -# rolled from git; requires submodules -# git clone --recurse-submodules -b v1.2.0 https://github.com/lmms/lmms -DISTNAME = lmms-1.2.0 -REVISION = 0 -EXTRACT_SUFX = .tar.xz +V =1.2.2 +RPMALLOC_VER = 1.4.1 +GH_ACCOUNT = LMMS +GH_PROJECT = lmms +GH_TAGNAME = v${V} CATEGORIES = audio HOMEPAGE = https://lmms.io/ -MASTER_SITES = https://spacehopper.org/mirrors/ +MASTER_SITES0 =https://github.com/mjansson/rpmalloc/archive/ + +MAINTAINER = Dimitri Karamazov + +DISTFILES += v${V}.tar.gz \ + ${RPMALLOC_VER}.tar.gz:0 + +EXTRACT_ONLY = v${V}.tar.gz # GPLv2 PERMIT_PACKAGE = Yes @@ -61,5 +68,9 @@ CONFIGURE_ARGS += -DWANT_CALF=OFF \ -DWANT_VST=OFF NO_TEST = Yes + +post-extract: + tar zxf ${DISTDIR}/${RPMALLOC_VER}.tar.gz -C ${WRKSRC} + cp -r ${WRKSRC}/rpmalloc-${RPMALLOC_VER}/rpmalloc ${WRKSRC}/src/3rdparty/rpmalloc/rpmalloc/ .include Index: distinfo === RCS file: /cvs/ports/audio/lmms/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo14 Jun 2019 13:51:01 - 1.4 +++ distinfo7 Nov 2020 05:52:36 - @@ -1,2 +1,4 @@ -SHA256 (lmms-1.2.0.tar.xz) = Fom6xh4Zaysl7e85lcu+HoKj39qtQZY/ahz57NeiBnY= -SIZE (lmms-1.2.0.tar.xz) = 14545260 +SHA256 (1.4.1.tar.gz) = 6KlEgdygJLz/8KyqJGKz9fsdV5QPxEnasNp0NJMt5hA= +SHA256 (v1.2.2.tar.gz) = QeFeqo7glotByYMnWl0uPqV8NIHeZDhpWE/A0c4JLvY= +SIZE (1.4.1.tar.gz) = 81530 +SIZE (v1.2.2.tar.gz) = 16501132 > > > > regards, Dimitri diff Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/11/13 21:56:41 Modified files: devel/py-setuptools: Makefile Log message: Portroach notation to limit it to 44.x while we support python2
Re: update games/jag 0.3.8
Related proposal: Should these be removed from the mirrors since PERMIT_DISTFILES = no? https://ftp.openbsd.org/pub/OpenBSD/distfiles/jag-0.3.2-data.zip jag-0.3.2.zip jag-0.3.7.tar.gz Here is a fresh diff that additionally: - removes -g debug flag from pro files and update patch comments - post-install chowns and chmods ${PREFIX}/share/jag instead of ${PREFIX}/share, just to be more specific summary of changes: - removes gameprofile.cpp and displaywrapper.cpp patches, as they have already been added upstream - PERMIT_PACKAGE comment updated to state that assets are under an ambiguous free license changes from thfr@: - COMPILER for switch to -std=gnu++17 - remove devel/SDL2 from LIB_DEPENDS because devel/sdl2-mixer has it - explicitly state which files need DOS line endings from Makefile.template - add missing WANTLIB GL - correct license marker GPLv3+ >> >> - PERMIT_PACKAGE = Yes due to removal of all themes except for the >> >> default theme >> >> discussion: https://gitlab.com/coringao/jag/-/issues/1 > >> >> All questionable assets were removed so I propose PERMIT_PACKAGE = >> >> Yes. I still could not find a license for the default theme made by >> >> PixelMixer. Given that the default theme's assets are featured on the >> >> website and they were not made by Fasticon, they should fall under the >> >> JAG menu's statement: "Thanks to the authors of graphics, icons and >> >> sounds, which are used under free licenses in the game." Hopefully this >> >> is sufficient for PERMIT_PACKAGE = Yes. Thomas Frohwein writes: > > I think the questions are: > > 1. who is the copyright holder (usually creator) of the default theme? > 2. What license did they publish it with? (or maybe none?) > > In my opinion, upstream has to do their do diligence before they claim > this to be GPLv3(+). "Free licenses" is too ambiguous so I've left PERMIT_PACKAGE as no, until some future time when more evidence can be provided. I e-mailed the creator of the original theme (PixelMixer) and author of a related project, bubble chains, (sintegrial) to see if I get any leads. I will update in the gitlab thread. > Are there any unlicensed assets not included in > the copyright of the project to your best knowledge? Does copyright means GPLv3+ license in this context? Assets under question are level packs, translations, icons/backgrounds/graphics and sounds. I'm unsure whether assets are unlicensed or included in GPLv3+, but most of them have credits (e.g., level packs, translations and themes). As an aside, I filed a report for the menu saying, "Uses SDL library under GPLv3 license" to change it to SDL2 zlib. From my research, I found that LGPL 2 and 3 could be relicensed to GPLv3+ but zlib cannot be. https://gitlab.com/coringao/jag/-/issues/3 Index: Makefile === RCS file: /cvs/ports/games/jag/Makefile,v retrieving revision 1.12 diff -u -p -u -p -r1.12 Makefile --- Makefile1 Aug 2020 05:34:08 - 1.12 +++ Makefile14 Nov 2020 00:52:37 - @@ -1,44 +1,41 @@ # $OpenBSD: Makefile,v 1.12 2020/08/01 05:34:08 landry Exp $ COMMENT = arcade-puzzle game -V =0.3.7 +V =0.3.8 DISTNAME = jag-${V} CATEGORIES = games HOMEPAGE = https://gitlab.com/coringao/jag -# GPLv3 +# GPLv3+ # https://gitlab.com/coringao/jag/-/issues/1 -PERMIT_PACKAGE = restrictively licensed themes -PERMIT_DISTFILES = restrictively licensed themes +PERMIT_PACKAGE = ambiguous free license for graphics, icons and sounds +PERMIT_DISTFILES = ambiguous free license for graphics, icons and sounds -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets WANTLIB += Qt5X11Extras SDL2 SDL2_mixer X11 Xrandr c -COMPILER = base-clang ports-gcc base-gcc +COMPILER = base-clang ports-gcc MASTER_SITES = https://gitlab.com/coringao/jag/-/archive/${V}/ MODULES = devel/qmake x11/qt5 -LIB_DEPENDS = devel/sdl2 \ - devel/sdl2-mixer \ +LIB_DEPENDS = devel/sdl2-mixer \ x11/qt5/qtx11extras # make jag and jag-editor MODQMAKE_PROJECTS =. \ src/editor -# delete DOS line endings -post-extract: - @find ${WRKSRC} -type f \( -name "*.cpp" -o -name "*.h" \) -exec \ - perl -i -pe 's/\r$$//' {} + +pre-patch: + @cd ${WRKSRC} && perl -i -pe 's/\r$$//' src/main.cpp pre-configure: - @${SUBST_CMD} ${WRKSRC}/game.pro ${WRKSRC}/src/main.cpp \ - ${WRKSRC}/src/editor/jag-editor.pro + @cd ${WRKSRC} && ${SUBST_CMD} src/main.cpp game.pro \ + src/editor/jag-editor.pro post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/jag cd ${WRKSRC}/data && pax -rw . ${PREFIX}/share/jag - chown -R
Re: [sparc64/base-gcc] Fix build of math/py-scikit-learn
> On Nov 13, 2020, at 9:49 PM, Kurt Mosiejczuk wrote: > > py-scikit-learn uses C++11, so base-gcc doesn't work to build it. > > This fixes the build on sparc64. > > ok? ok daniel@ > > (cc maintiainer) > > --Kurt > > Index: Makefile > === > RCS file: /cvs/ports/math/py-scikit-learn/Makefile,v > retrieving revision 1.8 > diff -u -p -r1.8 Makefile > --- Makefile28 Oct 2020 04:04:04 -1.8 > +++ Makefile13 Nov 2020 21:14:20 - > @@ -15,6 +15,9 @@ MAINTAINER =Paul Irofti # BSD-3 > PERMIT_PACKAGE =Yes > > +# C++11 > +COMPILER =base-clang ports-gcc > + > WANTLIB += ${COMPILER_LIBCXX} m > > MODULES =lang/python >
Re: [macppc] www/webkitgtk4: fix javascript runtime and colors
On Wed, 11 Nov 2020 01:38:04 +0100 Charlene Wendling wrote: > On Tue, 10 Nov 2020 07:50:26 +0100 > Charlene Wendling wrote: > > New diff with aja's and sthen's suggestions. I tested on macppc and, even > if it has no impact there, amd64. I built webkitgtk4 on macppc after you committed your fixes, and with one more change: I deleted the -mlongcall flag. I suggest to keep -mlongcall for now, but the next person to edit webkitgtk4/Makefile should remove -mlongcall at the same time. Below the diff, I explain -mlongcall and -Wl,--relax flags. Index: Makefile === RCS file: /cvs/ports/www/webkitgtk4/Makefile,v retrieving revision 1.130 diff -u -p -r1.130 Makefile --- Makefile11 Nov 2020 21:27:03 - 1.130 +++ Makefile13 Nov 2020 20:45:24 - @@ -119,8 +119,6 @@ LDFLAGS += -Wl,--no-keep-memory .if ${MACHINE_ARCH} == "powerpc" # XXX fix colors being off, it would be nice to fix the code CONFIGURE_ARGS += -DENABLE_GRAPHICS_CONTEXT_GL=OFF -CFLAGS += -mlongcall -CXXFLAGS +=-mlongcall LDFLAGS += -Wl,--relax PATCH_LIST = patch-* powerpc-patch-* .endif In powerpc and powerpc64 code, the "bl" instruction for a direct function call uses a signed 26-bit offset. This limits the branch distance to plus or minus 32 megabytes. This works well when each program or shared lib has less than 32M of code. libwebkit2gtk-4.0.so.3.3 is too big, because its LOAD segment with the E flag (for code) has size > 32M = 0x2_000_000 bytes: $ readelf -l libwebkit2gtk-4.0.so.3.3|head ... Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x00 0x 0x 0x2e979e4 0x2e979e4 R E 0x1 With cc -mlongcall, each function call is indirect through a function pointer. This would get around the 32M limit, but it doesn't work because /usr/lib/crt*.o don't use -mlongcall. My test program with code over 32M got linker errors from crtbegin.o and crt0.o. With cc -Wl,--relax, the linker ld.bfd can pass the 32M limit by inserting a thunk (or branch island) between the "bl" and its destination. This doesn't need -mlongcall and does work with crt*.o. We use -Wl,--relax without -mlongcall in devel/llvm on powerpc. cc -Wl,--relax causes an error with ld.lld on powerpc64 (or with cc -fuse-ld=lld on powerpc), but lld inserts thunks (branch islands) by default. If macppc switches to lld, we would remove -Wl,--relax from ports.--George
[sparc64/base-gcc] Fix build of math/py-scikit-learn
py-scikit-learn uses C++11, so base-gcc doesn't work to build it. This fixes the build on sparc64. ok? (cc maintiainer) --Kurt Index: Makefile === RCS file: /cvs/ports/math/py-scikit-learn/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile28 Oct 2020 04:04:04 - 1.8 +++ Makefile13 Nov 2020 21:14:20 - @@ -15,6 +15,9 @@ MAINTAINER = Paul Irofti
Re: [NEW] p5-Net-Prometheus ( with p5-Struct-Dumb )
The updated versions of p5-Struct-Dumb-0.12 and p5-Net-Prometheus-0.11 are is still OK afresh1@ if someone has time to OK or import. Reattached here for convenience. On Tue, Oct 20, 2020 at 12:00:53PM -0400, Sven F. wrote: > On Thu, Oct 1, 2020 at 6:14 PM Sven F. wrote: > > > > > > > > On Fri, Sep 25, 2020 at 8:42 AM Sven F. wrote: > >> > >> On Thu, Sep 10, 2020 at 10:19 PM Andrew Hewus Fresh > >> wrote: > >> > > >> > p5-Struct-Dumb could use a TEST_DEPENDS on devel/p5-Data-Dump so tests > >> > are the same no matter what else is installed, other than that: > >> > > >> > OK afresh1@ > >> > > >> > p5-Net-Prometheus doesn't seem to need BUILD_DEPENDS=${RUN_DEPENDS}, but > >> > with that changed, it's also > >> > > >> > OK afresh1@ > >> > > >> > > >> > >> Updated Makefile and clean archive joined. > >> Make test works and make after modification. > >> > >> Thank you for the review @Andrew Fresh > >> > > > > Since 6.8 is out maybe someone else can OK this ? > > > > Tree is unlocked , is it possible to have a second OK and/or a commit of > those ? > > -- > -- > - > Knowing is not enough; we must apply. Willing is not enough; we must do > -- andrew - http://afresh1.com Hey, I think I see a barn up ahead. -- The American Astronaut p5-Struct-Dumb.tar.gz Description: application/tar-gz p5-Net-Prometheus.tar.gz Description: application/tar-gz
Re: retirement proposal: audio/zeya, py2 version of audio/py-tagpy
On Fri, Nov 13 2020, Stuart Henderson wrote: > This web-based (HTML5) media player was added in 2011, has had one > version update (also in 2011), the previous port maintainer doesn't > respond any more, and upstream says > > Python 2.5+ (2.6+ recommended) > Latest release: 0.6 17 September 2011 > > ..which isn't entirely ideal for network-facing software. > Debian removed it from packaging in 2015 ("low popcon, dead upstream"). > > Also it's in the way of dropping py2 support from py-tagpy and in > turn the frankenbuild of boost that pulls in both py2+py3 (at build and > run time). > > Any OKs/objections to remove? ok to drop it, the py-tagpy diff looks good. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: assembler error on trying to port OpenBLAS
On 2020/10/30 23:14, Brad Smith wrote: > On Fri, Oct 30, 2020 at 04:55:53PM +, Stuart Henderson wrote: > > On 2020/10/29 20:25, Aisha Tammy wrote: > > > I'm trying to port OpenBLAS to the tree and am currently getting > > > some weird assembler errors (port makefile is attached at end > > > math/openblas) > > > > not that weird, the source code has inline asm, it is passed to > > /usr/bin/as which is pretty old and pre-dates support for this > > being added > > > > > Presumably this is happening due to the assembler being used is > > > the one from base as we don't build the ports egcc with gas for > > > anything except aarch64 and arm. > > > I'm kind of stumped here as it seems like using gfortran sets the > > > compiler to egcc (compiling the above file with cc works). > > > Is it possible to mix gfortran with base-clang C compiler? > > > Another (possible) solution would be to build egcc all archs with > > > the new gas assembler, but that sounds a lot more dangerous and I > > > don't know enough to know if that is possible/or even a good idea/ > > > or if it will even work :-/ > > > > I think ports/lang/gcc should start using the newer version of gas > > from ports on i386 and amd64. > > > > On these archs it doesn't affect many ports (fortran things, > > asterisk, seabios [vmm-firmware], maybe one or two others). > > > > For other archs there is higher risk as large parts of the ports > > tree use ports-gcc on most of these. But there's probably less need > > for the newer assembler on those too. > > I had sent a diff like the following to Pascal last year. Since in the > past we had run into issues with inline asm and our GNU as being too old. > > > Index: Makefile > === > RCS file: /home/cvs/ports/lang/gcc/8/Makefile,v > retrieving revision 1.34 > diff -u -p -u -p -r1.34 Makefile > --- Makefile 4 Sep 2020 09:55:34 - 1.34 > +++ Makefile 31 Oct 2020 03:08:05 - > @@ -18,6 +18,7 @@ DPB_PROPERTIES = parallel > V = 8.4.0 > FULL_VERSION = $V > FULL_PKGVERSION = $V > +REVISION = 0 > > ADASTRAP-amd64 = adastrap-amd64-8.3.0-2.tar.xz > ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz > @@ -65,7 +66,8 @@ EXTRACT_ONLY = ${DISTNAME}.tar.xz > BUILD_DEPENDS += devel/bison \ > devel/libexecinfo > > -.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "arm" > +.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ > +${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "i386" > BUILD_DEPENDS += devel/gas > RUN_DEPENDS += devel/gas > RUN_DEPENDS-main += devel/gas > Committed but I have backed it out again. Turns out this fails when linking the produced objects with ld.bfd, which is needed by at least seabios (sysutils/firmware/vmm) on amd64/i386, and asterisk on i386 (USE_LLD=No in ports).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 17:00:39 Modified files: lang/gcc/8 : Makefile Log message: backout previous, old ld.bfd can't cope with new gas. found by naddy@ in seabios (sysutils/firmware/vmm). /usr/bin/ld.bfd: scripts/kconfig/zconf.tab.o: invalid relocation type 42 /usr/bin/ld.bfd: BFD 2.17 assertion fail /usr/src/gnu/usr.bin/binutils-2.17/bfd/elf64-x86-64.c:259 ... /usr/bin/ld.bfd: scripts/kconfig/conf.o(.text+0x3b3): unresolvable L<8B>^]^A^Z^E relocation against symbol `__sF' etc.
Re: devel/boost: drop python2 support and speed up make fake
On 2020/11/13 17:41, Jeremie Courreges-Anglas wrote: > On Fri, Nov 13 2020, Stuart Henderson wrote: > > On 2020/11/08 01:46, Jeremie Courreges-Anglas wrote: > >> > >> This diff drops boost_python27 and boost_numpy27. > > > > Dropping boost_python27* needs work first; > > That is correct, I had a draft mail about it but ENOTIME. > tl;dr my grep-fu failed me, sorry folks. > > This is what I came up with to disable just boost_numpy27. A bit > hackish but seems to work fine. BTW the only failure in an i386 build with the original diff was py-tagpy (openimageio is broken on at least i386/powerpc, and vegastrike is amd64-only as one of the deps is broken on i386). Nothing on i386 had problems with removing the b2 files. I've sent out a py-tagpy diff, openimageio is literally just MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} and bump REVISION (I'm building blender with it to be sure, which will take a while, but unlikely to have any problems). I think those two make sense regardless. Then we can either go for your new diff, or the original one and mark vegastrike broken for now.. > === > RCS file: /cvs/ports/devel/boost/Makefile,v > retrieving revision 1.102 > diff -u -p -r1.102 Makefile > --- Makefile 11 Nov 2020 15:53:41 - 1.102 > +++ Makefile 13 Nov 2020 16:38:52 - > @@ -6,6 +6,7 @@ COMMENT-main= free peer-reviewed portabl > COMMENT-md= machine-dependent libraries for boost > > VERSION= 1.70.0 > +REVISION-main= 0 > DISTNAME=boost_${VERSION:S/./_/g} > PKGNAME-main=boost-${VERSION} > PKGNAME-md= boost-md-${VERSION} > @@ -33,7 +34,6 @@ BOOST_LIBS= boost_atomic-mt \ > boost_math_tr1l-mt boost_math_tr1l \ > boost_prg_exec_monitor-mt boost_prg_exec_monitor \ > boost_program_options-mt boost_program_options \ > - boost_numpy27-mt boost_numpy27 \ > boost_numpy38-mt boost_numpy38 \ > boost_python27-mt boost_python27 \ > boost_python38-mt boost_python38 \ > @@ -82,8 +82,7 @@ MODULES=lang/python > MODPY_RUNDEP=No > > # extras needed until py2 support can be removed > -BUILD_DEPENDS+= math/py-numpy \ > - math/py-numpy,python3 \ > +BUILD_DEPENDS+= math/py-numpy,python3 \ > lang/python/${MODPY_DEFAULT_VERSION_3} > > LIB_DEPENDS= archivers/bzip2 \ > @@ -185,7 +184,10 @@ do-build: > # Second run of bootstrap/b2, setup for py2 environment: > sed 's;\(using python.*PYTHON_ROOT\).*;\1 : ${PY2_INC} \;;' \ > < ${WRKSRC}/bootstrap.sh > ${WRKSRC}/bootstrap.sh.tmp > - cd ${WRKSRC} && export ${MAKE_ENV} && \ > + # dummy numpy module that will fail autodetection > + mkdir -p ${WRKDIR}/dummy > + touch ${WRKDIR}/dummy/numpy.py > + cd ${WRKSRC} && export ${MAKE_ENV} PYTHONPATH="${WRKDIR}/dummy:" && \ > /bin/sh ./bootstrap.sh.tmp ${BOOTSTRAP} ${PY2_BOOTSTRAP} && \ > ./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_2} > > Index: pkg/PLIST-main > === > RCS file: /cvs/ports/devel/boost/pkg/PLIST-main,v > retrieving revision 1.10 > diff -u -p -r1.10 PLIST-main > --- pkg/PLIST-main5 Nov 2020 11:23:03 - 1.10 > +++ pkg/PLIST-main13 Nov 2020 16:38:52 - > @@ -15088,10 +15088,6 @@ include/boost/yap/yap.hpp > @lib lib/libboost_math_tr1l-mt.so.${LIBboost_math_tr1l-mt_VERSION} > @static-lib lib/libboost_math_tr1l.a > @lib lib/libboost_math_tr1l.so.${LIBboost_math_tr1l_VERSION} > -@static-lib lib/libboost_numpy27-mt.a > -@lib lib/libboost_numpy27-mt.so.${LIBboost_numpy27-mt_VERSION} > -@static-lib lib/libboost_numpy27.a > -@lib lib/libboost_numpy27.so.${LIBboost_numpy27_VERSION} > @static-lib lib/libboost_numpy38-mt.a > @lib lib/libboost_numpy38-mt.so.${LIBboost_numpy38-mt_VERSION} > @static-lib lib/libboost_numpy38.a > > -- > 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: d...@cvs.openbsd.org2020/11/13 16:31:37 Modified files: infrastructure/db: user.list Log message: Comment _wiresep net/wiresep has been removed in June after wg(4) arrival.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 16:25:38 Modified files: graphics/openimageio: Makefile Log message: remove stray \
retirement proposal: audio/zeya, py2 version of audio/py-tagpy
This web-based (HTML5) media player was added in 2011, has had one version update (also in 2011), the previous port maintainer doesn't respond any more, and upstream says Python 2.5+ (2.6+ recommended) Latest release: 0.6 17 September 2011 ..which isn't entirely ideal for network-facing software. Debian removed it from packaging in 2015 ("low popcon, dead upstream"). Also it's in the way of dropping py2 support from py-tagpy and in turn the frankenbuild of boost that pulls in both py2+py3 (at build and run time). Any OKs/objections to remove? Index: audio/Makefile === RCS file: /cvs/ports/audio/Makefile,v retrieving revision 1.440 diff -u -p -r1.440 Makefile --- audio/Makefile 31 Oct 2020 15:49:41 - 1.440 +++ audio/Makefile 13 Nov 2020 22:51:46 - @@ -203,7 +203,6 @@ SUBDIR += py-musicbrainzngs,python3 SUBDIR += py-mutagen,python3 SUBDIR += py-ogg - SUBDIR += py-tagpy SUBDIR += py-tagpy,python3 SUBDIR += py-vorbis SUBDIR += pykaraoke @@ -265,6 +264,5 @@ SUBDIR += xmp SUBDIR += ympd SUBDIR += yt-audio - SUBDIR += zeya .include Index: infrastructure/db/user.list === RCS file: /cvs/ports/infrastructure/db/user.list,v retrieving revision 1.377 diff -u -p -r1.377 user.list --- infrastructure/db/user.list 4 Nov 2020 19:15:30 - 1.377 +++ infrastructure/db/user.list 13 Nov 2020 22:51:46 - @@ -188,7 +188,7 @@ id usergroup port 677 _scamper _scampernet/scamper 678 _owampd_owampd net/owamp 679 _milter-checkrcpt _milter-checkrcpt mail/milter-checkrcpt -680 _zeya _zeya audio/zeya +#680 _zeya _zeya audio/zeya 681 _inadyn_inadyn net/inadyn 682 _backuppc _backuppc sysutils/backuppc 683 _pulse _pulse audio/pulseaudio Index: devel/quirks/Makefile === RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.1092 diff -u -p -r1.1092 Makefile --- devel/quirks/Makefile 13 Nov 2020 22:41:14 - 1.1092 +++ devel/quirks/Makefile 13 Nov 2020 22:51:46 - @@ -5,7 +5,7 @@ CATEGORIES =devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.484 +PKGNAME = quirks-3.485 PKG_ARCH = * MAINTAINER = Marc Espie Index: devel/quirks/files/Quirks.pm === RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1110 diff -u -p -r1.1110 Quirks.pm --- devel/quirks/files/Quirks.pm13 Nov 2020 22:41:14 - 1.1110 +++ devel/quirks/files/Quirks.pm13 Nov 2020 22:51:46 - @@ -508,6 +508,7 @@ my $stem_extensions = { 'py-enchant' => 'py3-enchant', 'py-sqlparse' => 'py3-sqlparse', 'py-sqlalchemy-migrate' => 'py3-sqlalchemy-migrate', + 'py-tagpy' => 'py3-tagpy', }; my $obsolete_reason = { @@ -1910,6 +1911,7 @@ my $obsolete_reason = { 'gnome-getting-started-docs' => 5, 'py-poppler' => 3, 'pdfshuffler' => 3, + 'zeya' => 3, }; # reasons for obsolete packages Index: audio/zeya/Makefile === RCS file: audio/zeya/Makefile diff -N audio/zeya/Makefile --- audio/zeya/Makefile 12 Jul 2019 20:43:42 - 1.12 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,57 +0,0 @@ -# $OpenBSD: Makefile,v 1.12 2019/07/12 20:43:42 sthen Exp $ - -COMMENT = html5-powered web music server - -MODPY_EGG_VERSION = 0.6 -DISTNAME = zeya_${MODPY_EGG_VERSION}.orig -PKGNAME = zeya-${MODPY_EGG_VERSION} -REVISION = 5 -CATEGORIES = audio www - -HOMEPAGE = http://web.psung.name/zeya/ - -MASTER_SITES = ${MASTER_SITE_DEBIAN:=main/z/zeya/} - -# AGPLv3 (GNU Affero Public License) -PERMIT_PACKAGE = Yes - -MODULES = lang/python - -RUN_DEPENDS = audio/faad \ - audio/flac \ - audio/mpg123 \ - audio/py-tagpy \ - audio/vorbis-tools \ - -MODPY_ADJ_FILES = zeya.py \ - zeyaclient.py \ - zeyatest.py - -ZEYA_MODULES = ${WRKBUILD}/backends.py \ - ${WRKBUILD}/common.py \ - ${WRKBUILD}/decoders.py \ - ${WRKBUILD}/directory.py \ - ${WRKBUILD}/m3u.py \ - ${WRKBUILD}/options.py \ - ${WRKBUILD}/pls.py \ - ${WRKBUILD}/rhythmbox.py - -NO_BUILD = Yes -NO_TEST = Yes -PKG_ARCH = * -WRKDIST = ${WRKDIR} - -do-install: - ${SUBST_CMD} ${WRKBUILD}/backends.py \ -
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 15:41:14 Modified files: databases : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm databases/py-sqlparse: Makefile distinfo databases/py-sqlparse/pkg: PLIST databases/py-sqlalchemy-migrate: Makefile databases/py-sqlalchemy-migrate/pkg: PLIST Log message: update py-sqlparse to 0.4.1, dropping py2 support. disable py2 for py-sqlalchemy-migrate. updated from a diff from wen heping.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 15:25:45 Modified files: games/vegastrike: Makefile.inc x11/ogre : Makefile Log message: mark vegastrike BROKEN-i386 to avoid packaging ~700MB of data/music/etc; -engine cannot build there because x11/ogre is BROKEN-i386. add comment to x11/ogre to reenable if unbreaking there.
Re: [New] sysutils/glances (Python)
On 2020/11/13 13:34, Ashton Fagg wrote: > "Dimitri Karamazov" writes: > > > I think this link is more fitting as a HOMEPAGE. > > Fixed. > > > Including the configuration will be better. > > > > This program doesn't pick up on the terminal background colors, the > > conf file might help with it, > > Fixed. > > > only nitpick after having a few glances, hehe ;-) > > Heyo! > > Updated tarball attached. Thanks for the review. > OpenBSD uses ${SYSCONFDIR} (typically /etc) not /usr/local/etc for config files, and they should be installed using @sample in PLIST so that local edits don't break updates. The web interface (glances -w) requires py3-bottle, it's a small enough dep so I think might as well just list in RUN_DEPENDS rather than write a note in DESCR or a pkg-readme that people will ignore anyway. I also fixed whitespace nits (mix of "=" and " =") and put RUN_DEPENDS in alpha order. It does do something odd with the naming of tmux processes though, just shows them as "default)", not a show stopper for important but might be worth poking at. This version is OK with me if someone wants to commit it.. glances.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 14:34:27 Modified files: sysutils/monit : Makefile distinfo sysutils/monit/patches: patch-Makefile_in sysutils/monit/pkg: PLIST Log message: update to monit-5.27.1, from maintainer Caspar Schutijser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 14:33:44 Modified files: security/hydra : Makefile distinfo security/hydra/patches: patch-configure patch-hydra-gtk_make_xhydra_sh security/hydra/pkg: PLIST-main Added files: security/hydra/patches: patch-Makefile_am Removed files: security/hydra/patches: patch-Makefile Log message: update to thc-hydra-9.1 - fixes ssh brute force (upstream commit a2de33fd2b, sebastia@ ran into the problem too and came up with the same [fix|workaround]) - add a few more protocols - remove bogus patch in a file that's regenerated during build, use PATCHORIG to avoid it recurring - use a whitelist rather than blacklist approach for patch-configure and avoid patching so many lines, to reduce conflict risk during updates - general port maintenance; use DEBUG_PACKAGES, don't unconditionally strip, convert gui-disabling PSEUDO_FLAVOR to use BUILD_PACKAGES, fix HOMEPAGE, etc. tested by sebastia@
Re: [New] devel/re2
On 2020/11/13 14:57, Ashton Fagg wrote: > Attached is a new port for re2 [1]. To quote the authors: > > "RE2 is a fast, safe, thread-friendly alternative to backtracking > regular expression engines like those used in PCRE, Perl, and Python. It > is a C++ library." > > NOTE: there are similarly named ports already, this is different software. > > Package builds and installs fine on amd64. The test suite is quite > lengthy. On my fairly modest test machine it takes about 30-45 mins or > so. With the default timeout settings, one of the tests does fail due to > time out (at least on my machine), but if you increase the time limit > it's fine. I've left them default here because I'm not sure what to do > about it. > > Feedback welcomed. > > Ash > > [1]: https://github.com/google/re2 > : CATEGORIES= devel textproc would be just fine and is less full than devel : GH_ACCOUNT= google : GH_PROJECT= re2 : GH_TAGNAME= 2020-11-01 : : # This is needed because otherwise the package build pukes due to it : # not understanding the versioning convention. : PKGNAME=re2-${GH_TAGNAME:S,-,,g} the comment isn't needed, this situation is explicitly called out in packages-specs(7) : : SHARED_LIBS=re2 0.0 : : MAINTAINER= Ashton Fagg : : # BSD : PERMIT_PACKAGE= Yes : : COMPILER= base-clang ports-gcc : MODULES=devel/cmake : : WANTLIB=${COMPILER_LIBCXX} m pthread please put wantlib in the standard place as in Makefile.template, when someone gets round to doing full wantlib syncs through the ports tree again it makes it easier to have that in the usual place : : CONFIGURE_ARGS+=-DBUILD_SHARED_LIBS=on : : .include : otherwise looks good.
Re: fix security/hydra ssh
Hi, Am Freitag, November 13, 2020 14:13 CET, schrieb Stuart Henderson : > On 2020/11/13 00:12, Sebastian Reitenbach wrote: > > Hi, > > > > trying Hydra to brute force SSH doesn't seem to work as it should. running > > with -v , it can successfully detect password logins work, but later on > > fails on each attempt, with 'Library not initialized.' error, so doesn't > > find valid credentials. > > > > attached patch fixes it for me, however, don't really know why it's needed. > > had to add ssh_init() before starting each new session. > > Looking at the docs, I believe it should not be necessary: > > https://api.libssh.org/stable/group__libssh.html#ga3ebf8d6920e563f3b032e3cd5277598e > > > > Also I might remember wrongly, but at some earlier point in time, SSH brute > > force did work. > > Applying same treatment to sshkey brute force, as from the code, seems to > > probably have same issue, but not tested. > > > > Anyone with a better idea, or OK? > > The same change was made to hydra-ssh.c upstream in 2018 ... > > https://github.com/vanhauser-thc/thc-hydra/commit/a2de33fd2bcd50fa876dcfd121740074fb1064d0 > https://github.com/vanhauser-thc/thc-hydra/issues/366 > https://github.com/vanhauser-thc/thc-hydra/pull/367 > > ... so it's probably better to first update the port. > > Can you give this a go instead? It updates, modernizes the port a bit, > adds a couple of other protocols, removes a bogus patch-Makefile and > sets PATCHORIG to avoid that happening again, and switches the configure > patch from "disable the protocols we don't want" to "whitelist the > protocols we do want" which simplifies the patch and makes it less > likely to conflict with future updates. Even better, and it fixes ssh bruteforcing for me. Haven't yet tested any other protocol. Sebastian > > Index: Makefile > === > RCS file: /cvs/ports/security/hydra/Makefile,v > retrieving revision 1.61 > diff -u -p -r1.61 Makefile > --- Makefile 12 Jul 2019 20:49:03 - 1.61 > +++ Makefile 13 Nov 2020 13:10:56 - > @@ -3,69 +3,69 @@ > COMMENT-main=parallelized network logon cracker > COMMENT-gui= GTK frontend for hydra > > -VERSION= 8.6 > +VERSION= 9.1 > PKGNAME-main=hydra-${VERSION} > PKGNAME-gui= hydra-gui-${VERSION} > -REVISION-main= 0 > > CATEGORIES= security > > GH_ACCOUNT = vanhauser-thc > GH_PROJECT = thc-hydra > -GH_TAGNAME = ${VERSION} > - > -HOMEPAGE=https://thc.org/thc-hydra/ > +GH_TAGNAME = v${VERSION} > > # AGPLv3 (GNU Affero Public License) > PERMIT_PACKAGE= Yes > > -WANTLIB= c z > +WANTLIB =c z > + > +WANTLIB-main = ${WANTLIB} crypto curses freerdp2 gcrypt idn m mariadb > +WANTLIB-main += memcached pcre pq ssh ssl winpr2 > + > +WANTLIB-gui =${WANTLIB} > +WANTLIB-gui += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama > +WANTLIB-gui += Xrandr Xrender atk-1.0 cairo fontconfig freetype > gdk-x11-2.0 > +WANTLIB-gui += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 > +WANTLIB-gui += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 harfbuzz > > -PSEUDO_FLAVORS= no_x11 > +PSEUDO_FLAVORS= no_gui > FLAVOR?= > > -MULTI_PACKAGES= -main > +MULTI_PACKAGES= -main -gui > > CONFIGURE_STYLE=gnu > > -USE_GMAKE= Yes > +USE_GMAKE= Yes > NO_TEST= Yes > -MAKE_FLAGS= CC=${CC} > +MAKE_FLAGS= CC="${CC}" > +PATCHORIG= .orig.port > > -CONFIGURE_ARGS = --with-ssl=prefix="/usr/include" \ > - --with-ssl-lib=prefix="/usr/lib" \ > - --prefix=${LOCALBASE} > - > -.if ${FLAVOR:Mno_x11} > -ALL_TARGET= hydra pw-inspector > -.else > -MULTI_PACKAGES+=-gui > -ALL_TARGET= all > -.endif > +CONFIGURE_ARGS= --nostrip \ > + --with-ssl=prefix="/usr/include" \ > + --with-ssl-lib=prefix="/usr/lib" \ > + --prefix=${LOCALBASE} > > LIB_DEPENDS-main=databases/mariadb,-main \ > databases/postgresql,-main \ > devel/libidn \ > + devel/libmemcached \ > devel/pcre \ > security/libgcrypt \ > - security/libssh > -RUN_DEPENDS-main= > - > -WANTLIB-main=${WANTLIB} m crypto curses gcrypt idn mysqlclient pcre > pq ssh ssl > + security/libssh \ > + x11/freerdp > > LIB_DEPENDS-gui=x11/gtk+2 > - > RUN_DEPENDS-gui=${BASE_PKGPATH},-main > +DEBUG_PACKAGES= ${BUILD_PACKAGES} > + > +.include > > -WANTLIB-gui += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama > -WANTLIB-gui += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0 > -WANTLIB-gui += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 > -WANTLIB-gui += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 ${WANTLIB} > +.if !${BUILD_PACKAGES:M-gui} > +ALL_TARGET= hydra pw-inspector > +.endif > > post-install: > ${INSTALL_DATA_DIR}
Re: [New] devel/re2
пт, 13 нояб. 2020 г. в 22:58, Ashton Fagg : > > Attached is a new port for re2 [1]. To quote the authors: > > "RE2 is a fast, safe, thread-friendly alternative to backtracking > regular expression engines like those used in PCRE, Perl, and Python. It > is a C++ library." > > NOTE: there are similarly named ports already, this is different software. > > Package builds and installs fine on amd64. The test suite is quite > lengthy. On my fairly modest test machine it takes about 30-45 mins or > so. With the default timeout settings, one of the tests does fail due to > time out (at least on my machine), but if you increase the time limit > it's fine. I've left them default here because I'm not sure what to do > about it. > > Feedback welcomed. This is almost identical to the port I've recently added in openbsd-wip as a part of some ongoing work, so you have my okay here. :) -- WBR, Vadim Zhukov
[New] devel/re2
Attached is a new port for re2 [1]. To quote the authors: "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library." NOTE: there are similarly named ports already, this is different software. Package builds and installs fine on amd64. The test suite is quite lengthy. On my fairly modest test machine it takes about 30-45 mins or so. With the default timeout settings, one of the tests does fail due to time out (at least on my machine), but if you increase the time limit it's fine. I've left them default here because I'm not sure what to do about it. Feedback welcomed. Ash [1]: https://github.com/google/re2 re2.tgz Description: Binary data
[Update] x11/xbindkeys: 1.8.6 -> 1.8.7
Attached is a patch to update x11/xbindkeys from 1.8.6 to 1.8.7. showvictims.py reports no victimized ports. make configure, make build, make fake, make install, make deinstall and make package are all working as expected on amd64. The port contains no tests from upstream. Relevant changelog can be viewed here at [1]. "Version 1.8.7: Bugfix: Prevent scheme functions to be garbage collected (Thanks Jason Miller)" Thanks, Ash [1]: https://www.nongnu.org/xbindkeys/ diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile index 948ef7f..9767879 100644 --- a/x11/xbindkeys/Makefile +++ b/x11/xbindkeys/Makefile @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.22 2019/07/12 20:51:25 sthen Exp $ COMMENT = bind keys or mouse buttons to shell commands under X11 -DISTNAME = xbindkeys-1.8.6 +DISTNAME = xbindkeys-1.8.7 CATEGORIES = x11 REVISION = 0 diff --git a/x11/xbindkeys/distinfo b/x11/xbindkeys/distinfo index 44be864..e52886f 100644 --- a/x11/xbindkeys/distinfo +++ b/x11/xbindkeys/distinfo @@ -1,2 +1,2 @@ -SHA256 (xbindkeys-1.8.6.tar.gz) = bA0Yvhn8GaubRZXt86I8CmlGyKXrXBvDlUccj5pxDRg= -SIZE (xbindkeys-1.8.6.tar.gz) = 151941 +SHA256 (xbindkeys-1.8.7.tar.gz) = opuGqOyR1KvIO0IOVH2idHCEfQ7+gIqm51FHqgrbgvI= +SIZE (xbindkeys-1.8.7.tar.gz) = 177532
Re: upcoming textproc/groff-1.23.0
Hi Ingo, On Fri, Nov 13, 2020 at 08:14:55PM +0100, Ingo Schwarze wrote: > -DISTNAME = groff-${VERSION} > -REVISION = 4 > +DISTNAME = groff-${VERSION}.rc1 > +PKGNAME =groff-${VERSION} I think you could set: PKGNAME = groff-${VERSION}rc1 That would allow upgrade the package naturally later, when final release is commited to the ports tree.
Re: UPDATE: sysutils/monit 5.27.1
On Thu, Nov 12, 2020 at 08:43:29PM +, Stuart Henderson wrote: > On 2020/11/12 19:42, Caspar Schutijser wrote: > > - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit > .. > > share/doc/monit/ > > -share/doc/monit/README > > ${PREFIX}/share/doc/monit/ isn't doing anything useful any more Thanks, good point! Fixed. > > -Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279) > > +Using $< in a non-suffix rule context is a GNUmake idiom. > > + > > +Using the "define" directive is a GNUmake idiom. > > I think this is ok though it would probably be better to switch to > USE_GMAKE if it gets much more complex than this. I was thinking/doubting about that as well. I'll indeed to that if more patching is required in a next version. An updated diff follows. Caspar Index: Makefile === RCS file: /cvs/ports/sysutils/monit/Makefile,v retrieving revision 1.64 diff -u -p -r1.64 Makefile --- Makefile14 Sep 2019 21:18:18 - 1.64 +++ Makefile13 Nov 2020 19:00:13 - @@ -2,7 +2,7 @@ COMMENT= monitoring and managing daemons utility -DISTNAME= monit-5.26.0 +DISTNAME= monit-5.27.1 CATEGORIES=sysutils @@ -19,6 +19,9 @@ MASTER_SITES= ${HOMEPAGE}/dist/ CONFIGURE_STYLE=gnu +# Must specify C99 for base-gcc +CFLAGS+= -std=c99 + SUBST_VARS=LOCALSTATEDIR pre-configure: @@ -26,7 +29,6 @@ pre-configure: post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/monit - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit ${INSTALL_DATA} ${WRKSRC}/monitrc ${PREFIX}/share/examples/monit .include Index: distinfo === RCS file: /cvs/ports/sysutils/monit/distinfo,v retrieving revision 1.42 diff -u -p -r1.42 distinfo --- distinfo14 Sep 2019 21:18:18 - 1.42 +++ distinfo13 Nov 2020 19:00:13 - @@ -1,2 +1,2 @@ -SHA256 (monit-5.26.0.tar.gz) = h/xFaKOvmivokEDvsWnjouR7Ji+Z541d3emd2J8C88I= -SIZE (monit-5.26.0.tar.gz) = 1371327 +SHA256 (monit-5.27.1.tar.gz) = 9XQI0WGFaHUTo8TrPyu3Lu92MxrBYhDpZS6EblyE7VE= +SIZE (monit-5.27.1.tar.gz) = 1459360 Index: patches/patch-Makefile_in === RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-Makefile_in --- patches/patch-Makefile_in 14 Sep 2019 21:18:18 - 1.4 +++ patches/patch-Makefile_in 13 Nov 2020 19:00:13 - @@ -1,12 +1,26 @@ $OpenBSD: patch-Makefile_in,v 1.4 2019/09/14 21:18:18 sthen Exp $ -Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279) +Using $< in a non-suffix rule context is a GNUmake idiom. + +Using the "define" directive is a GNUmake idiom. Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -1297,7 +1297,7 @@ cleanall: clean distclean - -rm -rf m4 config +@@ -1292,11 +1292,6 @@ uninstall-man: uninstall-man1 + .PRECIOUS: Makefile + + +-define check-exit +-|| exit 1 +- +-endef +- + # --- + # Targets + # --- +@@ -1331,7 +1326,7 @@ cleanall: clean distclean + -git clean -fxd monit.1: doc/monit.pod - $(POD2MAN) $(POD2MANFLAGS) $< > $@ @@ -14,3 +28,21 @@ Index: Makefile.in -rm -f pod2* # - +@@ -1342,14 +1337,14 @@ src/y.tab.c src/y.tab.h: run-yacc + + .INTERMEDIATE: run-yacc + run-yacc: src/p.y +- $(YACC) $(YACCFLAGS) -o src/y.tab.c $< ++ $(YACC) $(YACCFLAGS) -o src/y.tab.c src/p.y + + src/lex.yy.c: src/l.l +- $(FLEX) $(FLEXFLAGS) -o$@ $< ++ $(FLEX) $(FLEXFLAGS) -o$@ src/l.l + @WITH_CODESIGN_TRUE@all-local: $(bin_PROGRAMS) + @WITH_CODESIGN_TRUE@ $(foreach file, $(bin_PROGRAMS), \ + @WITH_CODESIGN_TRUE@codesign -s $(CODESIGN_IDENTITY) -v --deep --timestamp --options runtime $(file) \ +-@WITH_CODESIGN_TRUE@$(check-exit)) ++@WITH_CODESIGN_TRUE@|| exit 1) + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Index: pkg/PLIST === RCS file: /cvs/ports/sysutils/monit/pkg/PLIST,v retrieving revision 1.11 diff -u -p -r1.11 PLIST --- pkg/PLIST 1 May 2019 19:21:57 - 1.11 +++ pkg/PLIST 13 Nov 2020 19:00:13 - @@ -2,8 +2,6 @@ @rcscript ${RCDIR}/monit @bin bin/monit @man man/man1/monit.1 -share/doc/monit/ -share/doc/monit/README share/examples/monit/ share/examples/monit/monitrc @mode 0600
UPDATE: Tor Browser 10.0.4
Hi, The diff below updates Tor Browser to 10.0.4 (10.0.3 was an Android-only release so I didn't send a diff for that version). Tested on amd64. More information: https://blog.torproject.org/new-release-tor-browser-1004 This diff also includes the removal of tb-https-everywhere (discussed earlier in this thread). I hope that part of the diff is correct. Thanks, Caspar Schutijser Index: meta/tor-browser/Makefile === RCS file: /cvs/ports/meta/tor-browser/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- meta/tor-browser/Makefile 23 Oct 2020 07:04:09 - 1.30 +++ meta/tor-browser/Makefile 13 Nov 2020 19:16:55 - @@ -4,11 +4,11 @@ COMMENT= Tor Browser meta package MAINTAINER=Caspar Schutijser -PKGNAME= tor-browser-10.0.2 +PKGNAME= tor-browser-10.0.4 ONLY_FOR_ARCHS = amd64 i386 -RUN_DEPENDS= www/tor-browser/browser>=10.0.2 \ - www/tor-browser/noscript>=11.1.3 \ +RUN_DEPENDS= www/tor-browser/browser>=10.0.4 \ + www/tor-browser/noscript>=11.1.5 \ net/tor>=0.4.3.6 .include Index: www/tor-browser/Makefile.inc === RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v retrieving revision 1.30 diff -u -p -r1.30 Makefile.inc --- www/tor-browser/Makefile.inc23 Oct 2020 07:04:09 - 1.30 +++ www/tor-browser/Makefile.inc13 Nov 2020 19:16:55 - @@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org PERMIT_PACKAGE ?= Yes CATEGORIES = www BROWSER_NAME = tor-browser -TB_VERSION = 10.0.2 +TB_VERSION = 10.0.4 TB_PREFIX =tb SUBST_VARS += BROWSER_NAME TB_VERSION Index: www/tor-browser/browser/Makefile === RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v retrieving revision 1.50 diff -u -p -r1.50 Makefile --- www/tor-browser/browser/Makefile23 Oct 2020 07:04:09 - 1.50 +++ www/tor-browser/browser/Makefile13 Nov 2020 19:16:55 - @@ -16,7 +16,7 @@ EXTRACT_SUFX =.tar.xz PATCHORIG =.pat.orig PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION} -DISTNAME = src-firefox-tor-browser-78.4.0esr-10.0-2-build2 +DISTNAME = src-firefox-tor-browser-78.4.0esr-10.0-2-build3 FIX_EXTRACT_PERMISSIONS= Yes EXTRACT_ONLY +=${DISTNAME}.tar.xz \ Index: www/tor-browser/browser/distinfo === RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v retrieving revision 1.29 diff -u -p -r1.29 distinfo --- www/tor-browser/browser/distinfo23 Oct 2020 07:04:09 - 1.29 +++ www/tor-browser/browser/distinfo13 Nov 2020 19:16:55 - @@ -1,8 +1,8 @@ SHA256 (mozilla/https-everywhere-2020.8.13-eff.xpi) = e1XWrqP5HNCK5Hp5VDDX2SXwHiNsgfsLNyqxu1NrTeU= -SHA256 (mozilla/src-firefox-tor-browser-78.4.0esr-10.0-2-build2.tar.xz) = sVMENAJKRprtDeWWQMb6ljdxGmI3PXBq92DIgmBigoo= +SHA256 (mozilla/src-firefox-tor-browser-78.4.0esr-10.0-2-build3.tar.xz) = jipis6L07HhZQwRqpNO7TNU2uABAc3/9e8vR/mz5UXE= SHA256 (mozilla/src-tor-launcher-0.2.26.tar.xz) = JNovULiGxs68qC1A5c4zKaZHGGGlpj9ohKT8nQFKmNU= -SHA256 (mozilla/tor-browser-linux64-10.0.2_en-US.tar.xz) = JBJDMC44VSh1ekXPxsVvFk5nOB8Ro4UGtD32pG1weP8= +SHA256 (mozilla/tor-browser-linux64-10.0.4_en-US.tar.xz) = 2Ye1+mhFnkZnAYQXgKZ5YIOiIVaiunTCyCOM+ZExw2I= SIZE (mozilla/https-everywhere-2020.8.13-eff.xpi) = 1766618 -SIZE (mozilla/src-firefox-tor-browser-78.4.0esr-10.0-2-build2.tar.xz) = 364731008 +SIZE (mozilla/src-firefox-tor-browser-78.4.0esr-10.0-2-build3.tar.xz) = 364750652 SIZE (mozilla/src-tor-launcher-0.2.26.tar.xz) = 217792 -SIZE (mozilla/tor-browser-linux64-10.0.2_en-US.tar.xz) = 85903736 +SIZE (mozilla/tor-browser-linux64-10.0.4_en-US.tar.xz) = 85915308 Index: www/tor-browser/browser/pkg/PLIST === RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- www/tor-browser/browser/pkg/PLIST 23 Oct 2020 07:04:09 - 1.9 +++ www/tor-browser/browser/pkg/PLIST 13 Nov 2020 19:16:57 - @@ -1,6 +1,7 @@ @comment $OpenBSD: PLIST,v 1.9 2020/10/23 07:04:09 landry Exp $ @conflict tor-launcher-* @conflict torbutton-* +@pkgpath www/tor-browser/https-everywhere @pkgpath www/tor-browser/tor-launcher @pkgpath www/tor-browser/torbutton bin/${BROWSER_NAME} Index: www/tor-browser/https-everywhere/Makefile === RCS file: www/tor-browser/https-everywhere/Makefile diff -N www/tor-browser/https-everywhere/Makefile --- www/tor-browser/https-everywhere/Makefile 26 Aug 2020 07:37:39 - 1.20 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13
upcoming textproc/groff-1.23.0
Hi, Bertrand Garrigues put up a release candidate for the upcoming groff-1.23.0 release. Here is an update of our textproc/groff port NOT INTENDED FOR COMMIT. Before commit, i will wait for the official release. But i'm sending this out early such that people who like to can test for regressions, hoping to still get them fixed before release if we find any. Testing is very welcome, and so are opinions on the paradigmatic change discussed below. Our groff port has long been focussed on formatting manual pages. About a decade ago, more than 3000 ports used it for that purpose. Of these, less than 30 remain because mandoc can now cope with 99% of ports manual pages. For that reason, time might be ripe to switch focus of the port: away from being predominantly a manual page formatter and adapting it better to general purpose typesetting. There is another reason why now is a good time to switch priorities. Upstream has been doing lots of work on documentation, and in that context, they decided to use newer makeinfo(1) features that our ancient /usr/bin/makeinfo does not support. The natural consequence is to make groff depend on the print/texinfo port and use the newer gmakeinfo(1) version contained in that port to format the groff documentation. (Yes, the irony that groff does *not* use roff for its own documentation but instead uses TeX is not lost on me.) Now, print/texinfo isn't exactly a lean port. Here is its list of dependencies according to "make full-all-depends": docbook-dsssl-1.79 metaauto-1.0p4 xz-5.2.5 help2man-1.47.16 autoconf-2.69p3 libb2-0.98.1v0 automake-1.14.1p1 automake-1.15.1 automake-1.16.2 autoconf-2.67p1 libltdl-2.4.2p1 libtool-2.4.2p0 autoconf-2.63p1 gpatch-2.7.6p0 re2c-2.0.3 dvi2tty-5.3.1p0 p5-IPC-Run3-0.048p0 ffcall-1.10p5 libiconv-1.16p0 libunistring-0.9.7 libidn2-2.3.0p0 lzo2-2.10p2 unzip-6.0p13 iso8879-1986p1 yasm-1.3.0p1 ghostscript-fonts-8.11p3 tcl-8.5.19p4 tk-8.5.19p1 t1utils-1.41p0 sqlite2mdoc-0.1.4 sqlite3-3.31.1p0 p5-XML-Parser-2.44p0 xmltoman-0.4 zip-3.0p1 pcre-8.41p2 lunzip-1.11 ijs-0.35p3 libsigsegv-2.12 m4-1.4.18p1 db-4.6.21p7v0 dwz-0.13p0 gettext-runtime-0.21p0 gmake-4.3 lz4-1.9.2p0 libpaper-1.1.28 icu4c-67.1 gdbm-1.18.1p0 ggrep-3.4 zstd-1.4.5p0 bash-5.0.18 gmp-6.2.0 libnettle-3.6 gmp-6.2.0 mpfr-4.0.2.1 gawk-5.1.0 bzip2-1.0.8p0 clisp-2.49p5 libarchive-3.4.3 gtar-1.32p1 libgpg-error-1.39 libgcrypt-1.8.6 lynx-2.8.9rel1p0 zziplib-0.13.62p1 libusb1-1.0.23p2 detex-2.8.1 libtextstyle-0.21p0 gettext-tools-0.21p0 intltool-0.51.0p2 gnugetopt-1.1.6p2 bison-3.3.2p2 png-1.6.37 libffi-3.3 python-3.8.6 py3-setuptools-41.6.0p0v0 py3-tz-2020.1p0 py3-babel-2.8.0p0 py3-six-1.13.0p1 py3-imagesize-1.1.0p2 py3-alabaster-0.7.10p2 py3-pygments-2.5.2p0 py3-docutils-0.12p3 py3-sphinx_rtd_theme-0.2.4p2 py3-setuptools-git-1.2p1 py3-cython-0.29.21 py3-stemmer-1.3.0p5 py3-snowballstemmer-1.2.1p3 py3-MarkupSafe-1.1.1p0 py3-jinja2-2.11.2p1 py3-sphinx-1.4.8p4 py3-markdown-2.6.11p3 py3-cryptodome-3.9.8 py3-beaker-1.10.0p1 py3-mako-1.1.1p0 libxml-2.9.10p2 docbook-4.5p3 libxslt-1.1.34p0 docbook-xsl-1.68.1p7 xmlto-0.0.28p0 giflib-5.1.6 dbus-1.12.20v0 dbus-1.12.20v0 dbus-daemon-launch-helper-1.12.20 python-2.7.18p0 py-setuptools-41.6.0p0v0 py-tz-2020.1p0 py-babel-2.8.0p0 py-six-1.13.0p1 py-imagesize-1.1.0p2 py-alabaster-0.7.10p2 py-pygments-2.5.2p0 py-docutils-0.12p3 py-sphinx_rtd_theme-0.2.4p2 py-setuptools-git-1.2p1 py-cython-0.29.21 py-stemmer-1.3.0p5 py-snowballstemmer-1.2.1p3 py-MarkupSafe-1.1.1p0 py-jinja2-2.11.2p1 py-sphinx-1.4.8p4 libuv-1.30.1 ninja-1.10.1 meson-0.55.3v0 jsoncpp-1.8.4p2 glib2-2.64.6 cairo-1.16.0 gobject-introspection-1.64.1p0 desktop-file-utils-0.26 jbig2dec-0.11 nghttp2-1.41.0p1 curl-7.72.0 rhash-1.4.0 cmake-3.17.2p1v0 jpeg-2.0.5v0 tiff-4.1.0 libwebp-1.1.0 gd-2.3.0p0 lcms2-2.9p0 graphite2-1.3.14 harfbuzz-2.7.2 cmocka-1.1.3 libevent-2.1.11 libunbound-1.12.0 libtasn1-4.16.0 p11-kit-0.23.21 gnutls-3.6.15 libdaemon-0.14p1 avahi-0.8p0 cups-libs-2.3.3 ghostscript-9.07p7 texlive_mktexlsr-2020p0 lcdf-typetools-2.108 texlive_texmf-buildset-2020p0 ps2eps-1.68p0 psutils-2.03p1 texlive_synctex-2020p0 texlive_base-2020p0 So, given that groff needs to depend on all that crap anyway, adding a few lighter dependencies in addition that are actually useful for real-world typesetting tasks sounds like a no-brainer. And bingo, with that, we have a completely new role for the port: No longer a small thing to be built at the beginning of a bulk and to be used by most of the rest of the world for USE_GROFF, but a medium-sized pig now to be built somewhere in the middle, among all those other fat ports pigs... Changes in detail, ordered as in the Makefile: * The X11 libraries are only used by gxditview(1) and xtotroff(1). Those programs have long been part of the groff package upstream, but we used to exclude them to keep the port lean. * Upstream uses the iconv and uchardet libraries in preconv(1),
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/11/13 12:00:11 Modified files: databases/postgresql: Makefile distinfo databases/postgresql/pkg: PLIST-docs Log message: Security update to 12.5 ok danj@ jeremy@
Re: [New] sysutils/glances (Python)
"Dimitri Karamazov" writes: > I think this link is more fitting as a HOMEPAGE. Fixed. > Including the configuration will be better. > > This program doesn't pick up on the terminal background colors, the > conf file might help with it, Fixed. > only nitpick after having a few glances, hehe ;-) Heyo! Updated tarball attached. Thanks for the review. glances.tgz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/13 10:41:39 Modified files: graphics/gdk-pixbuf-xlib: Makefile distinfo graphics/gdk-pixbuf-xlib/pkg: PLIST Log message: Update to gdk-pixbuf-xlib-2.40.2.
subscribe
.
subscrible
Re: [update patch] tor 0.4.3.6 -> 0.4.4.5 (now 0.4.4.6)
On Fri, November 13, 2020 07:27, Martin Ziemer wrote: > On Fri, Nov 13, 2020 at 04:27:34AM -, Dimitri Karamazov wrote: > >> On Fri, November 13, 2020 04:25, Martin Ziemer wrote: >> >>> This patch updates tor from 0.4.3.6 to 0.4.4.5. >>> >> The latest release is 0.4.4.6. >> > You are right. I updated the port at monday on my first system and > even checked yesterday morning. -- The new version came later, ... > > Updated the patch now to 0.4.4.6. > > > Tested on two amd64 systems by browsing and using hidden service on > one by the other. > > Works fine for me on amd64 > Index: Makefile > === > RCS file: /cvs/ports/net/tor/Makefile,v > retrieving revision 1.130 diff -u -p -r1.130 Makefile --- Makefile19 Jul > 2020 17:01:55 - 1.130 > +++ Makefile 13 Nov 2020 06:55:34 - > @@ -2,7 +2,7 @@ > > > COMMENT= anonymity service using onion routing > > > -DISTNAME=tor-0.4.3.6 > +DISTNAME=tor-0.4.4.6 > CATEGORIES= net > HOMEPAGE= https://www.torproject.org/ > > > Index: distinfo > === > RCS file: /cvs/ports/net/tor/distinfo,v > retrieving revision 1.107 diff -u -p -r1.107 distinfo --- distinfo19 Jul > 2020 17:01:56 - 1.107 > +++ distinfo 13 Nov 2020 06:55:34 - > @@ -1,2 +1,2 @@ > -SHA256 (tor-0.4.3.6.tar.gz) = ai0GN9TlFL4uxXRyOgUGUkXM5R2niiHOwdyDG+XMrGI= > -SIZE (tor-0.4.3.6.tar.gz) = 7745954 > +SHA256 (tor-0.4.4.6.tar.gz) = XxVMFVgDrfXInofKtTAXtpCMXr5Qxlg56M9PvSq+H9w= > +SIZE (tor-0.4.4.6.tar.gz) = 7806477 > >
Re: CVS: cvs.openbsd.org: ports
On 2020/11/13 10:22, Stuart Henderson wrote: > CVSROOT: /cvs > Module name: ports > Changes by: st...@cvs.openbsd.org 2020/11/13 10:22:44 > > Modified files: > databases/mariadb: Makefile distinfo > > Log message: > databases/mariadb: update to 10.5.7, from Brad (maintainer) typo, 10.5.8 > Out-of-cycle release to fix regressions in MariaDB 10.5.7 > > Follow up to MDEV-19838 to alter protocol checks to support the > following implementations (which add garbage to the end of some > packets): > > mysqlnd (from PHP < 7.3) (MDEV-24121) > mysql-connector-python (all versions) (MDEV-24134) > and mysql-connector-java (all versions) >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 10:25:00 Modified files: databases/mariadb: Tag: OPENBSD_6_8 Makefile databases/mariadb/patches: Tag: OPENBSD_6_8 patch-unittest_mysys_stacktrace-t_c Removed files: databases/mariadb/patches: Tag: OPENBSD_6_8 patch-client_mysqladmin_cc patch-man_mysqladmin_1 patch-storage_connect_reldef_cpp patch-storage_oqgraph_CMakeLists_txt Log message: databases/mariadb: update to 10.5.8, from Brad (maintainer) Out-of-cycle release to fix regressions in MariaDB 10.5.7 Follow up to MDEV-19838 to alter protocol checks to support the following implementations (which add garbage to the end of some packets): mysqlnd (from PHP < 7.3) (MDEV-24121) mysql-connector-python (all versions) (MDEV-24134) and mysql-connector-java (all versions)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 10:22:44 Modified files: databases/mariadb: Makefile distinfo Log message: databases/mariadb: update to 10.5.7, from Brad (maintainer) Out-of-cycle release to fix regressions in MariaDB 10.5.7 Follow up to MDEV-19838 to alter protocol checks to support the following implementations (which add garbage to the end of some packets): mysqlnd (from PHP < 7.3) (MDEV-24121) mysql-connector-python (all versions) (MDEV-24134) and mysql-connector-java (all versions)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/11/13 10:18:56 Modified files: graphics/graphene: Makefile Log message: Tell non-base-clang arches to use ports-gcc. Fixes a "redeclaration of __errno" error and allows it to build on sparc64. ok aja
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 10:18:20 Modified files: databases/mariadb: Makefile Removed files: databases/mariadb/patches: patch-storage_connect_reldef_cpp patch-storage_oqgraph_CMakeLists_txt Log message: databases/mariadb: Replace a hack to disable OQGraph with PLUGIN_OQGRAPH=NO and remove some bits that are no longer necessary. >From Brad (maintainer).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 10:16:05 Modified files: lang/gcc/8 : Makefile Log message: lang/gcc/8: use gas 2.31.1 from ports on amd64/i386 as well (already used on aarch64/arm). The compiler emits opcodes in some cases which are not supported by gas 2.17 in base. From Brad, maintainer timeout.
Re: [base-gcc/sparc64] Fix graphics/graphene build
Ok — Antoine > On 13 Nov 2020, at 17:18, Kurt Mosiejczuk wrote: > > In file included from /usr/local/include/glib-2.0/glib/gtestutils.h:30, > from /usr/local/include/glib-2.0/glib.h:85, > from /usr/local/include/glib-2.0/gobject/gbinding.h:28, > from /usr/local/include/glib-2.0/glib-object.h:22, > from ../graphene-1.10.2/include/graphene-gobject.h:28, > from ../graphene-1.10.2/src/graphene-gobject.c:105: > /usr/include/errno.h:54: error: redundant redeclaration of '__errno' > /usr/include/signal.h:72: warning: previous declaration of '__errno' was here > > Moving it to use COMPILER=base-clang ports-gcc fixes it. > > ok? > > (cc maintainer) > > --Kurt > > Index: Makefile > === > RCS file: /cvs/ports/graphics/graphene/Makefile,v > retrieving revision 1.13 > diff -u -r1.13 Makefile > --- Makefile24 Jun 2020 16:52:17 -1.13 > +++ Makefile13 Nov 2020 15:53:12 - > @@ -21,6 +21,8 @@ > MODULES=devel/meson \ >x11/gnome > > +COMPILER=base-clang ports-gcc > + > MODGNOME_TOOLS=gobject-introspection > > LIB_DEPENDS=devel/glib2 >
Re: Update: audio/puddletag-2.0.1
On 2020/11/12 06:41, Rafael Sadowski wrote: > On Fri Oct 23, 2020 at 09:10:49PM +0200, Rafael Sadowski wrote: > > On Wed Sep 16, 2020 at 09:46:45PM +0100, Stuart Henderson wrote: > > > On 2020/09/16 22:39, Rafael Sadowski wrote: > > > > On Wed Sep 16, 2020 at 09:10:16PM +0100, Stuart Henderson wrote: > > > > > > > > > > > > Does anyone want to leave an OK? > > > > > > > > > > Surely the rabbit hole needs following otherwise the update breaks > > > > > working functionality? > > > > > > > > No, that has never worked before. See: > > > > > > > > $ puddletag > > > > puddletag Version: 1.2.0 > > > > Locale: en_US > > > > Object::disconnect: Unexpected null parameter > > > > Error loading quodlibetlib: No module named quodlibet.config > > > > > > > > This is about my initial DESCR upgrade: > > > > > > > > > > > > > +Doing web lookups > > > > > > > > > +using Amazon (including cover art), Discogs (does cover art > > > > > > > > > too!), FreeDB and > > > > > > > > > +MusicBrainz is also supported. > > > > > > > > I took that out again, because it has never worked before. > > > > > > No idea about using it with quodlibet but it used to do ID-based > > > tagging using chromaprint if you installed the relevant package. > > > Not sure if that is still working with what's in-tree - I can't > > > test now (I won't run X on my workstation until I have time to do an > > > install on a separate HD to test with, the filesystem corruption > > > from the hangs was getting too much). > > > > > > > If you describe to me how I can test it, I can do it for you/us. For me > > the updated version behaves like the in-tree version. > > > > Rafael > > > > Friendly reminder. pkg_add chromaprint puddletag puddletag & Windows / tick "Tag sources" Open a dir containing an album Select all files in the album In the "Tag sources" window set source to AcoustID Click the Search button This works in 1.2.0, and fails like so in 2.0.1: Traceback (most recent call last): File "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/acoust_id.py", line 108, in fingerprint_file return acoustid._fingerprint_file_fpcalc(fn, 120) File "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/_acoustid.py", line 299, in _fingerprint_file_fpcalc parts = line.split('=', 1) TypeError: a bytes-like object is required, not 'str' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/usr/local/lib/python3.8/site-packages/puddlestuff/webdb.py", line 866, in search return tag_source_search(self.curSource, group, files) File "/usr/local/lib/python3.8/site-packages/puddlestuff/webdb.py", line 557, in tag_source_search albums = ts.search(primary, group[primary]) File "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/acoust_id.py", line 314, in search data, fp = match("gT8GJxhO", fn.filepath, fp, dur) File "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/acoust_id.py", line 135, in match dur, fp = fingerprint_file(path) File "/usr/local/lib/python3.8/site-packages/puddlestuff/tagsources/acoust_id.py", line 110, in fingerprint_file return acoustid._fingerprint_file_fpcalc(fn) TypeError: _fingerprint_file_fpcalc() missing 1 required positional argument: 'maxlength'
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2020/11/13 09:52:39 Modified files: net/p5-Net-Whois-Raw: Makefile distinfo Log message: update to 2.99031 fixes .in and .mx whois servers
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2020/11/13 09:43:50 Modified files: devel/p5-Log-Any: Makefile distinfo Log message: update to 1.708
Re: devel/boost: drop python2 support and speed up make fake
On Fri, Nov 13 2020, Stuart Henderson wrote: > On 2020/11/08 01:46, Jeremie Courreges-Anglas wrote: >> >> This diff drops boost_python27 and boost_numpy27. > > Dropping boost_python27* needs work first; That is correct, I had a draft mail about it but ENOTIME. tl;dr my grep-fu failed me, sorry folks. This is what I came up with to disable just boost_numpy27. A bit hackish but seems to work fine. Index: Makefile === RCS file: /cvs/ports/devel/boost/Makefile,v retrieving revision 1.102 diff -u -p -r1.102 Makefile --- Makefile11 Nov 2020 15:53:41 - 1.102 +++ Makefile13 Nov 2020 16:38:52 - @@ -6,6 +6,7 @@ COMMENT-main= free peer-reviewed portabl COMMENT-md=machine-dependent libraries for boost VERSION= 1.70.0 +REVISION-main= 0 DISTNAME= boost_${VERSION:S/./_/g} PKGNAME-main= boost-${VERSION} PKGNAME-md=boost-md-${VERSION} @@ -33,7 +34,6 @@ BOOST_LIBS= boost_atomic-mt \ boost_math_tr1l-mt boost_math_tr1l \ boost_prg_exec_monitor-mt boost_prg_exec_monitor \ boost_program_options-mt boost_program_options \ - boost_numpy27-mt boost_numpy27 \ boost_numpy38-mt boost_numpy38 \ boost_python27-mt boost_python27 \ boost_python38-mt boost_python38 \ @@ -82,8 +82,7 @@ MODULES= lang/python MODPY_RUNDEP= No # extras needed until py2 support can be removed -BUILD_DEPENDS+=math/py-numpy \ - math/py-numpy,python3 \ +BUILD_DEPENDS+=math/py-numpy,python3 \ lang/python/${MODPY_DEFAULT_VERSION_3} LIB_DEPENDS= archivers/bzip2 \ @@ -185,7 +184,10 @@ do-build: # Second run of bootstrap/b2, setup for py2 environment: sed 's;\(using python.*PYTHON_ROOT\).*;\1 : ${PY2_INC} \;;' \ < ${WRKSRC}/bootstrap.sh > ${WRKSRC}/bootstrap.sh.tmp - cd ${WRKSRC} && export ${MAKE_ENV} && \ +# dummy numpy module that will fail autodetection + mkdir -p ${WRKDIR}/dummy + touch ${WRKDIR}/dummy/numpy.py + cd ${WRKSRC} && export ${MAKE_ENV} PYTHONPATH="${WRKDIR}/dummy:" && \ /bin/sh ./bootstrap.sh.tmp ${BOOTSTRAP} ${PY2_BOOTSTRAP} && \ ./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_2} Index: pkg/PLIST-main === RCS file: /cvs/ports/devel/boost/pkg/PLIST-main,v retrieving revision 1.10 diff -u -p -r1.10 PLIST-main --- pkg/PLIST-main 5 Nov 2020 11:23:03 - 1.10 +++ pkg/PLIST-main 13 Nov 2020 16:38:52 - @@ -15088,10 +15088,6 @@ include/boost/yap/yap.hpp @lib lib/libboost_math_tr1l-mt.so.${LIBboost_math_tr1l-mt_VERSION} @static-lib lib/libboost_math_tr1l.a @lib lib/libboost_math_tr1l.so.${LIBboost_math_tr1l_VERSION} -@static-lib lib/libboost_numpy27-mt.a -@lib lib/libboost_numpy27-mt.so.${LIBboost_numpy27-mt_VERSION} -@static-lib lib/libboost_numpy27.a -@lib lib/libboost_numpy27.so.${LIBboost_numpy27_VERSION} @static-lib lib/libboost_numpy38-mt.a @lib lib/libboost_numpy38-mt.so.${LIBboost_numpy38-mt_VERSION} @static-lib lib/libboost_numpy38.a -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[base-gcc/sparc64] Fix graphics/graphene build
In file included from /usr/local/include/glib-2.0/glib/gtestutils.h:30, from /usr/local/include/glib-2.0/glib.h:85, from /usr/local/include/glib-2.0/gobject/gbinding.h:28, from /usr/local/include/glib-2.0/glib-object.h:22, from ../graphene-1.10.2/include/graphene-gobject.h:28, from ../graphene-1.10.2/src/graphene-gobject.c:105: /usr/include/errno.h:54: error: redundant redeclaration of '__errno' /usr/include/signal.h:72: warning: previous declaration of '__errno' was here Moving it to use COMPILER=base-clang ports-gcc fixes it. ok? (cc maintainer) --Kurt Index: Makefile === RCS file: /cvs/ports/graphics/graphene/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile24 Jun 2020 16:52:17 - 1.13 +++ Makefile13 Nov 2020 15:53:12 - @@ -21,6 +21,8 @@ MODULES= devel/meson \ x11/gnome +COMPILER= base-clang ports-gcc + MODGNOME_TOOLS=gobject-introspection LIB_DEPENDS= devel/glib2
Re: devel/boost: drop python2 support and speed up make fake
On 2020/11/08 01:46, Jeremie Courreges-Anglas wrote: > > This diff drops boost_python27 and boost_numpy27. Dropping boost_python27* needs work first; sqlite> select * from wantlib where value like 'boost_python27%'; 654|audio/py-tagpy|boost_python27-mt 4959|games/vegastrike/engine|boost_python27 5186|graphics/openimageio|boost_python27-mt audio/py-tagpy: uses boost_python27-mt for the py2 flavour. This is used by audio/zeya, http://web.psung.name/zeya/, which is not active upstream. Server requirements: Python 2.5+ (2.6+ recommended), Latest release: 0.6 17 September 2011. - Seems sensible to retire zeya and switch tagpy to py3-only. vegastrike: currently py2 only. Redhat dropped it in 2019 (https://bugzilla.redhat.com/show_bug.cgi?id=1738149), the situation changed since then and it's under development again (0.6.0 was released recently), py3 support targetted for 0.7 devel / 0.8.0. - Maybe mark broken for now? openimageio: ports only uses this for Blender, the old version of this in ports requires Py 3.7, so Blender can't be using the oiio Python bindings. (this has a very active upstream, the port is overdue an update). - This does build ok with MODPY_VERSION=${MODPY_DEFAULT_VERSION_3} so maybe just do that?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/13 07:34:05 Modified files: databases/freetds: Makefile distinfo Log message: update to freetds-1.2.11
Re: [NEW] apt-mirror, first port, questions
On 2020/11/12 18:09, Allan Streib wrote: > Hi all, > > First time porter, thought this seemed like something simple to get my > feet wet but I immediately ran into a few questions. > > I wanted to set up a local Ubuntu repository mirror on my network, using > an OpenBSD machine. apt-mirror is the tool for this, it's basically a > perl script that uses wget. > > https://github.com/apt-mirror/apt-mirror > > Firstly, is this worth having a port? It's simple enough to just install > as-is if someone wants it. Doesn't seem a bad idea. > The man page implies an "apt-mirror" user would normally run this via > cron to keep the mirror updated. Is it normal to create a new user and > group for something that isn't a daemon? It's a script any user can run. > > I'll submit my port for review after adapting based on any feedback. > > Thanks, > > Allan > Since we don't seem to be making any progress on agreeing on an additional uid range to use for ports (anything proposed so far either bumps into ranges used in some developer large installations, or uses high numbers resulting in concerns about large /var/log/lastlog if they're ever used to login), and we get closer to running into the default "normal user" uid range, I would lean towards not adding user/group for this to help conserve "ports uids" and allow users to handle that themselves.
Re: fix security/hydra ssh
On 2020/11/13 00:12, Sebastian Reitenbach wrote: > Hi, > > trying Hydra to brute force SSH doesn't seem to work as it should. running > with -v , it can successfully detect password logins work, but later on fails > on each attempt, with 'Library not initialized.' error, so doesn't find valid > credentials. > > attached patch fixes it for me, however, don't really know why it's needed. > had to add ssh_init() before starting each new session. > Looking at the docs, I believe it should not be necessary: > https://api.libssh.org/stable/group__libssh.html#ga3ebf8d6920e563f3b032e3cd5277598e > > Also I might remember wrongly, but at some earlier point in time, SSH brute > force did work. > Applying same treatment to sshkey brute force, as from the code, seems to > probably have same issue, but not tested. > > Anyone with a better idea, or OK? The same change was made to hydra-ssh.c upstream in 2018 ... https://github.com/vanhauser-thc/thc-hydra/commit/a2de33fd2bcd50fa876dcfd121740074fb1064d0 https://github.com/vanhauser-thc/thc-hydra/issues/366 https://github.com/vanhauser-thc/thc-hydra/pull/367 ... so it's probably better to first update the port. Can you give this a go instead? It updates, modernizes the port a bit, adds a couple of other protocols, removes a bogus patch-Makefile and sets PATCHORIG to avoid that happening again, and switches the configure patch from "disable the protocols we don't want" to "whitelist the protocols we do want" which simplifies the patch and makes it less likely to conflict with future updates. Index: Makefile === RCS file: /cvs/ports/security/hydra/Makefile,v retrieving revision 1.61 diff -u -p -r1.61 Makefile --- Makefile12 Jul 2019 20:49:03 - 1.61 +++ Makefile13 Nov 2020 13:10:56 - @@ -3,69 +3,69 @@ COMMENT-main= parallelized network logon cracker COMMENT-gui= GTK frontend for hydra -VERSION= 8.6 +VERSION= 9.1 PKGNAME-main= hydra-${VERSION} PKGNAME-gui= hydra-gui-${VERSION} -REVISION-main= 0 CATEGORIES=security GH_ACCOUNT = vanhauser-thc GH_PROJECT = thc-hydra -GH_TAGNAME = ${VERSION} - -HOMEPAGE= https://thc.org/thc-hydra/ +GH_TAGNAME = v${VERSION} # AGPLv3 (GNU Affero Public License) PERMIT_PACKAGE=Yes -WANTLIB= c z +WANTLIB = c z + +WANTLIB-main = ${WANTLIB} crypto curses freerdp2 gcrypt idn m mariadb +WANTLIB-main +=memcached pcre pq ssh ssl winpr2 + +WANTLIB-gui = ${WANTLIB} +WANTLIB-gui += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama +WANTLIB-gui += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0 +WANTLIB-gui += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 +WANTLIB-gui += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 harfbuzz -PSEUDO_FLAVORS=no_x11 +PSEUDO_FLAVORS=no_gui FLAVOR?= -MULTI_PACKAGES=-main +MULTI_PACKAGES=-main -gui CONFIGURE_STYLE=gnu -USE_GMAKE= Yes +USE_GMAKE= Yes NO_TEST= Yes -MAKE_FLAGS=CC=${CC} +MAKE_FLAGS=CC="${CC}" +PATCHORIG= .orig.port -CONFIGURE_ARGS = --with-ssl=prefix="/usr/include" \ - --with-ssl-lib=prefix="/usr/lib" \ - --prefix=${LOCALBASE} - -.if ${FLAVOR:Mno_x11} -ALL_TARGET=hydra pw-inspector -.else -MULTI_PACKAGES+=-gui -ALL_TARGET=all -.endif +CONFIGURE_ARGS=--nostrip \ + --with-ssl=prefix="/usr/include" \ + --with-ssl-lib=prefix="/usr/lib" \ + --prefix=${LOCALBASE} LIB_DEPENDS-main= databases/mariadb,-main \ databases/postgresql,-main \ devel/libidn \ + devel/libmemcached \ devel/pcre \ security/libgcrypt \ - security/libssh -RUN_DEPENDS-main= - -WANTLIB-main= ${WANTLIB} m crypto curses gcrypt idn mysqlclient pcre pq ssh ssl + security/libssh \ + x11/freerdp LIB_DEPENDS-gui=x11/gtk+2 - RUN_DEPENDS-gui=${BASE_PKGPATH},-main +DEBUG_PACKAGES=${BUILD_PACKAGES} + +.include -WANTLIB-gui += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB-gui += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0 -WANTLIB-gui += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 -WANTLIB-gui += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 ${WANTLIB} +.if !${BUILD_PACKAGES:M-gui} +ALL_TARGET=hydra pw-inspector +.endif post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hydra - ${INSTALL_DATA} ${WRKSRC}/{README,LICENSE} ${PREFIX}/share/doc/hydra - ${INSTALL_DATA} ${WRKSRC}/{README,LICENSE} ${PREFIX}/share/doc/hydra + ${INSTALL_DATA} ${WRKSRC}/{README.md,LICENSE} ${PREFIX}/share/doc/hydra mv ${PREFIX}/etc/* ${PREFIX}/share/doc/hydra/ && rm -r ${PREFIX}/etc .include Index: distinfo
Re: update intel microcode to 20201110
On Thu, Nov 12, 2020 at 01:07:31PM +, Stuart Henderson wrote: > On 2020/11/12 03:58, Abel Abraham Camarillo Ojeda wrote: > > I see no problems with this, only change in dmesg was: > .. > > -cpu0: Intel(R) Core(TM) i3-6100U CPU @ 2.30GHz, 1313.21 MHz, 06-4e-03 > > -cpu0: > > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN > > +cpu0: Intel(R) Core(TM) i3-6100U CPU @ 2.30GHz, 1294.62 MHz, 06-4e-03 > > +cpu0: > > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN > .. > > > > Which is: > > > > SRBDS_CTRL > > > > in cpuid. > > > > I tested cold boot and reboot both working OK > > > > Thanks > > Great, thanks for testing. jsg: OK with me. There was another release which updated gemini lake. May wait a few days to see if there is another release, perhaps with some progress on https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/44 Index: Makefile === RCS file: /cvs/ports/sysutils/firmware/intel/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile3 Jul 2020 12:10:41 - 1.24 +++ Makefile13 Nov 2020 05:41:29 - @@ -3,7 +3,7 @@ COMMENT= microcode update binaries for Intel CPUs FW_DRIVER= intel -FW_VER=20200616 +FW_VER=20201112 EPOCH= 0 GH_ACCOUNT=intel GH_PROJECT=Intel-Linux-Processor-Microcode-Data-Files Index: distinfo === RCS file: /cvs/ports/sysutils/firmware/intel/distinfo,v retrieving revision 1.17 diff -u -p -r1.17 distinfo --- distinfo3 Jul 2020 12:10:41 - 1.17 +++ distinfo13 Nov 2020 05:41:36 - @@ -1,2 +1,2 @@ -SHA256 (firmware/intel-20200616.tar.gz) = 60+TlCGsbN6jxYbJ2YTsUYMg8AwH6ys9Z1QwnIPJM3E= -SIZE (firmware/intel-20200616.tar.gz) = 3036726 +SHA256 (firmware/intel-20201112.tar.gz) = qifGoTjEQLyLnBkUXwL750JceE/q9h5c+hM0b53pqSc= +SIZE (firmware/intel-20201112.tar.gz) = 3610834 Index: pkg/PLIST === RCS file: /cvs/ports/sysutils/firmware/intel/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 18 Nov 2019 18:06:59 - 1.13 +++ pkg/PLIST 11 Nov 2020 07:36:46 - @@ -72,6 +72,7 @@ firmware/intel/06-55-03 firmware/intel/06-55-04 firmware/intel/06-55-06 firmware/intel/06-55-07 +firmware/intel/06-55-0b firmware/intel/06-56-02 firmware/intel/06-56-03 firmware/intel/06-56-04 @@ -85,6 +86,8 @@ firmware/intel/06-66-03 firmware/intel/06-7a-01 firmware/intel/06-7a-08 firmware/intel/06-7e-05 +firmware/intel/06-8a-01 +firmware/intel/06-8c-01 firmware/intel/06-8e-09 firmware/intel/06-8e-0a firmware/intel/06-8e-0b @@ -94,7 +97,11 @@ firmware/intel/06-9e-0a firmware/intel/06-9e-0b firmware/intel/06-9e-0c firmware/intel/06-9e-0d +firmware/intel/06-a5-02 +firmware/intel/06-a5-03 +firmware/intel/06-a5-05 firmware/intel/06-a6-00 +firmware/intel/06-a6-01 firmware/intel/0f-00-07 firmware/intel/0f-00-0a firmware/intel/0f-01-02
Re: gpg no uid patch
On Wed, Nov 11, 2020 at 04:09:53PM +0100, Jeremie Courreges-Anglas wrote: > My initial feeling is that we shouldn't contribute to a fragmented > ecosystem, and that this issue would be better sorted out upstream, > even if there's disagreement so far. I'm leaning in that direction too. Let's leave it as-is for now. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: [New] sysutils/glances (Python)
On Fri, November 13, 2020 05:03, Ashton Fagg wrote: > Hello, > > > I have a new port attached for Glances [1]. > > > It's a system monitoring tool (similar to top, htop etc), written in > Python. It has built-in support for monitoring a remote system, nice web > GUI etc. It does a bunch of other things beyond just what top/htop does > - it also monitors network activity, disk I/O, temperature sensors and a > couple other things (some of this is Linux only right now...). > > The attached port has been tested on amd64, and a patch included to make > sure the man pages get put in the right place. > > make configure, make build, make test, make fake, make install, make > deinstall all work. portcheck reports clean. > Appears to function as > expected. > > Question, comments, suggestions appreciated. > > > Thanks, > > > Ash > > > [1] https://nicolargo.github.io/glances/ I think this link is more fitting as a HOMEPAGE. > > >-('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS.rst', 'README.rst', >- 'CONTRIBUTING.md', 'conf/glances.conf']), Including the configuration will be better. This program doesn't pick up on the terminal background colors, the conf file might help with it, only nitpick after having a few glances, hehe ;-)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/13 01:48:46 Modified files: textproc/meld : Makefile textproc/meld/pkg: PLIST Log message: No more HighContrast icons.
Re: [update patch] tor 0.4.3.6 -> 0.4.4.5
On Fri, November 13, 2020 04:25, Martin Ziemer wrote: > This patch updates tor from 0.4.3.6 to 0.4.4.5. > > > I tested it on four amd64 systems. > > The latest release is 0.4.4.6. > > Index: Makefile > === > RCS file: /cvs/ports/net/tor/Makefile,v > retrieving revision 1.130 diff -u -p -r1.130 Makefile --- Makefile19 Jul > 2020 17:01:55 - 1.130 > +++ Makefile 9 Nov 2020 14:42:11 - > @@ -2,7 +2,7 @@ > > > COMMENT= anonymity service using onion routing > > > -DISTNAME=tor-0.4.3.6 > +DISTNAME=tor-0.4.4.5 > CATEGORIES= net > HOMEPAGE= https://www.torproject.org/ > > > Index: distinfo > === > RCS file: /cvs/ports/net/tor/distinfo,v > retrieving revision 1.107 diff -u -p -r1.107 distinfo --- distinfo19 Jul > 2020 17:01:56 - 1.107 > +++ distinfo 9 Nov 2020 14:42:11 - > @@ -1,2 +1,2 @@ > -SHA256 (tor-0.4.3.6.tar.gz) = ai0GN9TlFL4uxXRyOgUGUkXM5R2niiHOwdyDG+XMrGI= > -SIZE (tor-0.4.3.6.tar.gz) = 7745954 > +SHA256 (tor-0.4.4.5.tar.gz) = pFygCv52Xjuqg5dnyd1qyaRt0Bcgo6j/TYZVjBI1mSY= > +SIZE (tor-0.4.4.5.tar.gz) = 7808696 > >