Re: Unbreak ghc
On Tue, Dec 5, 2017 at 12:19 AM, Matthias Kilianwrote: > Hi Karel, > > On Mon, Dec 04, 2017 at 11:09:33PM +0100, Karel Gardas wrote: >> attached patch unbreaks GHC compilation issue on snapshot. I would >> rather keep that simple/stupid before cleaning more those bits in >> OpenBSD #ifdef. Good for now IMHO. > > Thanks for your patch. I'll have a look on wednesday. At the moment, > I'm trying to build new boostrappers based on ghc-8.0 (to proceed > to 8.2), on a not-so-recent -current. Cool! Having 8.2 would be nice. Thanks for your work on this! Karel
Re: WANTLIB is unmaintainable (was: Re: update: shells/zsh 5.4.2)
On Mon, Dec 04, 2017 at 03:06:45PM +, Christian Weisgerber wrote: > Stuart Henderson: > > > > Looks like WANTLIB needs an update, curses instead of ncursesw. Could > > > you please check that nothing went wrong in the configure step > > > > This changed because of src/share/mk/bsd.lib.mk r1.92, we should probably > > update it across all the ports tree otherwise the next time somebody does a > > bulk WANTLIB sync, they're going to have a whole bunch of fun with that :) > > WANTLIB is unmaintainable. > > The curses thing is cosmetic, but every time some popular library > changes its dependencies, the WANTLIB entries in hundreds of ports > are outdated. This happens all the time, so WANTLIB is permanently > out of sync throughout the tree. > > What exactly prevents @wantlib from being automatically generated > by pkg_create? > > Currently we build the port, run lib-port-depends-check, and edit > the WANTLIB variable in the Makefile to match the output. That's > already semi-automated. (Alas, the Makefile format doesn't lend > itself to automated editing. I'm beginning to understand why some > people use XML for such things.) > > I understand that some ports have, exceptionally, for various > reasons, additional WANTLIB entries that aren't provided by > lib-port-depends-check. That's what WANTLIB could be used for. > > It's time to face it: The manual maintenance of WANTLIB simply > doesn't work. I can't agree more. -- Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2017/12/04 19:52:10 Modified files: sysutils/login_duo: Makefile Log message: Update HOMEPAGE and bump HOMEPAGE was redirect to the pam_duo docs, suggestion from Darren Spruell
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2017/12/04 17:28:02 Modified files: devel/quirks : Makefile Log message: missed bump (I committed from files/ rather than the port dir), noticed by Mikolaj Kucharski
Re: Unbreak ghc
Hi Karel, On Mon, Dec 04, 2017 at 11:09:33PM +0100, Karel Gardas wrote: > attached patch unbreaks GHC compilation issue on snapshot. I would > rather keep that simple/stupid before cleaning more those bits in > OpenBSD #ifdef. Good for now IMHO. Thanks for your patch. I'll have a look on wednesday. At the moment, I'm trying to build new boostrappers based on ghc-8.0 (to proceed to 8.2), on a not-so-recent -current. Ciao, Kili
[UPDATE] archivers/fuse-zip
Hi ports@, Update from 0.4.2 => 0.4.4 I've been working with the developer of fuse-zip to add the FUSE mknod operation. This is now mandatory for FUSE ports on OpenbSD after I removed the incorrect implementation of create from the kernel and libfuse. This version also fixes an "off-by-one" bug that caused fuse-zip to fail with either a Segementation fault of Bus error when copying a sparse file. License has changed from LGPL to GPL. ok? Index: Makefile === RCS file: /cvs/ports/archivers/fuse-zip/Makefile,v retrieving revision 1.7 diff -u -p -u -p -r1.7 Makefile --- Makefile21 Aug 2017 17:58:12 - 1.7 +++ Makefile4 Dec 2017 23:07:28 - @@ -2,13 +2,13 @@ COMMENT = navigate zip archives through FUSE -DISTNAME = fuse-zip-0.4.2 +DISTNAME = fuse-zip-0.4.4 CATEGORIES = archivers HOMEPAGE = https://bitbucket.org/agalanin/fuse-zip -# LGPLv3+ +# GPLv3+ PERMIT_PACKAGE_CDROM = Yes WANTLIB += c fuse m ${COMPILER_LIBCXX} z zip Index: distinfo === RCS file: /cvs/ports/archivers/fuse-zip/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo21 Aug 2017 17:58:12 - 1.2 +++ distinfo4 Dec 2017 23:07:28 - @@ -1,2 +1,2 @@ -SHA256 (fuse-zip-0.4.2.tar.gz) = PU7hE9THkYrTxmD4CIRz1fq/Z7NHb+8W7H9b2KQYL9w= -SIZE (fuse-zip-0.4.2.tar.gz) = 672323 +SHA256 (fuse-zip-0.4.4.tar.gz) = xGSmPKfMFu73wUA2/gmCPKnZag71MOJ0hFBEpUQOR9I= +SIZE (fuse-zip-0.4.4.tar.gz) = 687132 Index: pkg/PLIST === RCS file: /cvs/ports/archivers/fuse-zip/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- pkg/PLIST 28 Jan 2014 01:01:52 - 1.1.1.1 +++ pkg/PLIST 4 Dec 2017 23:07:28 - @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2014/01/28 01:01:52 jca Exp $ +@comment $OpenBSD$ @bin bin/fuse-zip @man man/man1/fuse-zip.1 share/doc/fuse-zip/ -share/doc/fuse-zip/README +share/doc/fuse-zip/README.md share/doc/fuse-zip/changelog
[update] security/gopass to 1.6.2
Hola! This brings gopass to the latest version which has a some fun new stuff! OpenBSD specific stuff: - Now pledge'd on OpenBSD: "stdio rpath wpath cpath tty proc exec" - Fixes for wizard UI - Fix the version check (won't make http requests anymore) Full changelog: https://github.com/justwatchcom/gopass/releases OK? Index: Makefile === RCS file: /cvs/ports/security/gopass/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile28 Oct 2017 13:38:38 - 1.2 +++ Makefile4 Dec 2017 19:38:25 - @@ -4,7 +4,7 @@ COMMENT = pass compatible password manag GH_ACCOUNT = justwatchcom GH_PROJECT = gopass -GH_TAGNAME = v1.5.1 +GH_TAGNAME = v1.6.2 CATEGORIES = security @@ -16,10 +16,12 @@ PERMIT_PACKAGE_CDROM = Yes RUN_DEPENDS = devel/git \ security/gnupg2 +# uses pledge() WANTLIB += c pthread MODULES = lang/go MODGO_TYPE = bin +MODGO_LDFLAGS =-X "main.version=${GH_TAGNAME:S/v//}" # Tests require MODGO_ENV, but break in weird ways when it is set. NO_TEST = Yes Index: distinfo === RCS file: /cvs/ports/security/gopass/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo28 Oct 2017 13:38:38 - 1.2 +++ distinfo4 Dec 2017 19:38:25 - @@ -1,2 +1,2 @@ -SHA256 (gopass-1.5.1.tar.gz) = 0rfjS0YDlh5LRyyreRTj8tM/AODdPke3RXjn/EC3ZYI= -SIZE (gopass-1.5.1.tar.gz) = 1173306 +SHA256 (gopass-1.6.2.tar.gz) = kW7W1znWLPho3A+LOGgxx8eq7SUtfwawpHPAaek+Xdo= +SIZE (gopass-1.6.2.tar.gz) = 1679776 -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Re: OpenBSD 6.2/Qt 5/GC: crash: W^X violation despite wxallowed
On Mon, Dec 04, 2017 at 05:46:39AM -0800, Claus Assmann wrote: > Back in OpenBSD 6.0 running the program from /usr/local which has > wxallowed as mount option solved this problem: > > On Sat, Oct 15, 2016, Otto Moerbeek wrote: > > On Sat, Oct 15, 2016 at 11:59:05AM -0700, Claus Assmann wrote: > > > > #2 0x178e9dc67db7 in WTF::OSAllocator::reserveAndCommit () > > >from /usr/local/lib/qt5/libQt5WebKit.so.1.1 > > > smells lke a W^X violation. chekc your messages log. > > However, this doesn't help on OpenBSD 6.2: > > #0 0x0c0eb5452838 in WTFCrash () from > /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #1 0x0c0eb52996ca in > JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator () >from /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #2 0x0c0eb529938b in JSC::ExecutableAllocator::initializeAllocator () >from /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #3 0x0c0eb53b18bc in JSC::initializeThreading () from > /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #4 0x0c0eb42cea69 in WebCore::ScriptController::initializeThreading () >from /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #5 0x0c0eb4110183 in WebCore::initializeWebCoreQt () >from /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #6 0x0c0f5a5ef402 in QWebPagePrivate::QWebPagePrivate () >from /usr/local/lib/qt5/libQt5WebKitWidgets.so.2.1 > #7 0x0c0f5a5f3199 in QWebPage::QWebPage () from > /usr/local/lib/qt5/libQt5WebKitWidgets.so.2.1 > #8 0x0c0f5a5f986f in QWebView::page () from > /usr/local/lib/qt5/libQt5WebKitWidgets.so.2.1 > #9 0x0c0c6498c3d6 in LTMSidebar::LTMSidebar () from > /usr/local/ca/bin/GoldenCheetah > #10 0x0c0c64a41ed3 in HomeView::HomeView () from > /usr/local/ca/bin/GoldenCheetah > #11 0x0c0c64a3ad74 in Tab::Tab () from /usr/local/ca/bin/GoldenCheetah > #12 0x0c0c649a14d8 in MainWindow::MainWindow () from > /usr/local/ca/bin/GoldenCheetah > #13 0x0c0c647ad372 in main () from /usr/local/ca/bin/GoldenCheetah > > > Are additional steps required to get this QT application working? > If that program is outside of the ports tree, add "-Wl,-z,wxneeded" to the CFLAGS/CXXFLAGS. -- Juan Francisco Cantero Hurtado http://juanfra.info
Unbreak ghc
Hi, attached patch unbreaks GHC compilation issue on snapshot. I would rather keep that simple/stupid before cleaning more those bits in OpenBSD #ifdef. Good for now IMHO. Thanks, Karel ghc.patch Description: Binary data
UPDATE: multimedia/synfigstudio, multimedia/synfig and devel/etl
Hi all, please find blow a straightforward update to synfigstudio and all direct dependencies. Synfigstudio will not build with upcoming boost and an update is easier than patch. I'd like to see it soon in the tree to go forward with my boost update. Comments? Test? Oks? Works fine here with current bosst and upcoming on amd64. Best regards, Rafael Sadowski Index: devel/etl/Makefile === RCS file: /cvs/ports/devel/etl/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- devel/etl/Makefile 2 Dec 2017 21:39:49 - 1.5 +++ devel/etl/Makefile 4 Dec 2017 21:21:17 - @@ -2,21 +2,18 @@ COMMENT = C++ class and template library -V =0.04.19 +V =1.2.1 DISTNAME = ETL-${V} PKGNAME = etl-${V} -# Keep in sync with multimedia/synfig -SYNFIG_V = 1.0.1 -REVISION = 0 CATEGORIES = devel -HOMEPAGE = http://www.synfig.org/ +HOMEPAGE = https://www.synfig.org/ # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES= https://download.tuxfamily.org/synfig/releases/${SYNFIG_V}/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synfig/} CONFIGURE_STYLE = gnu Index: devel/etl/distinfo === RCS file: /cvs/ports/devel/etl/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- devel/etl/distinfo 21 Sep 2015 16:58:21 - 1.3 +++ devel/etl/distinfo 4 Dec 2017 21:21:17 - @@ -1,2 +1,2 @@ -SHA256 (ETL-0.04.19.tar.gz) = IWlogfqxuaNFiqp3qLEMiZwpey0TLj7Uz7f/opzYuP4= -SIZE (ETL-0.04.19.tar.gz) = 371439 +SHA256 (ETL-1.2.1.tar.gz) = dU2Ixd3971TyfR4X9iqQLrnwn75++a697TRUG0wXAOY= +SIZE (ETL-1.2.1.tar.gz) = 373906 Index: multimedia/synfig/Makefile === RCS file: /cvs/ports/multimedia/synfig/Makefile,v retrieving revision 1.21 diff -u -p -u -p -r1.21 Makefile --- multimedia/synfig/Makefile 2 Dec 2017 21:39:49 - 1.21 +++ multimedia/synfig/Makefile 4 Dec 2017 21:21:26 - @@ -1,38 +1,40 @@ # $OpenBSD: Makefile,v 1.21 2017/12/02 21:39:49 juanfra Exp $ COMMENT = 2D animation software -REVISION = 9 -V= 1.0.1 +V= 1.2.1 DISTNAME = synfig-$V API_V =1.0 -SHARED_LIBS += synfig1.0 # 0.0 +SHARED_LIBS += synfig2.0 # 0.0 CATEGORIES = multimedia -HOMEPAGE = http://www.synfig.org/ +HOMEPAGE = https://www.synfig.org/ # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += Half ICE Iex IexMath IlmImf IlmThread Imath Magick++-6.Q16 -WANTLIB += MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xext Xrender -WANTLIB += Xt boost_chrono-mt boost_filesystem boost_program_options-mt -WANTLIB += boost_system bz2 c cairo djvulibre expat ffi fftw3 -WANTLIB += fontconfig freetype gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz iconv intl -WANTLIB += jbig jpeg lcms2 ltdl lzma m mlt mlt++ mng openjp2 pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread -WANTLIB += sigc-2.0 tiff webp xcb xcb-render xcb-shm -WANTLIB += xml++-2.6 xml2 z boost_system-mt lcms ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} Half ICE Iex IexMath IlmImf IlmThread +WANTLIB += Imath Magick++-6.Q16 MagickCore-6.Q16 MagickWand-6.Q16 +WANTLIB += SM X11 Xext Xrender Xt boost_chrono-mt boost_filesystem +WANTLIB += boost_program_options-mt boost_system boost_system-mt +WANTLIB += bz2 c cairo djvulibre expat ffi fftw3 fontconfig freetype +WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 +WANTLIB += graphite2 gthread-2.0 harfbuzz iconv intl jasper jbig +WANTLIB += jpeg lcms lcms2 ltdl lzma m mlt mlt++ mng openjp2 pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png png16 +WANTLIB += raw_r sigc-2.0 tiff webp xcb xcb-render xcb-shm xml++-2.6 +WANTLIB += xml2 z -MASTER_SITES= https://download.tuxfamily.org/synfig/releases/${V}/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synfig/} # c++11 COMPILER = base-clang ports-gcc -BUILD_DEPENDS =devel/etl>=0.04.19 +BUILD_DEPENDS =devel/etl>=1.2.1 \ + devel/gettext-tools + LIB_DEPENDS = archivers/xz \ devel/boost \ devel/libtool,-ltdl \ @@ -40,6 +42,9 @@ LIB_DEPENDS = archivers/xz \ graphics/ImageMagick \ graphics/libmng \ graphics/openexr \ + graphics/libraw \ + graphics/jasper \ + graphics/png \ multimedia/mlt \
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2017/12/04 14:09:39 Modified files: databases/p5-AsciiDB-TagFile: Makefile databases/p5-DBD-Chart: Makefile databases/p5-Rose-DB: Makefile databases/p5-Rose-DB-Object: Makefile databases/p5-Rose-DateTime: Makefile databases/p5-Rose-Object: Makefile databases/p5-Tie-DBI: Makefile devel/p5-Context-Preserve: Makefile devel/p5-Sub-Name: Makefile security/scanlogd: Makefile sysutils/dwdiff: Makefile Log message: FIX_EXTRACT_PERMISSIONS
Re: OpenBSD 6.2/Qt 5/GC: crash: W^X violation despite wxallowed
On Mon Dec 04, 2017 at 05:46:39AM -0800, Claus Assmann wrote: > Back in OpenBSD 6.0 running the program from /usr/local which has > wxallowed as mount option solved this problem: > > On Sat, Oct 15, 2016, Otto Moerbeek wrote: > > On Sat, Oct 15, 2016 at 11:59:05AM -0700, Claus Assmann wrote: > > > > #2 0x178e9dc67db7 in WTF::OSAllocator::reserveAndCommit () > > >from /usr/local/lib/qt5/libQt5WebKit.so.1.1 > > > smells lke a W^X violation. chekc your messages log. > > However, this doesn't help on OpenBSD 6.2: > > #0 0x0c0eb5452838 in WTFCrash () from > /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #1 0x0c0eb52996ca in > JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator () >from /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #2 0x0c0eb529938b in JSC::ExecutableAllocator::initializeAllocator () >from /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #3 0x0c0eb53b18bc in JSC::initializeThreading () from > /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #4 0x0c0eb42cea69 in WebCore::ScriptController::initializeThreading () >from /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #5 0x0c0eb4110183 in WebCore::initializeWebCoreQt () >from /usr/local/lib/qt5/libQt5WebKit.so.2.1 > #6 0x0c0f5a5ef402 in QWebPagePrivate::QWebPagePrivate () >from /usr/local/lib/qt5/libQt5WebKitWidgets.so.2.1 > #7 0x0c0f5a5f3199 in QWebPage::QWebPage () from > /usr/local/lib/qt5/libQt5WebKitWidgets.so.2.1 > #8 0x0c0f5a5f986f in QWebView::page () from > /usr/local/lib/qt5/libQt5WebKitWidgets.so.2.1 > #9 0x0c0c6498c3d6 in LTMSidebar::LTMSidebar () from > /usr/local/ca/bin/GoldenCheetah > #10 0x0c0c64a41ed3 in HomeView::HomeView () from > /usr/local/ca/bin/GoldenCheetah > #11 0x0c0c64a3ad74 in Tab::Tab () from /usr/local/ca/bin/GoldenCheetah > #12 0x0c0c649a14d8 in MainWindow::MainWindow () from > /usr/local/ca/bin/GoldenCheetah > #13 0x0c0c647ad372 in main () from /usr/local/ca/bin/GoldenCheetah > > > Are additional steps required to get this QT application working? > Looks like you built GoldenCheetah from scratch outside the ports env. If yes, you have to extend ld(1)'s parameters with `-z wxneeded`. Please search for COMPILER_LINKS and USE_WXNEEDED in bsd.port.mk(5).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2017/12/04 11:58:08 Modified files: databases/openldap23: Makefile Log message: funny the shit you find when you build ports from the console. Yep, rm -r doesn't work because it goes interactive...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2017/12/04 10:56:27 Modified files: chinese/lunar : Makefile comms/smstools : Makefile converters/p5-Convert-Base32: Makefile converters/p5-Convert-TNEF: Makefile converters/p5-JSON-Any: Makefile converters/p5-JSON-MaybeXS: Makefile devel/p5-File-ShareDir-Install: Makefile devel/p5-Graph : Makefile devel/p5-YAML-Syck: Makefile devel/p5-YAML-Tiny: Makefile math/p5-Math-Pari: Makefile misc/p5-Spreadsheet-ParseExcel: Makefile net/libnet/1.0 : Makefile net/libnids: Makefile security/arirang: Makefile security/ctunnel: Makefile security/dropbear: Makefile security/john-jumbo: Makefile security/nbaudit: Makefile security/p5-Crypt-SmbHash: Makefile security/p5-Digest-Skein: Makefile security/p5-Text-Password-Pronounceable: Makefile security/passwdqc: Makefile security/pgp5 : Makefile x11/ion: Makefile Log message: a few more FIX_EXTRACT_PERMISSIONS
Re: [UPDATE] sysutils/py-psutil
On Mon, Dec 04, 2017 at 01:07:09PM +, Stuart Henderson wrote: > On 2017/12/04 12:19, Landry Breuil wrote: > > On Mon, Dec 04, 2017 at 09:39:19AM +0100, Remi Pointel wrote: > > > Hi, > > > > > > this is the diff to update py-psutil to latest release. > > > > > > Ok? > > > > Tests fails here: > > > > Error in atexit._run_exitfuncs: > > Traceback (most recent call last): > > File "/usr/local/lib/python2.7/atexit.py", line 24, in _run_exitfuncs > > func(*targs, **kargs) > > File > > "/home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1/psutil/tests/__init__.py", > > line 196, in _cleanup_files > > if name.startswith(u(TESTFILE_PREFIX)): > > UnicodeDecodeError: 'ascii' codec can't decode byte 0xc0 in position 8: > > ordinal not in range(128) > > Error in sys.exitfunc: > > Traceback (most recent call last): > > File "/usr/local/lib/python2.7/atexit.py", line 24, in _run_exitfuncs > > func(*targs, **kargs) > > File > > "/home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1/psutil/tests/__init__.py", > > line 196, in _cleanup_files > > if name.startswith(u(TESTFILE_PREFIX)): > > UnicodeDecodeError: 'ascii' codec can't decode byte 0xc0 in position 8: > > ordinal not in range(128) > > *** Error 1 in . (/home/ports/lang/python/python.port.mk:197 'do-test': @cd > > /home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1 && /usr/bi...) > > > > Unicode sucks donkey balls, as usual. > > > > If I try with py27 they seem to run OK: > > Ran 511 tests in 7.972s > FAILED (failures=5, errors=2, skipped=271) Ran 511 tests in 10.831s FAILED (failures=5, skipped=271) on another machine... so maybe something in the env. With py3 they indeed go into an infinite loop starting again forever. ok for the diff itself but please look at this py3 thing with tests, this is wrong.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2017/12/04 10:39:33 Modified files: devel/gdb : Makefile Log message: oh hey, we've had a hidden dependency on guile in like, *forever* leading to breaks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2017/12/04 10:35:12 Modified files: www/mozilla-firefox: Makefile Log message: On i386, tell the rust compiler to target pentium4 and enable sse2, this way simd builds and we shouldnt suffer from runtime performance issues using encoding_rs. Who would use firefox on a pentium 2 nowadays? If your build fails, max out ulimit -d. At least 3Gig. Yes... from semarie@
Re: WANTLIB is unmaintainable (was: Re: update: shells/zsh 5.4.2)
On Mon, Dec 04, 2017 at 04:06:45PM +0100, Christian Weisgerber wrote: > Stuart Henderson: > > > > Looks like WANTLIB needs an update, curses instead of ncursesw. Could > > > you please check that nothing went wrong in the configure step > > > > This changed because of src/share/mk/bsd.lib.mk r1.92, we should probably > > update it across all the ports tree otherwise the next time somebody does a > > bulk WANTLIB sync, they're going to have a whole bunch of fun with that :) > > WANTLIB is unmaintainable. > > The curses thing is cosmetic, but every time some popular library > changes its dependencies, the WANTLIB entries in hundreds of ports > are outdated. This happens all the time, so WANTLIB is permanently > out of sync throughout the tree. > > What exactly prevents @wantlib from being automatically generated > by pkg_create? > > Currently we build the port, run lib-port-depends-check, and edit > the WANTLIB variable in the Makefile to match the output. That's > already semi-automated. (Alas, the Makefile format doesn't lend > itself to automated editing. I'm beginning to understand why some > people use XML for such things.) > > I understand that some ports have, exceptionally, for various > reasons, additional WANTLIB entries that aren't provided by > lib-port-depends-check. That's what WANTLIB could be used for. > > It's time to face it: The manual maintenance of WANTLIB simply > doesn't work. Having wantlib lagging slightly behind is not a huge problem. Doing it automatically is not possible right now. Everything will break. mainly because packages with different wantlibs are not comparable, so you can't know which one is the newest. Adding wantlibs is not a big issue. Removing wantlibs is. A bump would be needed. At least.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2017/12/04 10:31:49 Modified files: lang/rust : Makefile distinfo lang/rust/patches: patch-src_bootstrap_lib_rs patch-src_librustdoc_test_rs patch-src_libstd_sys_unix_ext_net_rs patch-src_libstd_sys_unix_os_rs patch-src_tools_cargo_src_cargo_util_config_rs patch-src_vendor_openssl-sys_build_rs lang/rust/pkg : PFRAG.amd64-main PFRAG.i386-main PLIST-doc Added files: lang/rust/patches: patch-src_bootstrap_builder_rs patch-src_bootstrap_dist_rs patch-src_librustc_back_target_i686_unknown_openbsd_rs patch-src_librustc_back_target_openbsd_base_rs patch-src_librustc_driver_target_features_rs patch-src_librustc_llvm_build_rs patch-src_libunwind_build_rs patch-src_rustllvm_PassWrapper_cpp patch-src_test_run-make_tools_mk patch-src_test_run-pass-fulldeps_myriad-closures_rs patch-src_test_run-pass_sse2_rs patch-src_vendor_filetime_src_unix_rs Removed files: lang/rust/patches: patch-src_vendor_curl-sys_build_rs Log message: Update to rust 1.22.1. full changelog at https://blog.rust-lang.org/2017/11/22/Rust-1.22.html port changes: - switch to clang and libc++ (instead of egcc and estdc++) - use devel/llvm instead of the embedded llvm version - make i386 produce code for 'pentiumpro' instead of 'pentium4' so that ppl can use ripgrep on pentium II's (yay!) - use a hack (codegen-units=16) to fix memory pressure issues on i386. Might not work forever. tested on i386 & amd64, went into an i386 bulk. all the hard work from semarie@
[Security Update] Dokuwiki 2017-02-19e
Hi, This diff updates dokuwiki to it's latest version (2017-02-19e). It fixes 3 CVE: 12583, 12979 and 12980 Comments, ok ? Regards, Index: Makefile === RCS file: /cvs/ports/www/dokuwiki/Makefile,v retrieving revision 1.24 diff -u -p -u -p -r1.24 Makefile --- Makefile 23 Nov 2017 17:35:07 - 1.24 +++ Makefile 4 Dec 2017 16:41:55 - @@ -2,8 +2,7 @@ COMMENT = standards compliant, simple to use Wiki -REVISION = 0 -VERSION = 2017-02-19b +VERSION = 2017-02-19e DISTNAME = dokuwiki-${VERSION} PKGNAME = dokuwiki-${VERSION:S/-/./g} CATEGORIES = www Index: distinfo === RCS file: /cvs/ports/www/dokuwiki/distinfo,v retrieving revision 1.14 diff -u -p -u -p -r1.14 distinfo --- distinfo 10 May 2017 12:32:48 - 1.14 +++ distinfo 4 Dec 2017 16:41:55 - @@ -1,2 +1,2 @@ -SHA256 (dokuwiki-2017-02-19b.tgz) = iKTWyDKDoQWel2VHdmcmLxXUQ/UOSPWDx9xdVcKrzbY= -SIZE (dokuwiki-2017-02-19b.tgz) = 3505444 +SHA256 (dokuwiki-2017-02-19e.tgz) = kxcqKKuIEHqKusHmo0+mzvVLbkB80DqMwU0qYEpj6Ig= +SIZE (dokuwiki-2017-02-19e.tgz) = 3505643
Re: net/rrdtool: fix for #794 - "rrdtool creates folders/files with arbitrary permissions"
On Mon, Dec 04, 2017 at 11:41:10AM +0100, Sebastien Marie wrote: > Hi, > > ISSUE: "Regression: rrdtool creates folders/files with arbitrary permissions" > https://github.com/oetiker/rrdtool-1.x/issues/794 > > FIX: "Remove all occurances of umask ... this is NOT thread safe! Fix for > #794" > > https://github.com/oetiker/rrdtool-1.x/commit/f1edd121add94fe69ac22d991748d289b5eb76ae > > The following diff is the fix applied on 1.7.0. > updated diff. It looks like my local repository wasn't up-to-date. Sorry about that. -- Sebastien Marie Index: Makefile === RCS file: /cvs/ports/net/rrdtool/Makefile,v retrieving revision 1.107 diff -u -p -r1.107 Makefile --- Makefile1 Dec 2017 10:36:51 - 1.107 +++ Makefile4 Dec 2017 16:34:45 - @@ -12,7 +12,7 @@ PKGNAME-main= ${DISTNAME} PKGNAME-update=rrdupdate-${VERSION} PKGNAME-python= py-rrd-${VERSION} PKGNAME-ruby= ruby${MODRUBY_BINREV}-rrd-${VERSION} -REVISION-main= 2 +REVISION-main= 3 REVISION-update= 0 SHARED_LIBS += rrd 5.2 # 9.0 Index: patches/patch-doc_rrdcreate_pod === RCS file: patches/patch-doc_rrdcreate_pod diff -N patches/patch-doc_rrdcreate_pod --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-doc_rrdcreate_pod 4 Dec 2017 16:34:45 - @@ -0,0 +1,19 @@ +$OpenBSD$ +Fix for https://github.com/oetiker/rrdtool-1.x/issues/794 +https://github.com/oetiker/rrdtool-1.x/commit/f1edd121add94fe69ac22d991748d289b5eb76ae +Index: doc/rrdcreate.pod +--- doc/rrdcreate.pod.orig doc/rrdcreate.pod +@@ -743,6 +743,12 @@ divides each PDP of the AccumDuration by the correspon + TotalRequests and stores the average request duration. The remainder of the + RPN expression handles the divide by zero case. + ++=head1 SECURITY ++ ++Note that new rrd files will have the permission 0622 regarless of your ++umask setting. If a file with the same name previously exists, its ++permission settings will be copied to the new file. ++ + =head1 AUTHORS + + Tobias Oetiker Et...@oetiker.che, Peter Stamfest Epe...@stamfest.ate Index: patches/patch-src_rrd_create_c === RCS file: patches/patch-src_rrd_create_c diff -N patches/patch-src_rrd_create_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_rrd_create_c 4 Dec 2017 16:34:45 - @@ -0,0 +1,56 @@ +$OpenBSD$ +Fix for https://github.com/oetiker/rrdtool-1.x/issues/794 +https://github.com/oetiker/rrdtool-1.x/commit/f1edd121add94fe69ac22d991748d289b5eb76ae +Index: src/rrd_create.c +--- src/rrd_create.c.orig src/rrd_create.c +@@ -4,6 +4,7 @@ + * rrd_create.c creates new rrds + */ + ++#include "mutex.h" + #include + #include + #include +@@ -1313,10 +1314,10 @@ done: + return rc; + } + ++ + int write_rrd(const char *outfilename, rrd_t *out) { + int rc = -1; + char *tmpfilename = NULL; +-mode_t saved_umask; + + /* write out the new file */ + #ifdef HAVE_LIBRADOS +@@ -1341,10 +1342,10 @@ int write_rrd(const char *outfilename, rrd_t *out) { + strcpy(tmpfilename, outfilename); + strcat(tmpfilename, "XX"); + +- /* fix CWE-377 */ +- saved_umask = umask(S_IRUSR|S_IWUSR); ++ /* this is 0600 according to the manual page */ + int tmpfd = mkstemp(tmpfilename); +- umask(saved_umask); ++ ++ + if (tmpfd < 0) { + rrd_set_error("Cannot create temporary file"); + goto done; +@@ -1377,13 +1378,8 @@ int write_rrd(const char *outfilename, rrd_t *out) { + stat_buf.st_mode = _S_IREAD | _S_IWRITE; // have to test it is + #else + /* an error occurred (file not found, maybe?). Anyway: +- set the mode to 0666 using current umask */ +- stat_buf.st_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; +- +- mode_t mask = umask(0); +- umask(mask); +- +- stat_buf.st_mode &= ~mask; ++ set the mode to 0644 using current umask */ ++ stat_buf.st_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; + #endif + } + if (chmod(tmpfilename, stat_buf.st_mode) != 0) {
UPDATE: print/py-relatorio (0.8.0 + python3)
Hi, The following diff update py-relatorio to 0.8.0 and add python3 flavor. pycha is an optional dependency, and as it isn't compatible with python3, so I conditionally added it to RUN_DEPENDS. >'chart': ['pycha >= 0.4.0', 'pyyaml'], # pycairo ChangeLog: 0.8.0 - 20171204 * Do not guess_type on styled cell content * Remove type attributes when guessing type * Add support for Python 3.6 * Remove soft-page-break Thanks. -- Sebastien Marie Index: Makefile === RCS file: /cvs/ports/print/py-relatorio/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile9 Oct 2017 15:51:26 - 1.7 +++ Makefile4 Dec 2017 15:46:27 - @@ -2,7 +2,7 @@ COMMENT= templating library able to output odt and pdf files -MODPY_EGG_VERSION= 0.7.1 +MODPY_EGG_VERSION= 0.8.0 DISTNAME= relatorio-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} @@ -19,12 +19,20 @@ MODULES=lang/python MODPY_SETUPTOOLS= Yes -RUN_DEPENDS= www/py-genshi \ - graphics/pycha \ - textproc/py-yaml \ - textproc/py-lxml +FLAVOR?= +FLAVORS= python3 + +RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \ + textproc/py-lxml${MODPY_FLAVOR} \ + devel/py-libmagic${MODPY_FLAVOR} + +.if !${FLAVOR:Mpython3} +RUN_DEPENDS+= graphics/pycha \ + textproc/py-yaml +.endif TEST_DEPENDS= ${RUN_DEPENDS} \ - devel/py-nose + devel/py-nose${MODPY_FLAVOR} + .include Index: distinfo === RCS file: /cvs/ports/print/py-relatorio/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo9 Oct 2017 15:51:26 - 1.4 +++ distinfo4 Dec 2017 15:46:27 - @@ -1,2 +1,2 @@ -SHA256 (relatorio-0.7.1.tar.gz) = dE8eOTE/A3oKtSoVQzjs4VHYPlRCqSeNsfjORQzmws0= -SIZE (relatorio-0.7.1.tar.gz) = 970049 +SHA256 (relatorio-0.8.0.tar.gz) = vd+F0CnFyFoPl21zkH4U5MMJMGX+hScXDJGr8CGFRtk= +SIZE (relatorio-0.8.0.tar.gz) = 1096794 Index: pkg/PLIST === RCS file: /cvs/ports/print/py-relatorio/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 9 Oct 2017 15:51:26 - 1.3 +++ pkg/PLIST 4 Dec 2017 15:46:27 - @@ -7,23 +7,28 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/relatorio/__init__.py -lib/python${MODPY_VERSION}/site-packages/relatorio/__init__.pyc +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/relatorio/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/relatorio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/relatorio/${MODPY_PYCACHE}reporting.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/relatorio/reporting.py -lib/python${MODPY_VERSION}/site-packages/relatorio/reporting.pyc lib/python${MODPY_VERSION}/site-packages/relatorio/templates/ lib/python${MODPY_VERSION}/site-packages/relatorio/templates/__init__.py -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/__init__.pyc +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}chart.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}opendocument.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/relatorio/templates/${MODPY_PYCACHE}pdf.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/relatorio/templates/base.py -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/base.pyc lib/python${MODPY_VERSION}/site-packages/relatorio/templates/chart.py -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/chart.pyc lib/python${MODPY_VERSION}/site-packages/relatorio/templates/opendocument.py -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/opendocument.pyc lib/python${MODPY_VERSION}/site-packages/relatorio/templates/pdf.py -lib/python${MODPY_VERSION}/site-packages/relatorio/templates/pdf.pyc lib/python${MODPY_VERSION}/site-packages/relatorio/tests/ lib/python${MODPY_VERSION}/site-packages/relatorio/tests/__init__.py -lib/python${MODPY_VERSION}/site-pa
Re: [UPDATE] sysutils/py-psutil
On 12/04/17 14:07, Stuart Henderson wrote: On 2017/12/04 12:19, Landry Breuil wrote: On Mon, Dec 04, 2017 at 09:39:19AM +0100, Remi Pointel wrote: Hi, this is the diff to update py-psutil to latest release. Ok? Tests fails here: Error in atexit._run_exitfuncs: Traceback (most recent call last): File "/usr/local/lib/python2.7/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1/psutil/tests/__init__.py", line 196, in _cleanup_files if name.startswith(u(TESTFILE_PREFIX)): UnicodeDecodeError: 'ascii' codec can't decode byte 0xc0 in position 8: ordinal not in range(128) Error in sys.exitfunc: Traceback (most recent call last): File "/usr/local/lib/python2.7/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1/psutil/tests/__init__.py", line 196, in _cleanup_files if name.startswith(u(TESTFILE_PREFIX)): UnicodeDecodeError: 'ascii' codec can't decode byte 0xc0 in position 8: ordinal not in range(128) *** Error 1 in . (/home/ports/lang/python/python.port.mk:197 'do-test': @cd /home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1 && /usr/bi...) Unicode sucks donkey balls, as usual. If I try with py27 they seem to run OK: Ran 511 tests in 7.972s FAILED (failures=5, errors=2, skipped=271) If I use a version of Python which isn't long dead, they work. Then they work again. And again, and again, and again. I haven't yet discovered if they ever finish... Yes, it seems that they work, and work, and infinitely work with Python 3.6... Remi.
OpenBSD 6.2/Qt 5/GC: crash: W^X violation despite wxallowed
Back in OpenBSD 6.0 running the program from /usr/local which has wxallowed as mount option solved this problem: On Sat, Oct 15, 2016, Otto Moerbeek wrote: > On Sat, Oct 15, 2016 at 11:59:05AM -0700, Claus Assmann wrote: > > #2 0x178e9dc67db7 in WTF::OSAllocator::reserveAndCommit () > >from /usr/local/lib/qt5/libQt5WebKit.so.1.1 > smells lke a W^X violation. chekc your messages log. However, this doesn't help on OpenBSD 6.2: #0 0x0c0eb5452838 in WTFCrash () from /usr/local/lib/qt5/libQt5WebKit.so.2.1 #1 0x0c0eb52996ca in JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator () from /usr/local/lib/qt5/libQt5WebKit.so.2.1 #2 0x0c0eb529938b in JSC::ExecutableAllocator::initializeAllocator () from /usr/local/lib/qt5/libQt5WebKit.so.2.1 #3 0x0c0eb53b18bc in JSC::initializeThreading () from /usr/local/lib/qt5/libQt5WebKit.so.2.1 #4 0x0c0eb42cea69 in WebCore::ScriptController::initializeThreading () from /usr/local/lib/qt5/libQt5WebKit.so.2.1 #5 0x0c0eb4110183 in WebCore::initializeWebCoreQt () from /usr/local/lib/qt5/libQt5WebKit.so.2.1 #6 0x0c0f5a5ef402 in QWebPagePrivate::QWebPagePrivate () from /usr/local/lib/qt5/libQt5WebKitWidgets.so.2.1 #7 0x0c0f5a5f3199 in QWebPage::QWebPage () from /usr/local/lib/qt5/libQt5WebKitWidgets.so.2.1 #8 0x0c0f5a5f986f in QWebView::page () from /usr/local/lib/qt5/libQt5WebKitWidgets.so.2.1 #9 0x0c0c6498c3d6 in LTMSidebar::LTMSidebar () from /usr/local/ca/bin/GoldenCheetah #10 0x0c0c64a41ed3 in HomeView::HomeView () from /usr/local/ca/bin/GoldenCheetah #11 0x0c0c64a3ad74 in Tab::Tab () from /usr/local/ca/bin/GoldenCheetah #12 0x0c0c649a14d8 in MainWindow::MainWindow () from /usr/local/ca/bin/GoldenCheetah #13 0x0c0c647ad372 in main () from /usr/local/ca/bin/GoldenCheetah Are additional steps required to get this QT application working?
WANTLIB is unmaintainable (was: Re: update: shells/zsh 5.4.2)
Stuart Henderson: > > Looks like WANTLIB needs an update, curses instead of ncursesw. Could > > you please check that nothing went wrong in the configure step > > This changed because of src/share/mk/bsd.lib.mk r1.92, we should probably > update it across all the ports tree otherwise the next time somebody does a > bulk WANTLIB sync, they're going to have a whole bunch of fun with that :) WANTLIB is unmaintainable. The curses thing is cosmetic, but every time some popular library changes its dependencies, the WANTLIB entries in hundreds of ports are outdated. This happens all the time, so WANTLIB is permanently out of sync throughout the tree. What exactly prevents @wantlib from being automatically generated by pkg_create? Currently we build the port, run lib-port-depends-check, and edit the WANTLIB variable in the Makefile to match the output. That's already semi-automated. (Alas, the Makefile format doesn't lend itself to automated editing. I'm beginning to understand why some people use XML for such things.) I understand that some ports have, exceptionally, for various reasons, additional WANTLIB entries that aren't provided by lib-port-depends-check. That's what WANTLIB could be used for. It's time to face it: The manual maintenance of WANTLIB simply doesn't work. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: [UPDATE] graphics/sxiv 2.3.1 -> 24
On Mon, Nov 27, 2017 at 08:28:29PM +0100, Klemens Nanni wrote: > On Tue, Nov 21, 2017 at 11:15:38AM +0100, Klemens Nanni wrote: > > On Tue, Nov 21, 2017 at 01:44:44AM -0700, Anthony J. Bentley wrote: > > > Klemens Nanni writes: > > > > On Mon, Nov 06, 2017 at 02:21:41AM +0100, Klemens Nanni wrote: > > > > > Hey ports@, > > > > > > > > > > here's a simple diff updating sxiv to the newest release; Yes, > > > > > upstream > > > > > jumped from 2.3.1 to 24 not 2.4. These are mostly mechanical changes, > > > > > I've also updated the description as upstream did. > > > > > (snip) > > > > > -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \ > > > > > - CFLAGS="${CFLAGS} -I${X11BASE}/include > > > > > -I${PREFIX}/include" \ > > > > > - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 > > > > > -lImlib2 -lexif > > > > -lgif" > > > > > +MAKE_FLAGS = CC=${CC} \ > > > > > + PREFIX=${PREFIX} \ > > > > > > No need to set PREFIX. > > PREFIX is hard coded to /usr/local in sxiv's Makefile and MANPATH uses > > it so why not letting users set PREFIX as they wish? Not passing it via > > MAKE_FLAGS would honor the user's PREFIX for MANPATH only. > > > > > Also, I set V=1 so we can actually see the compiler commands. > > > > > > > > + CFLAGS="${CFLAGS} -I${X11BASE}/include > > > > > -I${X11BASE}/include/fre > > > > etype2 -I${LOCALBASE}/include -I${LOCALBASE}/include/inotify" \ > > > > > + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib > > > > > -L${LOC > > > > ALBASE}/lib/inotify -lX11 -lXft -lImlib2 -lexif -linotify -lgif > > > > -Wl,-rpath ${ > > > > LOCALBASE}/lib/inotify" > > > > > > Couple things. Existing LDFLAGS don't need to be passed to LDFLAGS, > > > because unlike CFLAGS it's not a standard variable likely to be in > > > mk.conf. Also, sxiv uses LDLIBS for the -l chain so we don't have to > > > repeat it. > > Thanks, that's better. > > > > > > > > post-install: > > > > > - cd ${WRKSRC}/icon && make install > > > > > + make -C ${WRKSRC}/icon install > > > > > > No need for a cosmetic change like this... > > > > > > > > > Here's a (very) slightly modified version of your diff per above. I > > > don't understand the inotify stuff, but it matches what existing ports > > > do, so... > > Using inotify sxiv can automatically reload the currently displayed > > image if it changes on disk. > Bump; I'd like to get this in. > > Anthony's diff seems fine but I still prefer to set PREFIX when we also > set MANPREFIX so here's his diff with that on top. > > Does anyone want to commit any of the two versions? > > diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile > index eeb5fd17888..560018d753c 100644 > --- a/graphics/sxiv/Makefile > +++ b/graphics/sxiv/Makefile > @@ -1,11 +1,10 @@ > # $OpenBSD: Makefile,v 1.10 2017/05/06 13:45:49 fcambus Exp $ > > -COMMENT =simple (or small or suckless) X Image Viewer > +COMMENT =simple X Image Viewer > > GH_PROJECT = sxiv > GH_ACCOUNT = muennich > -GH_TAGNAME = v1.3.2 > -REVISION = 0 > +GH_TAGNAME = v24 > > CATEGORIES = graphics x11 > > @@ -14,17 +13,21 @@ MAINTAINER = Matthew Via> # GPLv2+ > PERMIT_PACKAGE_CDROM = Yes > > -WANTLIB += Imlib2 exif gif X11 c > +WANTLIB += Imlib2 X11 Xft c exif gif lib/inotify/inotify > > RUN_DEPENDS =devel/desktop-file-utils \ > x11/gtk+3,-guic > > -LIB_DEPENDS =graphics/imlib2 \ > +LIB_DEPENDS =devel/libinotify \ > + graphics/imlib2 \ > graphics/libexif > > -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \ > - CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \ > - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif > -lgif" > +MAKE_FLAGS = CC="${CC}" \ > + V=1 \ > + PREFIX=${PREFIX} \ > + MANPREFIX=${PREFIX}/man \ > + CFLAGS="${CFLAGS} -I${X11BASE}/include > -I${X11BASE}/include/freetype2 -I${LOCALBASE}/include > -I${LOCALBASE}/include/inotify" \ > + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib > -L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath ${LOCALBASE}/lib/inotify" > > NO_TEST =Yes > > diff --git a/graphics/sxiv/distinfo b/graphics/sxiv/distinfo > index 78b5985c9ec..dcf76b04c13 100644 > --- a/graphics/sxiv/distinfo > +++ b/graphics/sxiv/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (sxiv-1.3.2.tar.gz) = n1No3o8PV+eOvgLLUxoxEHqZPydpzsUbzI1w9cZotlM= > -SIZE (sxiv-1.3.2.tar.gz) = 46560 > +SHA256 (sxiv-24.tar.gz) = UR3EXRKWKvnDHDBozmvKS4MqYmOUaye+/qSaSM8BkRA= > +SIZE (sxiv-24.tar.gz) = 47148 > diff --git a/graphics/sxiv/patches/patch-Makefile > b/graphics/sxiv/patches/patch-Makefile > index af27a365942..717afe06ea5 100644 > --- a/graphics/sxiv/patches/patch-Makefile > +++ b/graphics/sxiv/patches/patch-Makefile > @@ -1,53 +1,31 @@ > $OpenBSD: patch-Makefile,v 1.4 2015/12/24 21:54:09 mmcc Exp $ >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2017/12/04 06:55:42 Modified files: www/iridium: Makefile distinfo www/iridium/files: audio_manager_openbsd.cc audio_manager_openbsd.h sndio_input.cc www/iridium/patches: clang-third_party_WebKit_Source_platform_BUILD_gn patch-BUILD_gn patch-ash_display_mirror_window_controller_cc patch-base_BUILD_gn patch-base_posix_unix_domain_socket_linux_cc patch-base_process_launch_h patch-base_process_process_metrics_h patch-base_sys_info_openbsd_cc patch-base_sys_info_posix_cc patch-base_test_launcher_test_launcher_cc patch-base_threading_platform_thread_h patch-base_threading_platform_thread_posix_cc patch-base_threading_thread_task_runner_handle_cc patch-base_trace_event_process_memory_dump_cc patch-build_config_c++_c++_gni patch-build_config_compiler_BUILD_gn patch-build_toolchain_gcc_toolchain_gni patch-cc_BUILD_gn patch-chrome_app_chrome_main_cc patch-chrome_app_chrome_main_delegate_cc patch-chrome_app_chrome_main_delegate_h patch-chrome_app_chromium_strings_grd patch-chrome_app_generated_resources_grd patch-chrome_app_google_chrome_strings_grd patch-chrome_app_settings_strings_grdp patch-chrome_browser_about_flags_cc patch-chrome_browser_browser_process_impl_cc patch-chrome_browser_browser_process_impl_h patch-chrome_browser_browser_resources_grd patch-chrome_browser_chrome_browser_main_cc patch-chrome_browser_chrome_content_browser_client_cc patch-chrome_browser_chrome_content_browser_client_h patch-chrome_browser_download_chrome_download_manager_delegate_cc patch-chrome_browser_download_download_prefs_cc patch-chrome_browser_extensions_BUILD_gn patch-chrome_browser_extensions_api_messaging_message_service_cc patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc patch-chrome_browser_extensions_api_settings_private_prefs_util_cc patch-chrome_browser_extensions_api_webrtc_audio_private_webrtc_audio_private_api_cc patch-chrome_browser_extensions_bookmark_app_helper_cc patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc patch-chrome_browser_extensions_external_provider_impl_cc patch-chrome_browser_flag_descriptions_cc patch-chrome_browser_flag_descriptions_h patch-chrome_browser_gpu_gl_string_manager_cc patch-chrome_browser_interstitials_chrome_controller_client_cc patch-chrome_browser_media_galleries_media_file_system_registry_cc patch-chrome_browser_media_router_discovery_discovery_network_list_posix_cc patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux_cc patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc patch-chrome_browser_notifications_message_center_notification_manager_cc patch-chrome_browser_resources_plugin_metadata_plugins_linux_json patch-chrome_browser_resources_settings_appearance_page_appearance_page_html patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc patch-chrome_browser_sync_chrome_sync_client_cc patch-chrome_browser_task_manager_sampling_task_group_cc patch-chrome_browser_task_manager_sampling_task_manager_impl_cc patch-chrome_browser_ui_browser_command_controller_cc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: piro...@cvs.openbsd.org 2017/12/04 06:38:11 Modified files: www/youtube-dl : Makefile distinfo www/youtube-dl/pkg: PLIST Log message: Update to youtube-dl 2017.11.26 >From Klemens Nanni that also moved this port to py3, thank you! OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2017/12/04 06:10:07 Modified files: devel/quirks/files: Quirks.pm Log message: quirk for p5-WWW-YouTube-Download -> "not useful", from Mikolaj Kucharski
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2017/12/04 06:09:07 Modified files: www: Makefile Removed files: www/p5-WWW-YouTube-Download: Makefile distinfo www/p5-WWW-YouTube-Download/pkg: DESCR PLIST Log message: remove www/p5-WWW-YouTube-Download, req'd by maintainer Mikolaj Kucharski
Re: [UPDATE] sysutils/py-psutil
On 2017/12/04 12:19, Landry Breuil wrote: > On Mon, Dec 04, 2017 at 09:39:19AM +0100, Remi Pointel wrote: > > Hi, > > > > this is the diff to update py-psutil to latest release. > > > > Ok? > > Tests fails here: > > Error in atexit._run_exitfuncs: > Traceback (most recent call last): > File "/usr/local/lib/python2.7/atexit.py", line 24, in _run_exitfuncs > func(*targs, **kargs) > File > "/home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1/psutil/tests/__init__.py", > line 196, in _cleanup_files > if name.startswith(u(TESTFILE_PREFIX)): > UnicodeDecodeError: 'ascii' codec can't decode byte 0xc0 in position 8: > ordinal not in range(128) > Error in sys.exitfunc: > Traceback (most recent call last): > File "/usr/local/lib/python2.7/atexit.py", line 24, in _run_exitfuncs > func(*targs, **kargs) > File > "/home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1/psutil/tests/__init__.py", > line 196, in _cleanup_files > if name.startswith(u(TESTFILE_PREFIX)): > UnicodeDecodeError: 'ascii' codec can't decode byte 0xc0 in position 8: > ordinal not in range(128) > *** Error 1 in . (/home/ports/lang/python/python.port.mk:197 'do-test': @cd > /home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1 && /usr/bi...) > > Unicode sucks donkey balls, as usual. > If I try with py27 they seem to run OK: Ran 511 tests in 7.972s FAILED (failures=5, errors=2, skipped=271) If I use a version of Python which isn't long dead, they work. Then they work again. And again, and again, and again. I haven't yet discovered if they ever finish...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2017/12/04 04:52:27 Modified files: converters/k2pdfopt: Makefile Added files: converters/k2pdfopt/patches: patch-leptonica_mod_allheaders_h Log message: Fix build with newer leptonica. breakage reported by nigel@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2017/12/04 04:52:04 Modified files: graphics/leptonica: Makefile Log message: Bump autoconf version to 2.69.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2017/12/04 04:38:47 Modified files: sysutils/libscca: Makefile Log message: Picks up xgettext(1) if present, so add BDEP on devel/gettext-tools.
Re: [UPDATE] sysutils/py-psutil
On Mon, Dec 04, 2017 at 09:39:19AM +0100, Remi Pointel wrote: > Hi, > > this is the diff to update py-psutil to latest release. > > Ok? Tests fails here: Error in atexit._run_exitfuncs: Traceback (most recent call last): File "/usr/local/lib/python2.7/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1/psutil/tests/__init__.py", line 196, in _cleanup_files if name.startswith(u(TESTFILE_PREFIX)): UnicodeDecodeError: 'ascii' codec can't decode byte 0xc0 in position 8: ordinal not in range(128) Error in sys.exitfunc: Traceback (most recent call last): File "/usr/local/lib/python2.7/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1/psutil/tests/__init__.py", line 196, in _cleanup_files if name.startswith(u(TESTFILE_PREFIX)): UnicodeDecodeError: 'ascii' codec can't decode byte 0xc0 in position 8: ordinal not in range(128) *** Error 1 in . (/home/ports/lang/python/python.port.mk:197 'do-test': @cd /home/ports/pobj/py-psutil-5.4.1/psutil-release-5.4.1 && /usr/bi...) Unicode sucks donkey balls, as usual.
Re: [UPDATE] www/youtube-dl 2017.10.07 -> 2017.11.26
On 2017/12/04 11:44, Paul Irofti wrote: > > Regarding your regression tests changes, what were the results before > switching to py3? It was in an earlier mail - py2: > > > FAILED (errors=568, failures=333) py3: > > FAILED (errors=563, failures=326)
net/rrdtool: fix for #794 - "rrdtool creates folders/files with arbitrary permissions"
Hi, Starting to use collectd, I had trouble when launching the rc-script for the first time. Lot of errors of file permissions occured (I ran it unprivilegied). I investigate the problem, and ends in rrdtool. There were no errors when collectd was ran as root. But in both cases, the file permissions are wierd (but not exactly the same, here when ran as root): # find /var/collectd -ls ... 2338634 drwxr-xr-x2 root _collectd 512 Dec 4 11:29 /var/collectd/clyde/interface-bge0 233867 640 rw-rw-1 root _collectd 295232 Dec 4 11:29 /var/collectd/clyde/interface-bge0/if_errors.rrd 233868 640 rw-rw-1 root _collectd 295232 Dec 4 11:29 /var/collectd/clyde/interface-bge0/if_packets.rrd 233865 640 rw-rw-1 root _collectd 295232 Dec 4 11:29 /var/collectd/clyde/interface-bge0/if_octets.rrd 2338664 d--xrwxrwx2 root _collectd 512 Dec 4 11:29 /var/collectd/clyde/memory 233870 292 rw-rw-1 root _collectd 148648 Dec 4 11:29 /var/collectd/clyde/memory/memory-inactive.rrd ... The issue is known, and is already corrected upstream (but not released). ISSUE: "Regression: rrdtool creates folders/files with arbitrary permissions" https://github.com/oetiker/rrdtool-1.x/issues/794 FIX: "Remove all occurances of umask ... this is NOT thread safe! Fix for #794" https://github.com/oetiker/rrdtool-1.x/commit/f1edd121add94fe69ac22d991748d289b5eb76ae The following diff is the fix applied on 1.7.0. I encourage people to check the file permissions of their files, specially if first usage was done using 1.7.0, as files could be world readable/writable. Thanks. -- Sebastien Marie Index: Makefile === RCS file: /cvs/ports/net/rrdtool/Makefile,v retrieving revision 1.106 diff -u -p -r1.106 Makefile --- Makefile2 Nov 2017 21:51:59 - 1.106 +++ Makefile4 Dec 2017 10:12:25 - @@ -12,7 +12,7 @@ PKGNAME-main= ${DISTNAME} PKGNAME-update=rrdupdate-${VERSION} PKGNAME-python= py-rrd-${VERSION} PKGNAME-ruby= ruby${MODRUBY_BINREV}-rrd-${VERSION} -REVISION-main= 1 +REVISION-main= 2 REVISION-update= 0 SHARED_LIBS += rrd 5.2 # 9.0 Index: patches/patch-doc_rrdcreate_pod === RCS file: patches/patch-doc_rrdcreate_pod diff -N patches/patch-doc_rrdcreate_pod --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-doc_rrdcreate_pod 4 Dec 2017 10:12:25 - @@ -0,0 +1,19 @@ +$OpenBSD$ +Fix for https://github.com/oetiker/rrdtool-1.x/issues/794 +https://github.com/oetiker/rrdtool-1.x/commit/f1edd121add94fe69ac22d991748d289b5eb76ae +Index: doc/rrdcreate.pod +--- doc/rrdcreate.pod.orig doc/rrdcreate.pod +@@ -743,6 +743,12 @@ divides each PDP of the AccumDuration by the correspon + TotalRequests and stores the average request duration. The remainder of the + RPN expression handles the divide by zero case. + ++=head1 SECURITY ++ ++Note that new rrd files will have the permission 0622 regarless of your ++umask setting. If a file with the same name previously exists, its ++permission settings will be copied to the new file. ++ + =head1 AUTHORS + + Tobias Oetiker Et...@oetiker.che, Peter Stamfest Epe...@stamfest.ate Index: patches/patch-src_rrd_create_c === RCS file: patches/patch-src_rrd_create_c diff -N patches/patch-src_rrd_create_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_rrd_create_c 4 Dec 2017 10:12:25 - @@ -0,0 +1,56 @@ +$OpenBSD$ +Fix for https://github.com/oetiker/rrdtool-1.x/issues/794 +https://github.com/oetiker/rrdtool-1.x/commit/f1edd121add94fe69ac22d991748d289b5eb76ae +Index: src/rrd_create.c +--- src/rrd_create.c.orig src/rrd_create.c +@@ -4,6 +4,7 @@ + * rrd_create.c creates new rrds + */ + ++#include "mutex.h" + #include + #include + #include +@@ -1313,10 +1314,10 @@ done: + return rc; + } + ++ + int write_rrd(const char *outfilename, rrd_t *out) { + int rc = -1; + char *tmpfilename = NULL; +-mode_t saved_umask; + + /* write out the new file */ + #ifdef HAVE_LIBRADOS +@@ -1341,10 +1342,10 @@ int write_rrd(const char *outfilename, rrd_t *out) { + strcpy(tmpfilename, outfilename); + strcat(tmpfilename, "XX"); + +- /* fix CWE-377 */ +- saved_umask = umask(S_IRUSR|S_IWUSR); ++ /* this is 0600 according to the manual page */ + int tmpfd = mkstemp(tmpfilename); +- umask(saved_umask); ++ ++ + if (tmpfd < 0) { + rrd_set_error("Cannot create temporary file"); + goto done; +@@ -1377,13 +1378,8 @@ int write_rrd(const char *outfilename, rrd_t *out) { + stat_buf.st_mode = _S_IREAD | _S_IWRITE; // have to test it is + #else + /* an
[Update] pinentry 1.1.0
Hi, Small diff to update pinentry to it's latest versin (1.1.0). Tested @amd64 with gnupg 2.2.3. Comments, ok ? Regards, Index: Makefile === RCS file: /cvs/ports/security/pinentry/Makefile,v retrieving revision 1.21 diff -u -p -u -p -r1.21 Makefile --- Makefile 28 Jul 2017 09:20:19 - 1.21 +++ Makefile 4 Dec 2017 09:13:31 - @@ -4,7 +4,7 @@ COMMENT-main = PIN or passphrase entry COMMENT-gtk2 = PIN or passphrase entry dialog (gtk2 interface) COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface) -VERSION = 1.0.0 +VERSION = 1.1.0 DISTNAME = pinentry-${VERSION} CATEGORIES = security EXTRACT_SUFX = .tar.bz2 @@ -25,7 +25,7 @@ PERMIT_PACKAGE_CDROM = Yes MULTI_PACKAGES = -main -gtk2 -gnome3 WANTLIB += c assuan gio-2.0 glib-2.0 gobject-2.0 gpg-error iconv intl -WANTLIB += ncursesw secret-1 +WANTLIB += curses secret-1 LIB_DEPENDS = security/libassuan \ x11/gnome/libsecret Index: distinfo === RCS file: /cvs/ports/security/pinentry/distinfo,v retrieving revision 1.6 diff -u -p -u -p -r1.6 distinfo --- distinfo 28 Jul 2017 09:20:19 - 1.6 +++ distinfo 4 Dec 2017 09:13:31 - @@ -1,2 +1,2 @@ -SHA256 (pinentry-1.0.0.tar.bz2) = FnLC7cH+sDYHWxh8B3N4eyr9BUT1UCXGRacbTC95J1o= -SIZE (pinentry-1.0.0.tar.bz2) = 436930 +SHA256 (pinentry-1.1.0.tar.bz2) = aAdmhvpySikOpJzfDRwMFQCQfRt1mjvL++wCk+j1ZXA= +SIZE (pinentry-1.1.0.tar.bz2) = 467702
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2017/12/04 02:00:16 Modified files: security/pdfid : Makefile distinfo Log message: update pdfid to 0.2.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2017/12/04 01:56:38 Modified files: multimedia/x265: Makefile distinfo Log message: Update to x265-2.6. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2017/12/04 01:55:43 Modified files: mail/gmime30 : Makefile distinfo Log message: Update to gmime30-3.0.5.
[UPDATE] sysutils/py-psutil
Hi, this is the diff to update py-psutil to latest release. Ok? Cheers, Remi. Index: Makefile === RCS file: /cvs/ports/sysutils/py-psutil/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- Makefile 13 Jan 2017 12:44:28 - 1.8 +++ Makefile 4 Dec 2017 08:38:15 - @@ -2,14 +2,13 @@ COMMENT = library to retrieve system information and utilisation -MODPY_EGG_VERSION = 4.4.2 +MODPY_EGG_VERSION = 5.4.1 GH_ACCOUNT = giampaolo GH_PROJECT = psutil GH_TAGNAME = release-${MODPY_EGG_VERSION} DISTNAME = psutil-${MODPY_EGG_VERSION} PKGNAME = py-psutil-${MODPY_EGG_VERSION} CATEGORIES = sysutils -REVISION = 0 HOMEPAGE = https://github.com/giampaolo/psutil @@ -29,8 +28,5 @@ FLAVOR ?= .if ! ${FLAVOR:Mpython3} TEST_DEPENDS += net/py-ipaddress${MODPY_FLAVOR} .endif - -do-test: - cd ${WRKSRC}; ${MODPY_BIN} psutil/tests/runner.py .include Index: distinfo === RCS file: /cvs/ports/sysutils/py-psutil/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo 1 Nov 2016 16:38:27 - 1.4 +++ distinfo 4 Dec 2017 08:38:15 - @@ -1,2 +1,2 @@ -SHA256 (psutil-4.4.2.tar.gz) = VpsGHjiS4gcGSr6wD6Dd/vfHKmYbPlOWSVyW0PYvbAI= -SIZE (psutil-4.4.2.tar.gz) = 1825011 +SHA256 (psutil-5.4.1.tar.gz) = ykGIXYa7p9ZauM4c2qX1zMr3v05b60taLuno3rg227o= +SIZE (psutil-5.4.1.tar.gz) = 1910111 Index: patches/patch-psutil_tests___init___py === RCS file: /cvs/ports/sysutils/py-psutil/patches/patch-psutil_tests___init___py,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-psutil_tests___init___py --- patches/patch-psutil_tests___init___py 1 Nov 2016 16:38:27 - 1.2 +++ patches/patch-psutil_tests___init___py 4 Dec 2017 08:38:15 - @@ -1,13 +1,14 @@ $OpenBSD: patch-psutil_tests___init___py,v 1.2 2016/11/01 16:38:27 landry Exp $ the scripts/ subdir is only present in the tarball, not on the system psutil/tests/__init__.py.orig Wed Oct 5 14:16:05 2016 -+++ psutil/tests/__init__.py Tue Nov 1 16:51:06 2016 -@@ -118,7 +118,7 @@ PYPY = '__pypy__' in sys.builtin_module_names +Index: psutil/tests/__init__.py +--- psutil/tests/__init__.py.orig psutil/tests/__init__.py +@@ -143,7 +143,7 @@ ASCII_FS = sys.getfilesystemencoding().lower() in ('as + # --- paths - ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), - '..', '..')) + ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) -SCRIPTS_DIR = os.path.join(ROOT_DIR, 'scripts') +SCRIPTS_DIR = 'scripts' + HERE = os.path.abspath(os.path.dirname(__file__)) - WIN_VISTA = (6, 0, 0) if WINDOWS else None - VALID_PROC_STATUSES = [getattr(psutil, x) for x in dir(psutil) + # --- support Index: pkg/PLIST === RCS file: /cvs/ports/sysutils/py-psutil/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 31 Aug 2016 12:44:52 - 1.3 +++ pkg/PLIST 4 Dec 2017 08:38:15 - @@ -4,12 +4,14 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt +lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/psutil/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_common.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_psaix.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_psbsd.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_pslinux.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_psosx.${MODPY_PYC_MAGIC_TAG}pyc @@ -18,6 +20,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_pswindows.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/psutil/_common.py lib/python${MODPY_VERSION}/site-packages/psutil/_compat.py +lib/python${MODPY_VERSION}/site-packages/psutil/_psaix.py
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2017/12/04 01:35:50 Modified files: databases : Makefile Log message: + SUBDIR += py-sql,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2017/12/04 01:35:10 Modified files: databases/py-sql: Makefile distinfo databases/py-sql/pkg: PLIST Log message: update py-sql to 0.9 and enable python3 flavor. from semarie@.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2017/12/04 01:04:15 Modified files: databases/puppetdb5: Makefile distinfo Log message: Minor update to 5.1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2017/12/04 01:04:58 Modified files: sysutils/ruby-puppet/5: Makefile distinfo Log message: Minor update to 5.3.3