Re: devel/llvm: python flavor: lib_depends on exact llvm version
On Thu, Apr 12, 2018 at 09:33:59AM +0200, Sebastien Marie wrote: > Hi, > > From time to time, when trying to build devel/llvm from ports while > another version is already installed, I am facing dependency problem on > python flavor when packaging it. > > $ cd /usr/ports/lang/rust && make > ===> rust-1.25.0p0 depends on: llvm->=6.0,<6.1 - not found > ===> Verifying install for llvm->=6.0,<6.1 in devel/llvm > `/home/openbsd/pobj/llvm-6.0.0/fake-i386/.fake_done' is up to date. > ===> Building package for py-llvm-6.0.0 > Create /usr/ports/packages/i386/all/py-llvm-6.0.0.tgz > Creating package py-llvm-6.0.0 > |library clang.7.0 not found > | /usr/local/lib/libclang.so.6.0 (llvm-5.0.1p2): bad major > Direct dependencies for py-llvm-6.0.0 resolve to llvm-5.0.1p2 python-2.7.14p1 > Full dependency tree is gtest-1.8.0p2 gettext-0.19.8.1p1 libffi-3.2.1p4 > sqlite3-3.22.0p0 python-2.7.14p1 llvm-5.0.1p2 libiconv-1.14p3 bzip2-1.0.6p8 > Fatal error: can't continue > ... > > > I think the reason is LIB_DEPENDS-python depends on any llvm version, > and as I already one installed (here llvm-5.0.1p2), it choose with the > wrong one. I've recently experienced the same issue, so i'd welcome this fix.
Re: py-test and friends
On 04/11, Stuart Henderson wrote: > Other than that it reads well but for ease of testing would you mind > sending a new diff from a common parent directory so it can be applied in > one go please? They're all in devel/, so this would work: > > cd /usr/ports/devel > cvs diff py-attrs py-hypothesis py-pluggy py-py py-setuptools_scm py-six > py-test Please find the updated diff attached. -- With best regards, Pavel Korovin Index: py-attrs/Makefile === RCS file: /cvs/ports/devel/py-attrs/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- py-attrs/Makefile 6 May 2017 09:43:59 - 1.1.1.1 +++ py-attrs/Makefile 12 Apr 2018 07:02:59 - @@ -2,7 +2,7 @@ COMMENT = classes without boilerplate -MODPY_EGG_VERSION =16.3.0 +MODPY_EGG_VERSION =17.4.0 DISTNAME = attrs-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} @@ -19,14 +19,12 @@ MODPY_PI = Yes MODPY_SETUPTOOLS = Yes TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \ - devel/py-test${MODPY_FLAVOR} + devel/py-six${MODPY_FLAVOR} \ + devel/py-test${MODPY_FLAVOR} \ + devel/py-zopeinterface${MODPY_FLAVOR} FLAVORS = python3 FLAVOR ?= - -.if ${FLAVOR:Mpython3} -TEST_DEPENDS +=devel/py-zopeinterface${MODPY_FLAVOR} -.endif TEST_ENV +=PYTHONPATH=${WRKSRC}/lib Index: py-attrs/distinfo === RCS file: /cvs/ports/devel/py-attrs/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- py-attrs/distinfo 6 May 2017 09:43:59 - 1.1.1.1 +++ py-attrs/distinfo 12 Apr 2018 07:02:59 - @@ -1,2 +1,2 @@ -SHA256 (attrs-16.3.0.tar.gz) = gCAxd3I+NvO74VqoVT2m6A1Hv+U2RyIMyqmtel5HPMw= -SIZE (attrs-16.3.0.tar.gz) = 57512 +SHA256 (attrs-17.4.0.tar.gz) = HHlgzP1qAFzZ97qITmMWteQwo/Gmw3xfh9i0P4O1Tsk= +SIZE (attrs-17.4.0.tar.gz) = 97071 Index: py-attrs/pkg/PLIST === RCS file: /cvs/ports/devel/py-attrs/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- py-attrs/pkg/PLIST 6 May 2017 09:43:59 - 1.1.1.1 +++ py-attrs/pkg/PLIST 12 Apr 2018 07:02:59 - @@ -7,6 +7,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc @@ -14,6 +15,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/attr/_config.py lib/python${MODPY_VERSION}/site-packages/attr/_funcs.py lib/python${MODPY_VERSION}/site-packages/attr/_make.py +lib/python${MODPY_VERSION}/site-packages/attr/converters.py lib/python${MODPY_VERSION}/site-packages/attr/exceptions.py lib/python${MODPY_VERSION}/site-packages/attr/filters.py lib/python${MODPY_VERSION}/site-packages/attr/validators.py @@ -22,4 +24,5 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe +lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt Index: py-hypothesis/Makefile === RCS file: /cvs/ports/devel/py-hypothesis/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- py-hypothesis/Makefile 24 Jun 2017 07:48:34 - 1.15 +++ py-hypothesis/Makefile 12 Apr 2018 07:02:59 - @@ -2,7 +2,7 @@ COMMENT = library for property based testing -MODPY_EGG_VERSION =3.11.6 +MODPY_EGG_VERSION =3.55.1 DISTNAME = hypothesis-${MODPY_EGG_VERSION} PKGNAME = py-hypothesis-${MODPY_EGG_VERSION} CATEGORIES = devel @@ -21,6 +21,9 @@ MODPY_SETUPTOOLS =Yes FLAVORS = python3 FLAVOR ?= + +RUN_DEPENDS = devel/py-attrs${MODPY_FLAVOR}
Re: UPDATE: graphics/farbfeld 3 -> 4
On Thu, Apr 12, 2018 at 01:52:48AM +0100, Kaashif Hymabaccus wrote: > This is an update to graphics/farbfeld. The main change to the port is > that USE_GMAKE isn't needed any more. > > Works fine for me on amd64 (converted some images to ff and back, > still seems to work). Can you provide a simple do-install and drop patch-Makefile instead? This was recently done for x11/{dmenu,st} as well. This would be reasonably simpler and keep suckless ports somewhat consistent across the tree.
Re: [PATCH] www/goaccess: drop Tokyo Cabinet storage support
On Thu, Apr 12, 2018 at 08:18:54AM +0300, Kirill Bychkov wrote: > >> > I'm not a fan of unnecessary flavours in ports, but I think this might > >> > be a case where it makes sense? > >> > >> I would like it if there was a non-tokyo flavor. It has only ever > >> caused problems for me. That said, I am not a very heavy user of it! > > > > I would suggest using a flavour to _enable_ tokyocabinet rather than > > on-by-default. Maybe with a quick explanation why one might want to > > use it in DESCR. > > > > > Hi! > Does it look good? Looks good to me, with a small nitpick: > -WANTLIB += GeoIP bz2 c ncursesw pthread tokyocabinet z > +WANTLIB += GeoIP bz2 c curses pthread z bz2 and z are only needed for the tokyocabinet flavor. OK fcambus@ with this change. Thanks for taking care of it!
devel/llvm: python flavor: lib_depends on exact llvm version
Hi, >From time to time, when trying to build devel/llvm from ports while another version is already installed, I am facing dependency problem on python flavor when packaging it. $ cd /usr/ports/lang/rust && make ===> rust-1.25.0p0 depends on: llvm->=6.0,<6.1 - not found ===> Verifying install for llvm->=6.0,<6.1 in devel/llvm `/home/openbsd/pobj/llvm-6.0.0/fake-i386/.fake_done' is up to date. ===> Building package for py-llvm-6.0.0 Create /usr/ports/packages/i386/all/py-llvm-6.0.0.tgz Creating package py-llvm-6.0.0 |library clang.7.0 not found | /usr/local/lib/libclang.so.6.0 (llvm-5.0.1p2): bad major Direct dependencies for py-llvm-6.0.0 resolve to llvm-5.0.1p2 python-2.7.14p1 Full dependency tree is gtest-1.8.0p2 gettext-0.19.8.1p1 libffi-3.2.1p4 sqlite3-3.22.0p0 python-2.7.14p1 llvm-5.0.1p2 libiconv-1.14p3 bzip2-1.0.6p8 Fatal error: can't continue ... I think the reason is LIB_DEPENDS-python depends on any llvm version, and as I already one installed (here llvm-5.0.1p2), it choose with the wrong one. $ cd /usr/ports/devel/llvm && make show=LIB_DEPENDS-python devel/llvm,,-main The following diff makes LIB_DEPENDS-python to explicitly pin the right version, and it seems to solve my dependency problem as py-llvm-6.0.0 is packaged. After applying it: $ cd /usr/ports/devel/llvm && make show=LIB_DEPENDS-python llvm-6.0.0:devel/llvm,,-main $ cd /usr/ports/lang/rust && make ===> rust-1.25.0p0 depends on: llvm->=6.0,<6.1 - not found ===> Verifying install for llvm->=6.0,<6.1 in devel/llvm `/home/openbsd/pobj/llvm-6.0.0/fake-i386/.fake_done' is up to date. ===> Building package for py-llvm-6.0.0 Create /usr/ports/packages/i386/all/py-llvm-6.0.0.tgz Creating package py-llvm-6.0.0 Link to /usr/ports/packages/i386/ftp/py-llvm-6.0.0.tgz Link to /usr/ports/packages/i386/cdrom/py-llvm-6.0.0.tgz ===> Cleaning for llvm-6.0.0 ===> llvm-6.0.0 depends on: gtest-* -> gtest-1.8.0p2 ===> llvm-6.0.0 depends on: python->=2.7,<2.8 -> python-2.7.14p1 ===> llvm-6.0.0 depends on: py-sphinx-* -> py-sphinx-1.4.8p0 ===> llvm-6.0.0 depends on: cmake-* -> cmake-3.10.2 ===> llvm-6.0.0 depends on: ninja->=1.5.1 -> ninja-1.8.2 ===> llvm-6.0.0 depends on: xz-* -> xz-5.2.3p0 ===> Verifying specs: c++ c++abi pthread c m pthread z ===> found c++.1.0 c++abi.0.0 pthread.25.1 c.92.3 m.10.1 z.5.0 ===> Installing llvm-6.0.0 from /usr/ports/packages/i386/all/ llvm-5.0.1p2->6.0.0: ok Read shared items: ok ===> Returning to build of rust-1.25.0p0 ===> rust-1.25.0p0 depends on: llvm->=6.0,<6.1 -> llvm-6.0.0 ... Index: Makefile === RCS file: /cvs/ports/devel/llvm/Makefile,v retrieving revision 1.174 diff -u -p -r1.174 Makefile --- Makefile7 Apr 2018 14:55:42 - 1.174 +++ Makefile12 Apr 2018 07:25:48 - @@ -51,7 +51,7 @@ RUN_DEPENDS +=devel/gtest # clang python module loads libclang.so dynamically with cdll.LoadLibrary() WANTLIB-python = clang RUN_DEPENDS-python = ${MODPY_RUN_DEPENDS} -LIB_DEPENDS-python = ${BUILD_PKGPATH},-main +LIB_DEPENDS-python = ${FULLPKGNAME-main}:${BUILD_PKGPATH},-main SEPARATE_BUILD = Yes CONFIGURE_ARGS = -DLLVM_ENABLE_FFI:Bool=False \ Thanks. -- Sebastien Marie
Re: [PATCH] www/goaccess: drop Tokyo Cabinet storage support
On Thu, April 12, 2018 11:20, Frederic Cambus wrote: > On Thu, Apr 12, 2018 at 08:18:54AM +0300, Kirill Bychkov wrote: > >> >> > I'm not a fan of unnecessary flavours in ports, but I think this might >> >> > be a case where it makes sense? >> >> >> >> I would like it if there was a non-tokyo flavor. It has only ever >> >> caused problems for me. That said, I am not a very heavy user of it! >> > >> > I would suggest using a flavour to _enable_ tokyocabinet rather than >> > on-by-default. Maybe with a quick explanation why one might want to >> > use it in DESCR. >> > >> > >> Hi! >> Does it look good? > > Looks good to me, with a small nitpick: > >> -WANTLIB += GeoIP bz2 c ncursesw pthread tokyocabinet z >> +WANTLIB += GeoIP bz2 c curses pthread z > > bz2 and z are only needed for the tokyocabinet flavor. Fixed, thanks! > > OK fcambus@ with this change. Thanks for taking care of it! >
Re: clang 6 fix security/steghide
On Wed, Apr 11 2018, Matthew Martinwrote: > On Wed, Apr 11, 2018 at 01:48:29PM +0200, Jeremie Courreges-Anglas wrote: >> On Wed, Apr 11 2018, Giovanni Bechis wrote: >> > On 04/11/18 05:16, Matthew Martin wrote: >> >> On Tue, Apr 10, 2018 at 04:44:56PM +0200, Giovanni Bechis wrote: >> >>> test.log run on 6.3 attached, does it differs from yours ? >> >>> Cheers >> >>> Giovanni >> >> >> >> Not meaningfully. Thanks for the log. >> >> >> >> - Matthew Martin >> >> >> > Ok for me if it still works then. >> > I cannot commit nor switch to clang6 before next week. >> >> I would gladly commit it, but as-is the diff would break non-clang >> platforms. Maybe an ifdef check would be enough. > > How about this then? Just tell clang to compile as c++03. Regarding the Makefile part: - CXXFLAGS would be clobbered, which isn't good; we only want to add -std=... to CXXFLAGS - the PROPERTIES test is wrong IMO, the check should be done against the compiler actually used. But since there are lots of such checks already in the tree, let's at least be consistently wrong :) Regarding the configure.in patch: - the configure should *prepend* to CXXFLAGS, not append; the user's choices should be respected - -O2 should not be hardcoded, let's just remove it. Even if the ports tree didn't pass -O2, autotools would add it by default. Updated patch below, Index: Makefile === RCS file: /cvs/ports/security/steghide/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile21 Nov 2017 00:13:03 - 1.14 +++ Makefile12 Apr 2018 11:49:23 - @@ -3,7 +3,7 @@ COMMENT = software able to hide data in various kind of files DISTNAME = steghide-0.5.1 -REVISION = 4 +REVISION = 5 CATEGORIES = security HOMEPAGE = http://steghide.sf.net/ @@ -20,9 +20,14 @@ LIB_DEPENDS =devel/gettext \ security/mhash \ graphics/jpeg WANTLIB = c iconv intl jpeg m mhash mcrypt ${COMPILER_LIBCXX} z -CONFIGURE_STYLE = gnu +CONFIGURE_STYLE = autoconf +AUTOCONF_VERSION = 2.57 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl" +.include +.if ${PROPERTIES:Mclang} +CXXFLAGS +=-std=c++03 +.endif .include Index: patches/patch-configure_in === RCS file: patches/patch-configure_in diff -N patches/patch-configure_in --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-configure_in 12 Apr 2018 11:48:15 - @@ -0,0 +1,31 @@ +$OpenBSD$ + +Index: configure.in +--- configure.in.orig configure.in +@@ -15,6 +15,9 @@ AC_CHECK_FUNCS(strchr) + AM_GNU_GETTEXT + AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes) + ++dnl compiler warnings ++CXXFLAGS="-Wall $CXXFLAGS" ++ + dnl check if debugging support is requested + AC_MSG_CHECKING([wether to enable debugging]) + AC_ARG_ENABLE(debug,[ --enable-debug enable debugging], +@@ -22,14 +25,12 @@ AC_ARG_ENABLE(debug,[ --enable-debug enable + then + AC_MSG_RESULT([yes]) + AC_DEFINE(DEBUG,1,[enable code used only for debugging]) +- CXXFLAGS="-O2 -Wall -g" ++ CXXFLAGS="-g $CXXFLAGS" + else + AC_MSG_RESULT([no]) +- CXXFLAGS="-O2 -Wall" + fi + , + AC_MSG_RESULT([no]) +- CXXFLAGS="-O2 -Wall" + ) + + dnl check if randomness should be disabled -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: devel/py-certifi
On 2018/04/12 16:33, Pavel Korovin wrote: > Dear all, > > Please find the update for devel/py-certifi to current 2018.1.18. > Added NO_TEST=Yes since there are no tests there. Please only use NO_TEST if there are no tests and it fails, for these where it succeeds but runs 0 tests it's better to keep them, maybe some tests will be added later.
Re: japanese/Wnn: remove jgroff dependency
Hi, > - Somebody please check whether installing EUC is *really* still >important. As soon as it is confirmed that it is not, stop >doing so. But don't let that delay this cleanup. I don't think installing EUC is needed. Even if people is still using EUC terminal, they can use MANPAGER=jless to see the UTF-8 manuals. Since our jless started support both EUC and UTF-8, so both env MANPATH=/usr/local/man/ja MANPAGER=jless env MANPATH=/usr/local/man/ja_JP.EUC MANPAGER=jless will show the same result. Also theoretically there may be conversion problems between EUC and UTF-8, but I think it's no problem if we fix them when we hit such problems. On Wed, 11 Apr 2018 15:22:05 +0200 Ingo Schwarzewrote: > Hi Anthony, > > almost identical comments like for canna: > > - Somebody please check whether installing EUC is *really* still >important. As soon as it is confirmed that it is not, stop >doing so. But don't let that delay this cleanup. > - In the Makefile, i suggest to prefer "mandoc -Tutf8" >over "LC_CTYPE=en_US.UTF-8 mandoc". > - make update-plist tells me that you may want to consider >something like the patch below, to be applied on top of what >you already have. > > Unless you hear objections, i think you should go ahead. > > Yours, > Ingo > > > --- PLIST-main.orig Wed Apr 11 14:56:29 2018 > +++ PLIST-mainWed Apr 11 15:03:41 2018 > @@ -1,21 +1,21 @@ > @comment $OpenBSD: PLIST-main,v 1.2 2012/01/26 08:03:56 ajacoutot Exp $ > -@newuser _wnn:517:bin:daemon:Wnn server:/nonexistent:/sbin/nologin > @pkgpath japanese/Wnn > -bin/atod > -bin/atof > -bin/dtoa > -bin/jserver > -bin/oldatonewa > +@newuser _wnn:517:bin:daemon:Wnn server:/nonexistent:/sbin/nologin > +@bin bin/atod > +@bin bin/atof > +@bin bin/dtoa > +@bin bin/jserver > +@bin bin/oldatonewa > @mode u+s > @owner root > -bin/uum > +@bin bin/uum > @mode > @owner > -bin/wddel > -bin/wdreg > -bin/wnnkill > -bin/wnnstat > -bin/wnntouch > +@bin bin/wddel > +@bin bin/wdreg > +@bin bin/wnnkill > +@bin bin/wnnstat > +@bin bin/wnntouch > include/wnn/ > include/wnn/commonhd.h > include/wnn/config.h > @@ -87,6 +87,8 @@ > lib/wnn/lt_LN/uumkey > lib/wnn/lt_LN/uumkey_e > lib/wnn/lt_LN/uumrc > +man/ja/ > +man/ja/man1/ > @man man/ja/man1/atod.1 > @man man/ja/man1/atof.1 > @man man/ja/man1/dtoa.1 > @@ -98,6 +100,7 @@ > @man man/ja/man1/wnnkill.1 > @man man/ja/man1/wnnstat.1 > @man man/ja/man1/wnntouch.1 > +man/ja/man3/ > @man man/ja/man3/jl_bun_suu.3 > @man man/ja/man3/jl_c_zenkouho.3 > @man man/ja/man3/jl_close.3 > @@ -256,6 +259,7 @@ > @man man/ja/man3/romkan_init.3 > @man man/ja/man3/romkan_next.3 > @man man/ja/man3/romkan_ungetc.3 > +man/ja/man4/ > @man man/ja/man4/2a_ctrl.4 > @man man/ja/man4/2b_romkana.4 > @man man/ja/man4/cvt_key_tbl.4 > @@ -269,6 +273,7 @@ > @man man/ja/man4/uumkey.4 > @man man/ja/man4/uumrc.4 > @man man/ja/man4/wnnenvrc.4 > +man/ja/man5/ > @man man/ja/man5/pubdic.5 > @man man/ja/man5/usr_dic.5 > @man man/ja_JP.EUC/cat1/atod.0 > @@ -708,6 +713,8 @@ > share/doc/ja-Wnn/manual/7.Protocol/ > share/doc/ja-Wnn/manual/7.Protocol/KKTP > share/doc/ja-Wnn/manual/intro > +@comment share/doc/ja-Wnn/manual/intro.orig > share/doc/ja-Wnn/manual/v3tov4/ > share/doc/ja-Wnn/manual/v3tov4/v3tov4 > +@comment share/doc/ja-Wnn/manual/v3tov4/v3tov4.orig > @exec ${WNNBASE}/lib/wnn/install-script > --- PLIST-xwnmo.orig Wed Apr 11 14:56:29 2018 > +++ PLIST-xwnmo Wed Apr 11 15:00:20 2018 > @@ -1,7 +1,7 @@ > @comment $OpenBSD: PLIST-xwnmo,v 1.2 2004/08/05 14:11:10 espie Exp $ > -bin/killxwnmo > -bin/xjutil > -bin/xwnmo > +@bin bin/killxwnmo > +@bin bin/xjutil > +@bin bin/xwnmo > lib/X11/app-defaults/Xwnmo > lib/wnn/cvt_xim_tbl > lib/wnn/ja_JP/uumkey.xim > --- PLIST-zh.orig Wed Apr 11 14:56:29 2018 > +++ PLIST-zh Wed Apr 11 15:00:20 2018 > @@ -1,19 +1,19 @@ > @comment $OpenBSD: PLIST-zh,v 1.10 2004/09/15 00:53:48 espie Exp $ > -bin/catod > -bin/catof > -bin/cdtoa > -bin/cserver > +@bin bin/catod > +@bin bin/catof > +@bin bin/cdtoa > +@bin bin/cserver > @mode u+s > @owner root > -bin/cuum > +@bin bin/cuum > @mode > @owner > -bin/cwddel > -bin/cwdreg > -bin/cwnnkill > -bin/cwnnstat > -bin/cwnntouch > -bin/tserver > +@bin bin/cwddel > +@bin bin/cwdreg > +@bin bin/cwnnkill > +@bin bin/cwnnstat > +@bin bin/cwnntouch > +@bin bin/tserver > include/cwnn/ > include/cwnn/commonhd.h > include/cwnn/cplib.h >
Re: UPDATE: devel/py-certifi
OK, no problem. Updated diff attached. On 04/12, Stuart Henderson wrote: > Please only use NO_TEST if there are no tests and it fails, for these > where it succeeds but runs 0 tests it's better to keep them, maybe some > tests will be added later. -- With best regards, Pavel Korovin Index: Makefile === RCS file: /cvs/ports/devel/py-certifi/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile14 May 2017 11:36:20 - 1.15 +++ Makefile12 Apr 2018 14:03:29 - @@ -2,7 +2,7 @@ COMMENT = Python package to check certificates using the OpenBSD CA -MODPY_EGG_VERSION =2017.4.17 +MODPY_EGG_VERSION =2018.1.18 DISTNAME = certifi-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = devel security Index: patches/patch-certifi_core_py === RCS file: /cvs/ports/devel/py-certifi/patches/patch-certifi_core_py,v retrieving revision 1.3 diff -u -p -r1.3 patch-certifi_core_py --- patches/patch-certifi_core_py 7 Feb 2016 15:32:28 - 1.3 +++ patches/patch-certifi_core_py 12 Apr 2018 14:03:29 - @@ -1,11 +1,12 @@ $OpenBSD: patch-certifi_core_py,v 1.3 2016/02/07 15:32:28 shadchin Exp $ certifi/core.py.orig Sun Sep 6 08:24:20 2015 -+++ certifi/core.pySun Jan 24 23:02:08 2016 +Index: certifi/core.py +--- certifi/core.py.orig certifi/core.py @@ -19,9 +19,7 @@ class DeprecatedBundleWarning(DeprecationWarning): def where(): --f = os.path.split(__file__)[0] +-f = os.path.dirname(__file__) - -return os.path.join(f, 'cacert.pem') +return '/etc/ssl/cert.pem' Index: patches/patch-setup_py === RCS file: /cvs/ports/devel/py-certifi/patches/patch-setup_py,v retrieving revision 1.3 diff -u -p -r1.3 patch-setup_py --- patches/patch-setup_py 4 Sep 2016 17:42:18 - 1.3 +++ patches/patch-setup_py 12 Apr 2018 14:03:29 - @@ -1,6 +1,7 @@ $OpenBSD: patch-setup_py,v 1.3 2016/09/04 17:42:18 czarkoff Exp $ setup.py.orig Tue Aug 2 10:00:36 2016 -+++ setup.py Sun Sep 4 19:38:25 2016 +Index: setup.py +--- setup.py.orig setup.py @@ -43,10 +43,6 @@ setup( packages=[ 'certifi', @@ -9,6 +10,6 @@ $OpenBSD: patch-setup_py,v 1.3 2016/09/0 -package_data={'certifi': ['*.pem']}, -# data_files=[('certifi', ['certifi/cacert.pem'])], -include_package_data=True, - license='ISC', + zip_safe=False, + license='MPL-2.0', classifiers=( - 'Development Status :: 5 - Production/Stable', Index: pkg/PLIST === RCS file: /cvs/ports/devel/py-certifi/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 15 Aug 2016 21:37:25 - 1.5 +++ pkg/PLIST 12 Apr 2018 14:03:29 - @@ -4,6 +4,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt +lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/certifi/__init__.py lib/python${MODPY_VERSION}/site-packages/certifi/__main__.py
UPDATE: devel/py-certifi
Dear all, Please find the update for devel/py-certifi to current 2018.1.18. Added NO_TEST=Yes since there are no tests there. -- With best regards, Pavel Korovin Index: Makefile === RCS file: /cvs/ports/devel/py-certifi/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile14 May 2017 11:36:20 - 1.15 +++ Makefile12 Apr 2018 13:27:31 - @@ -2,7 +2,7 @@ COMMENT = Python package to check certificates using the OpenBSD CA -MODPY_EGG_VERSION =2017.4.17 +MODPY_EGG_VERSION =2018.1.18 DISTNAME = certifi-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = devel security @@ -21,5 +21,7 @@ MODPY_SETUPTOOLS =Yes FLAVORS = python3 FLAVOR ?= + +NO_TEST = Yes .include Index: patches/patch-certifi_core_py === RCS file: /cvs/ports/devel/py-certifi/patches/patch-certifi_core_py,v retrieving revision 1.3 diff -u -p -r1.3 patch-certifi_core_py --- patches/patch-certifi_core_py 7 Feb 2016 15:32:28 - 1.3 +++ patches/patch-certifi_core_py 12 Apr 2018 13:27:31 - @@ -1,11 +1,12 @@ $OpenBSD: patch-certifi_core_py,v 1.3 2016/02/07 15:32:28 shadchin Exp $ certifi/core.py.orig Sun Sep 6 08:24:20 2015 -+++ certifi/core.pySun Jan 24 23:02:08 2016 +Index: certifi/core.py +--- certifi/core.py.orig certifi/core.py @@ -19,9 +19,7 @@ class DeprecatedBundleWarning(DeprecationWarning): def where(): --f = os.path.split(__file__)[0] +-f = os.path.dirname(__file__) - -return os.path.join(f, 'cacert.pem') +return '/etc/ssl/cert.pem' Index: patches/patch-setup_py === RCS file: /cvs/ports/devel/py-certifi/patches/patch-setup_py,v retrieving revision 1.3 diff -u -p -r1.3 patch-setup_py --- patches/patch-setup_py 4 Sep 2016 17:42:18 - 1.3 +++ patches/patch-setup_py 12 Apr 2018 13:27:31 - @@ -1,6 +1,7 @@ $OpenBSD: patch-setup_py,v 1.3 2016/09/04 17:42:18 czarkoff Exp $ setup.py.orig Tue Aug 2 10:00:36 2016 -+++ setup.py Sun Sep 4 19:38:25 2016 +Index: setup.py +--- setup.py.orig setup.py @@ -43,10 +43,6 @@ setup( packages=[ 'certifi', @@ -9,6 +10,6 @@ $OpenBSD: patch-setup_py,v 1.3 2016/09/0 -package_data={'certifi': ['*.pem']}, -# data_files=[('certifi', ['certifi/cacert.pem'])], -include_package_data=True, - license='ISC', + zip_safe=False, + license='MPL-2.0', classifiers=( - 'Development Status :: 5 - Production/Stable', Index: pkg/PLIST === RCS file: /cvs/ports/devel/py-certifi/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 15 Aug 2016 21:37:25 - 1.5 +++ pkg/PLIST 12 Apr 2018 13:27:31 - @@ -4,6 +4,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt +lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe lib/python${MODPY_VERSION}/site-packages/certifi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/certifi/__init__.py lib/python${MODPY_VERSION}/site-packages/certifi/__main__.py
Re: clang6 fallout
On 2018/04/12 15:03, Christian Weisgerber wrote: > Updated list as of Apr 12, 15:00 UTC: > > audio/caps-plugins > cad/kicad > comms/hylafax > databases/mysqlcc > databases/pgadmin3 > devel/avr/gcc > devel/ptlib > devel/qt-creator > devel/sdcc > emulators/BasiliskII > emulators/desmume > emulators/dgen-sdl > emulators/fceux! > emulators/frodo > emulators/nestopia > games/alephone/alephone > games/amoebax > games/blobby > games/dangerdeep > games/enigma > games/f1spirit > games/ja2-stracciatella > games/lostpixels > games/meandmyshadow > games/roadfighter > games/stepmania > games/sumwars > games/vegastrike/engine > games/warmux > games/xminehunter > geo/gpstk > graphics/animorph > graphics/discwrapper > graphics/rawstudio > inputmethods/scim-anthy > japanese/groff > java/jlint > mail/kopano/webapp > math/libqalculate > misc/openbabel > misc/xnc > multimedia/libmp4v2 > multimedia/swfmill > net/dxpc > net/kismet > net/mldonkey > net/mutella > net/nam > net/nepenthes > net/ns > news/pan > security/opensc > security/steghide > sysutils/facter > textproc/arabica > textproc/wkhtmltopdf > www/mongrel2 > x11/kde/libs3 > x11/qt4 > x11/xmonad > > -- > Christian "naddy" Weisgerber na...@mips.inka.de > There are some additional ones on i386, at least these: x11/fluxbox x11/icewm x11/treewm
UPDATE security/encfs
A newer version of encfs is available (1.9.4), which fixes some issues. Changelog can be found at https://github.com/vgough/encfs/releases Regression test (there is only 1 unit test) succeeds. Tested lightly on amd64. Comments/OKs? Index: Makefile === RCS file: /cvs/ports/security/encfs/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- Makefile19 Jan 2018 15:37:34 - 1.16 +++ Makefile12 Apr 2018 17:28:11 - @@ -4,7 +4,7 @@ BROKEN-powerpc =undefined reference to COMMENT = fuse-based cryptographic filesystem -V =1.9.2 +V =1.9.4 DISTNAME = encfs-$V CATEGORIES = security @@ -21,6 +21,7 @@ MASTER_SITES =https://github.com/vgoug COMPILER = base-clang ports-clang ports-gcc MODULES = devel/cmake +USE_NINJA =No BUILD_DEPENDS =devel/gettext-tools LIB_DEPENDS = devel/gettext \ textproc/tinyxml2 @@ -28,11 +29,6 @@ LIB_DEPENDS =devel/gettext \ CONFIGURE_ARGS = -DUSE_INTERNAL_TINYXML:Bool=Off CONFIGURE_ENV =CXXFLAGS="-DHAVE_UTIMENSAT -D_DIRENT_HAVE_D_TYPE" -# fixup, but those tests don't pass anyway -post-extract: - sed -i 's,\./build/,${WRKBUILD}/,g' ${WRKSRC}/tests/*.pl - -do-test: - ${SETENV} ${MAKE_ENV} ${WRKBUILD}/checkops +TEST_TARGET = unittests test .include Index: distinfo === RCS file: /cvs/ports/security/encfs/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo22 Aug 2017 01:32:34 - 1.2 +++ distinfo12 Apr 2018 17:28:11 - @@ -1,2 +1,2 @@ -SHA256 (encfs-1.9.2.tar.gz) = zZ6XLNlWXNwmRzyG0sd8mN4x/G9gT6fRSd1dbjXUbqo= -SIZE (encfs-1.9.2.tar.gz) = 11043181 +SHA256 (encfs-1.9.4.tar.gz) = IGVrTq1Y69jV9JpcNGtZ5w3C3DEiAVnltaEVv6G8QNY= +SIZE (encfs-1.9.4.tar.gz) = 2794574 Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/security/encfs/patches/patch-CMakeLists_txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt22 Aug 2017 01:32:34 - 1.1 +++ patches/patch-CMakeLists_txt12 Apr 2018 17:28:11 - @@ -3,12 +3,21 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 201 Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -244,7 +244,7 @@ if (POD2MAN) - ${CMAKE_CURRENT_LIST_DIR}/encfs/encfsctl.pod encfsctl.1) +@@ -120,6 +120,8 @@ if(LINKER_SUPPORTS_WLASNEEDED) + SET(EXTRA_LINKER_FLAGS "-Wl,--as-needed") + endif() - install (FILES ${CMAKE_BINARY_DIR}/encfs.1 ${CMAKE_BINARY_DIR}/encfsctl.1 --DESTINATION share/man/man1) -+DESTINATION man/man1) - endif (POD2MAN) ++SET(EXTRA_LINKER_FLAGS "-L/usr/lib") ++ + set(CMAKE_REQUIRED_FLAGS) - # Tests + # Check if we have some standard functions. +@@ -323,7 +325,7 @@ file (GLOB_RECURSE all_headers ${CMAKE_CURRENT_LIST_DI + add_custom_target (all_placeholder SOURCES ${all_headers}) + + if (POD2MAN) +- set (MAN_DESTINATION "share/man/man1") ++ set (MAN_DESTINATION "man/man1") + if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + set (MAN_DESTINATION "man/man1") + endif() Index: patches/patch-encfs_SSL_Compat_h === RCS file: patches/patch-encfs_SSL_Compat_h diff -N patches/patch-encfs_SSL_Compat_h --- patches/patch-encfs_SSL_Compat_h22 Aug 2017 01:32:34 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-encfs_SSL_Compat_h,v 1.1 2017/08/22 01:32:34 jca Exp $ - -Index: encfs/SSL_Compat.h encfs/SSL_Compat.h.orig -+++ encfs/SSL_Compat.h -@@ -22,7 +22,7 @@ - #define _SSL_Compat_incl_ - - // OpenSSL < 1.1.0 --#if OPENSSL_VERSION_NUMBER < 0x1010L -+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER) - - // Equivalent methods - #define EVP_MD_CTX_new EVP_MD_CTX_create Index: patches/patch-internal_easylogging++_h === RCS file: patches/patch-internal_easylogging++_h diff -N patches/patch-internal_easylogging++_h --- patches/patch-internal_easylogging++_h 22 Aug 2017 01:32:34 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,38 +0,0 @@ -$OpenBSD: patch-internal_easylogging++_h,v 1.1 2017/08/22 01:32:34 jca Exp $ - -Index: internal/easylogging++.h internal/easylogging++.h.orig -+++ internal/easylogging++.h -@@ -98,13 +98,18 @@ - #else - # define ELPP_OS_FREEBSD 0 - #endif -+#if (defined(__OpenBSD__)) -+# define ELPP_OS_OPENBSD 1 -+#else -+# define ELPP_OS_OPENBSD 0 -+#endif - #if (defined(__sun)) - # define ELPP_OS_SOLARIS 1 - #else - # define ELPP_OS_SOLARIS 0 - #endif - // Unix --#if ((ELPP_OS_LINUX ||
Re: [armv7 fix] Build database/redis
On Sat, Apr 07, 2018 at 08:26:10AM +0200, Markus Hennecke wrote: > With the attached fix the redis port builds, but is unable to complete the > regression tests (see https://github.com/antirez/redis/issues/4640). What's the status on armv7 without this fix? Have you tried the newer 4.0.9 version? I don't have access to that platform but the diff looks ok port-wise. There's another redis diff from me pending on ports@. but I'd also like to update the port to 4.0.9, maybe we can combine this with your fix?
Re: UPDATE: databases/redis 4.0.2 -> 4.0.8
On Sat, Mar 17, 2018 at 09:52:02AM +, Stuart Henderson wrote: > On 2018/03/17 08:33, Klemens Nanni wrote: > > Patches have been dropped or simplified a lot by passing variables > > through MAKE_ENV or adding to post-install instead, > > patch-src_mkreleasehdr_sh was useless on its own already. Here's an updated diff without whitespace nits after the 4.0.8 update. > It's a lot to change in one go. The version update makes sense, but > I'm not sure about the rest of the shuffling (and in any event, > that sort of thing is better separated from a routine update). I also refrained from compacting the targets for now to keep the focus on reducing the patches. > > +MAKE_FLAGS = DEBUG=${DEBUG} \ > > + DEBUG_FLAGS=${DEBUG} \ > > + DEPENDENCY_TARGETS="hiredis linenoise" \ > > + INSTALL_SBIN="${PREFIX}/sbin" \ > > + MALLOC=libc \ > > + OPT= \ > > + OPTIMIZATION= \ > > V=1 > > Overrides seem sensible for things like DEBUG (but should be quoted). > For things like DEPENDENCY_TARGETS it's better if a change in the upstream > Makefile causes a patch failure during an update because it will need to > be adapted anyway. Now quoted and with DEPENDENCY_TARGETS kept in patches. Feedback? OK? Index: Makefile === RCS file: /cvs/ports/databases/redis/Makefile,v retrieving revision 1.101 diff -u -p -r1.101 Makefile --- Makefile19 Mar 2018 18:15:57 - 1.101 +++ Makefile12 Apr 2018 21:19:00 - @@ -17,7 +17,13 @@ MASTER_SITES = http://download.redis.io MODULES = lang/lua \ lang/tcl -MAKE_FLAGS = CC=${CC} \ +MAKE_FLAGS = CC="${CC}" \ + DEBUG="${DEBUG}" \ + DEBUG_FLAGS="${DEBUG}" \ + INSTALL_SBIN="${PREFIX}/sbin" \ + MALLOC=libc \ + OPT="" \ + OPTIMIZATION="" \ V=1 FAKE_FLAGS = INSTALL="${INSTALL_PROGRAM}" \ Index: patches/patch-deps_hiredis_Makefile === RCS file: /cvs/ports/databases/redis/patches/patch-deps_hiredis_Makefile,v retrieving revision 1.7 diff -u -p -r1.7 patch-deps_hiredis_Makefile --- patches/patch-deps_hiredis_Makefile 9 Aug 2017 09:16:09 - 1.7 +++ patches/patch-deps_hiredis_Makefile 12 Apr 2018 21:19:00 - @@ -1,31 +1,9 @@ $OpenBSD: patch-deps_hiredis_Makefile,v 1.7 2017/08/09 09:16:09 dcoppa Exp $ + Index: deps/hiredis/Makefile --- deps/hiredis/Makefile.orig +++ deps/hiredis/Makefile -@@ -38,9 +38,9 @@ export REDIS_TEST_CONFIG - # Fallback to gcc when $CC is not in $PATH. - CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') - CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++') --OPTIMIZATION?=-O3 -+# OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings --DEBUG_FLAGS?= -g -ggdb -+# DEBUG_FLAGS?= -g -ggdb - REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH) - REAL_LDFLAGS=$(LDFLAGS) $(ARCH) - -@@ -167,6 +167,10 @@ endif - - INSTALL?= cp -a - -+ifndef INSTALL_DIR -+ INSTALL_DIR= mkdir -p -+endif -+ - $(PKGCONFNAME): hiredis.h - @echo "Generating $@ for pkgconfig..." - @echo prefix=$(PREFIX) > $@ -@@ -181,7 +185,7 @@ $(PKGCONFNAME): hiredis.h +@@ -181,12 +181,12 @@ $(PKGCONFNAME): hiredis.h @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) @@ -34,3 +12,9 @@ Index: deps/hiredis/Makefile $(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH) $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME) + $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) +- mkdir -p $(INSTALL_PKGCONF_PATH) ++ $(INSTALL_DIR) $(INSTALL_PKGCONF_PATH) + $(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH) + + 32bit: Index: patches/patch-deps_linenoise_Makefile === RCS file: patches/patch-deps_linenoise_Makefile diff -N patches/patch-deps_linenoise_Makefile --- patches/patch-deps_linenoise_Makefile 3 Dec 2013 06:50:17 - 1.6 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,16 +0,0 @@ -$OpenBSD: patch-deps_linenoise_Makefile,v 1.6 2013/12/03 06:50:17 dcoppa Exp $ deps/linenoise/Makefile.orig Mon Dec 2 16:07:46 2013 -+++ deps/linenoise/MakefileTue Dec 3 07:52:03 2013 -@@ -1,10 +1,10 @@ - STD= - WARN= -Wall --OPT= -Os -+# OPT= -Os - - R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) - R_LDFLAGS= $(LDFLAGS) --DEBUG= -g -+# DEBUG= -g - - R_CC=$(CC) $(R_CFLAGS) -
clang6 fix: audio/caps-plugins
Here's a potential fix for audio/caps-plugins. http://build-failures.rhaalovely.net/amd64/2018-04-10/audio/caps-plugins.log I don't understand why this has become invalid with clang6. Index: Makefile === RCS file: /cvs/ports/audio/caps-plugins/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile26 Jul 2017 22:45:15 - 1.9 +++ Makefile12 Apr 2018 22:32:58 - @@ -4,7 +4,7 @@ COMMENT = CAPS LADSPA plugins V =0.9.24 DISTNAME = caps_${V} -REVISION = 1 +REVISION = 2 PKGNAME = caps-plugins-${V} CATEGORIES = audio EXTRACT_SUFX = .tar.bz2 Index: patches/patch-dsp_v4f_IIR2_h === RCS file: /cvs/ports/audio/caps-plugins/patches/patch-dsp_v4f_IIR2_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-dsp_v4f_IIR2_h --- patches/patch-dsp_v4f_IIR2_h9 May 2015 08:00:55 - 1.1 +++ patches/patch-dsp_v4f_IIR2_h12 Apr 2018 22:32:58 - @@ -1,6 +1,7 @@ $OpenBSD: patch-dsp_v4f_IIR2_h,v 1.1 2015/05/09 08:00:55 robert Exp $ dsp/v4f_IIR2.h.origTue Apr 28 08:36:38 2015 -+++ dsp/v4f_IIR2.h Tue Apr 28 08:37:03 2015 +Index: dsp/v4f_IIR2.h +--- dsp/v4f_IIR2.h.orig dsp/v4f_IIR2.h @@ -32,7 +32,7 @@ namespace DSP { @@ -10,3 +11,26 @@ $OpenBSD: patch-dsp_v4f_IIR2_h,v 1.1 201 inline float pow10f(float f) {return pow(10,f);} #endif +@@ -45,8 +45,8 @@ class RBJv4 + { + v4f_t w = v4f_2pi * f; + +- sin = v4f_map<__builtin_sinf> (w); +- cos = v4f_map<__builtin_cosf> (w); ++ sin = v4f_map (w); ++ cos = v4f_map (w); + + alpha = sin / (v4f_2 * Q); + } +@@ -549,9 +549,9 @@ class Resonator4fBank + { + v4f_t * a = state + i*Item; + f *= v4f_2pi; +- a[0] = v4f_map<__builtin_sinf> (f); ++ a[0] = v4f_map (f); + a[0] *= gain; +- a[5] = v4f_map<__builtin_cosf> (f); ++ a[5] = v4f_map (f); + set_r (i, r); + } + void set_r (int i, v4f_t r) Index: patches/patch-dsp_v4f_h === RCS file: patches/patch-dsp_v4f_h diff -N patches/patch-dsp_v4f_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-dsp_v4f_h 12 Apr 2018 22:32:58 - @@ -0,0 +1,19 @@ +$OpenBSD$ + +Index: dsp/v4f.h +--- dsp/v4f.h.orig dsp/v4f.h +@@ -150,10 +150,10 @@ class Sin4f + { + v4f_t *y = data(); + v4f_t w = -v4f_pi * f; +- y[0] = v4f_map<__builtin_sinf> (w); +- y[1] = v4f_map<__builtin_sinf> (v4f_2 * w); ++ y[0] = v4f_map (w); ++ y[1] = v4f_map (v4f_2 * w); + /* b in above scalar implementation is y[2] in the flat data */ +- y[2] = v4f_2 * v4f_map<__builtin_cosf> (w); /* b */ ++ y[2] = v4f_2 * v4f_map (w); /* b */ + z = 0; + } + -- Christian "naddy" Weisgerber na...@mips.inka.de
new misc/os-test
Hi, The os-test suite compares the outcome of system calls on operating systems. https://sortix.org/os-test/ I want to run it on a regular basis as OpenBSD regression test. Providing the software as a port seems better than importing it to /usr/src/regress. As it was not designed to be installed as a package, I had to implement a lot in do-install. My tool os-test uses the installed files from /usr/local to run the tests and creates the html output in the current directory. Comment: test suites for POSIX operating systems Description: os-test is a set of test suites for POSIX operating systems designed to make it easy to compare differences between operating systems and to find operating system bugs. It consists of test suites that focus on different operating system areas. ok? bluhm os-test.tgz Description: application/tar-gz
ruby-passenger failed to build on OpenBSD/loongson
Dear ports maintainer, When building nginx, one of its dependencies ruby-passenger failed to build due to dwarf version mismatch. The most relevant line is below: /usr/bin/ld: Dwarf Error: found dwarf version '0', this reader only handles version 2 information. The detailed build log is in attachment. Let me know if more information is required. Thanks. nginx_build_failure.log.gz Description: GNU Zip compressed data
Re: clang6 fallout
Updated list as of Apr 12, 15:00 UTC: audio/caps-plugins cad/kicad comms/hylafax databases/mysqlcc databases/pgadmin3 devel/avr/gcc devel/ptlib devel/qt-creator devel/sdcc emulators/BasiliskII emulators/desmume emulators/dgen-sdl emulators/fceux! emulators/frodo emulators/nestopia games/alephone/alephone games/amoebax games/blobby games/dangerdeep games/enigma games/f1spirit games/ja2-stracciatella games/lostpixels games/meandmyshadow games/roadfighter games/stepmania games/sumwars games/vegastrike/engine games/warmux games/xminehunter geo/gpstk graphics/animorph graphics/discwrapper graphics/rawstudio inputmethods/scim-anthy japanese/groff java/jlint mail/kopano/webapp math/libqalculate misc/openbabel misc/xnc multimedia/libmp4v2 multimedia/swfmill net/dxpc net/kismet net/mldonkey net/mutella net/nam net/nepenthes net/ns news/pan security/opensc security/steghide sysutils/facter textproc/arabica textproc/wkhtmltopdf www/mongrel2 x11/kde/libs3 x11/qt4 x11/xmonad -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: [PATCH] www/goaccess: drop Tokyo Cabinet storage support
On Thu, April 12, 2018 00:32, Stuart Henderson wrote: > On 2018/04/11 15:29, Aaron Bieber wrote: >> On Wed, Apr 11, 2018 at 10:09:12PM +0100, Stuart Henderson wrote: >> > On 2018/04/11 22:39, Frederic Cambus wrote: >> > > Hi ports@, >> > > >> > > Here is a diff to drop Tokyo Cabinet storage support, this greatly >> > > speeds up processing time, more than 10 times actually. >> > > >> > > With the current version: >> > > >> > > - Total Requests: 1,347,757 >> > > - Log Size: 282.49 MiB >> > > - Init. Proc. Time: 712 secs >> > > >> > > With the diff applied: >> > > >> > > - Total Requests: 1,347,757 >> > > - Log Size: 282.49 MiB >> > > - Init. Proc. Time: 67 secs >> > > >> > > While there, switch HOMEPAGE and MASTER_SITES to HTTPS and update >> > > license marker to specify the MIT license, which goaccess switched >> > > to since the 1.0 release. >> > > >> > > Comments? OK? >> > >> > It is expected that goaccess is slower with Tokyo Cabinet (it's clear >> > in the manpage), but it allows it to process larger files, and to keep >> > data in persistent storage. >> > >> > I'm not a fan of unnecessary flavours in ports, but I think this might >> > be a case where it makes sense? >> >> I would like it if there was a non-tokyo flavor. It has only ever >> caused problems for me. That said, I am not a very heavy user of it! > > I would suggest using a flavour to _enable_ tokyocabinet rather than > on-by-default. Maybe with a quick explanation why one might want to > use it in DESCR. > > Hi! Does it look good? Index: Makefile === RCS file: /cvs/ports/www/goaccess/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile15 Nov 2017 21:28:05 - 1.17 +++ Makefile12 Apr 2018 05:18:11 - @@ -3,31 +3,38 @@ COMMENT = realtime console web log analyzer DISTNAME = goaccess-1.2 -REVISION = 0 +REVISION = 1 CATEGORIES = www -HOMEPAGE = http://goaccess.io/ +HOMEPAGE = https://goaccess.io/ MAINTAINER = Kirill Bychkov-# GPLv2 +# MIT PERMIT_PACKAGE_CDROM = Yes -WANTLIB += GeoIP bz2 c ncursesw pthread tokyocabinet z +WANTLIB += GeoIP bz2 c curses pthread z -MASTER_SITES = http://tar.goaccess.io/ +MASTER_SITES = https://tar.goaccess.io/ -LIB_DEPENDS = databases/tokyocabinet \ - net/GeoIP +LIB_DEPENDS = net/GeoIP CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --enable-geoip=legacy \ - --enable-utf8 \ - --enable-tcb=btree + --enable-utf8 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" + +FLAVORS = tokyocabinet +FLAVOR ?= + +.if ${FLAVOR:Mtokyocabinet} +WANTLIB += tokyocabinet +LIB_DEPENDS += databases/tokyocabinet +CONFIGURE_ARGS += --enable-tcb=btree +.endif do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/goaccess ${PREFIX}/bin/ Index: pkg/DESCR === RCS file: /cvs/ports/www/goaccess/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 DESCR --- pkg/DESCR 24 Oct 2013 01:59:44 - 1.1.1.1 +++ pkg/DESCR 12 Apr 2018 05:18:11 - @@ -2,3 +2,12 @@ viewer that runs in a terminal in *nix systems. It provides fast and valuable HTTP statistics for system administrators that require a visual server report on the fly. + +Packages can be built with additional FLAVORs: + + tokyocabinet : Use this storage method for large datasets where it is not + possible to fit everything in memory. The B+ tree database is + slower than any of the hash databases since data has to be + committed to disk. However, using an SSD greatly increases the + performance. You may also use this storage method if you need + data persistence to quickly load statistics at a later date.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/04/12 02:36:05 ports/games/hex-a-hop/patches Update of /cvs/ports/games/hex-a-hop/patches In directory cvs.openbsd.org:/tmp/cvs-serv48065/patches Log Message: Directory /cvs/ports/games/hex-a-hop/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/04/12 02:37:09 Modified files: games/hex-a-hop: Makefile Added files: games/hex-a-hop/patches: patch-src_hex_puzzzle_cpp patch-src_text_cpp Log message: static_casts for clang6, substitute MSDOS line-endings in patched files
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/04/12 01:25:12 Modified files: games/cowsay : Makefile Log message: reset maintainer address, bounces reported by Vivek Vinod on misc@ while there: mirror distfile, set homepage to archive.org copy, small Makefile tweaks
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/04/12 02:12:05 Modified files: games/oilwar : Makefile games/oilwar/patches: patch-Main_cpp Added files: games/oilwar/patches: patch-cParticleSystem_cpp Log message: fix build with clang6, light Makefile tidying
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2018/04/12 03:53:54 Modified files: security/botan2: Makefile distinfo security/botan2/patches: patch-src_build-data_os_openbsd_txt patch-src_tests_main_cpp security/botan2/pkg: PLIST Added files: security/botan2/patches: patch-configure_py patch-src_build-data_makefile_in patch-src_tests_test_filters_cpp patch-src_tests_tests_cpp patch-src_tests_tests_h Log message: Update botan2 to 2.6.0. Botan tests create temporary files in /tmp to allow ports privsep. Do not create symlinks for shared library, they confuse our tool chain.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2018/04/12 01:45:00 Log message: Import py-more-itertools 4.1.0, Python routines for operating on iterables beyond itertools ok sthen@ Status: Vendor Tag: pvk Release Tags: pvk_20180412 N ports/devel/py-more-itertools/Makefile N ports/devel/py-more-itertools/distinfo N ports/devel/py-more-itertools/pkg/DESCR N ports/devel/py-more-itertools/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/04/12 02:03:22 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/patches: patch-lib_googlecloudsdk_core_updater_local_state_py patch-lib_googlecloudsdk_core_util_platforms_py sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-197.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2018/04/12 01:54:10 Modified files: devel : Makefile Log message: +py-more-itertools
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/04/12 02:00:06 Modified files: security/libgpg-error: Makefile distinfo Removed files: security/libgpg-error/patches: patch-src_logging_c Log message: Update to libgpg-error-1.29.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/04/12 02:00:55 Added files: net/tcpreen/patches: patch-src_main_cpp Log message: whitespace around constants for clang6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: m...@cvs.openbsd.org2018/04/12 04:03:17 Modified files: devel/glib2: Makefile Added files: devel/glib2/patches: patch-00_kqueue_fix patch-gio_kqueue_gkqueuefilemonitor_c Removed files: devel/glib2/patches: patch-kqueue_fix Log message: Reorder operations in _kqsub_cancel() to prevent races. Should prevent the timeout to refill the list of depenencies while another thread is freeing it. Should help with segfault reported on bugs@. While here sync the kqueue rewrite with upstream. ok ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/04/12 05:42:33 Modified files: multimedia/gstreamer1/plugins-bad: Makefile multimedia/gstreamer1/plugins-base: Makefile multimedia/gstreamer1/plugins-good: Makefile multimedia/gstreamer1/plugins-libav: Makefile Log message: Sync CONFIGURE_ARGS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2018/04/12 11:52:47 Added files: net/dxpc/patches: patch-main_C Log message: fix build with clang6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2018/04/12 11:55:08 Modified files: net/kismet/patches: patch-server_protocols_cc patch-tcpserver_cc Added files: net/kismet/patches: patch-dronesource_cc patch-finitestate_cc patch-gpsd_cc patch-panelfront_display_cc patch-tcpclient_cc patch-tcpstreamer_cc Log message: fix build with clang6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2018/04/12 12:10:38 Added files: textproc/arabica/patches: patch-src_convert_impl_ucs2_utf8_cpp Log message: fix build with clang6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2018/04/12 12:10:27 Added files: news/pan/patches: patch-pan_data-impl_article-filter_cc patch-pan_general_string-view_h patch-pan_tasks_nntp_cc patch-pan_tasks_task-xover_cc patch-pan_usenet-utils_numbers_cc Log message: fix build with clang6; from freebsd
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2018/04/12 12:26:24 Modified files: www/goaccess : Makefile www/goaccess/pkg: DESCR Log message: Add tokyocabinet FLAVOR and disable it by defailt. This speed up processing for most usecases. Requested and original diff by fcambus@. OK fcambus@, ideas and OK sthen@, "Yes please!" danj@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/04/12 15:12:56 Modified files: geo/gpstk : Makefile distinfo Added files: geo/gpstk/patches: patch-BuildSetup_cmake patch-swig_CMakeLists_txt geo/gpstk/pkg : DESCR PLIST Removed files: geo/gpstk/patches: patch-apps_reszilla_CycleSlipList_hpp patch-lib_procframe_Variable_cpp patch-src_FileFilterFrame_hpp patch-src_Matrix_hpp patch-src_Vector_hpp geo/gpstk/pkg : DESCR-devel DESCR-main PLIST-devel PLIST-main Log message: major update to GPSTk-2.10, unbreaks build with clang6 roll headers into main package
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2018/04/12 14:41:09 Modified files: www/kcgi : Makefile distinfo Log message: Update kcgi to 0.10.3. Major updates to FastCGI related code. See release notes here: https://kristaps.bsd.lv/kcgi/archive.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/04/12 13:50:41 Modified files: editors/nano : Makefile distinfo Removed files: editors/nano/patches: patch-src_nano_c Log message: Update to 2.9.5. Significant changes: - Addition of the color name "normal", meaning the default color.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/04/12 09:07:38 Modified files: net/ns/patches : patch-common_tkAppInit_cc patch-queue_errmodel_cc patch-tcp_tcp_cc Added files: net/ns/patches : patch-bitmap_play_xbm patch-common_agent_cc patch-emulate_tap_cc patch-mac_mac-802_11_cc patch-mac_mac-simple_cc patch-pgm_pgm-agent_cc patch-pgm_pgm-receiver_cc patch-pgm_pgm-sender_cc patch-queue_dsr-priqueue_cc patch-tools_flowmon_cc patch-tools_queue-monitor_cc patch-trace_cmu-trace_cc patch-trace_trace_cc Log message: fix build with clang6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2018/04/12 00:07:13 Modified files: x11/smplayer : Makefile Log message: Now we have mpv instead of mplayer. Adjust the COMMENT. OK espie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/04/12 00:26:55 Modified files: security/vault : Makefile distinfo Log message: Update to vault-0.10.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2018/04/12 00:53:24 Modified files: x11/xfce4/xfce4-pulseaudio: Makefile distinfo Log message: xfce4-pulseaudio 0.4.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2018/04/12 00:53:06 Modified files: x11/xfce4/parole: Makefile distinfo Log message: Parole 1.0.1