Josh Elsasser <josh@elsasser.org> writes:
> On Sun, Apr 28, 2019 at 07:22:18AM -0700, Josh Elsasser wrote:
>
>> I'm preparing an update of lang/sbcl to 1.5.2, which should be
>> released in a day or two. Here is an update to a current git snapshot
>> if anyone wants to give it a try. I've already built and run the test
>> suite on all three arches but more testing never hurts.
>>
>> The port itself is once again patches sbcl to run the contrib module
>> tests during 'regress' and not 'build'. This in combination with
>> upstream improvements should allow the threads flavor to be built by
>> default again, and now on macppc too.
>>
>> Additionally, the non-threading options enabled by "./make.sh --fancy"
>> are now always enabled, namely core compression.
>>
>> The only downside is that the base makeinfo will no longer build the
>> texinfo docs, so pull in print/texinfo instead.
>
> Here is the actual update to 1.5.2, note that this adds and removes
> files. The threads flavor can be re-enabled in lang/Makefile as well.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/sbcl/Makefile,v
> retrieving revision 1.40
> diff -u -u -r1.40 Makefile
> --- Makefile 21 Mar 2019 22:06:53 -0000 1.40
> +++ Makefile 30 Apr 2019 04:18:48 -0000
> @@ -1,13 +1,12 @@
> -# $OpenBSD: Makefile,v 1.40 2019/03/21 22:06:53 sthen Exp $
> +# $OpenBSD: Makefile,v 1.37 2018/04/27 16:25:12 solene Exp $
>
> # not yet ported to other arches
> ONLY_FOR_ARCHS = amd64 i386 powerpc
> USE_WXNEEDED = Yes
> -REVISION = 0
>
> COMMENT= compiler and runtime system for ANSI Common Lisp
>
> -V = 1.4.8
> +V = 1.5.2
> DISTNAME= sbcl-${V}-source
> PKGNAME= sbcl-${V}
> WRKDIST= ${WRKDIR}/sbcl-${V}
> @@ -15,28 +14,30 @@
>
> CATEGORIES= lang
> HOMEPAGE= http://www.sbcl.org/
> -MAINTAINER = Joshua Elsasser <joshe@openbsd.org>
> +MAINTAINER = Joshua Elsasser <josh@elsasser.org>
>
> # Public domain and BSD
> PERMIT_PACKAGE_CDROM= Yes
>
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sbcl/}
>
> -WANTLIB= c m util
> +WANTLIB= c m util z
>
> PSEUDO_FLAVORS= native_bootstrap
>
> -# XXX threads flavor does not work reliably it won't even pass its self-test
> -# on amd64 all the time
> FLAVORS= threads
> FLAVOR?=
>
> -EXTRA_PARAMS=
> +MAKE_PARAMS = --prefix=${PREFIX}
> +
> .if ${FLAVOR:Mthreads}
> -ONLY_FOR_ARCHS = amd64
> -EXTRA_PARAMS+= --with-sb-thread
> +ONLY_FOR_ARCHS = amd64 powerpc
> +MAKE_PARAMS += --with-sb-thread
> WANTLIB+= pthread
> .endif
> +# enable features from --fancy other than :sb-thread
> +MAKE_PARAMS += --with-sb-core-compression \
> + --with-sb-xref-for-internals
>
> .if ${FLAVOR:Mnative_bootstrap}
> BUILD_DEPENDS+= lang/sbcl
> @@ -46,12 +47,17 @@
> BUILD_DEPENDS += lang/clisp
> BOOTSTRAP_CMD = ${LOCALBASE}/bin/clisp -q -norc
> .endif
> +MAKE_PARAMS += --xc-host="${BOOTSTRAP_CMD}" ${EXTRA_PARAMS}
> TEST_DEPENDS = devel/gmp
>
> +# base makeinfo chokes on sbcl texinfo files
> +BUILD_DEPENDS += print/texinfo
> +
> USE_GMAKE= Yes
> PORTHOME= ${TMPDIR}
> MAKE_ENV= GNUMAKE=${GMAKE} INSTALL_ROOT=${PREFIX} \
> - MAN_DIR=${PREFIX}/man INFO_DIR=${PREFIX}/info
> + MAN_DIR=${PREFIX}/man INFO_DIR=${PREFIX}/info \
> + MAKEINFO=${PREFIX}/bin/gmakeinfo
>
> # Upstream asks that packagers append something like this to the
> # version to distinguish official tarballs from third-party packages.
> @@ -66,8 +72,8 @@
> sed -i 's/^"\([0-9.]*\)"$$/"\1.${LOCAL_VERSION}"/' ${VERSION_FILE}
>
> do-build:
> - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} /bin/sh make.sh \
> - --prefix=${PREFIX} --xc-host="${BOOTSTRAP_CMD}" ${EXTRA_PARAMS}
> + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SBCL_CONTRIB_TARGET=all \
> + /bin/sh make.sh ${MAKE_PARAMS}
> cd ${WRKSRC}/doc/manual && touch sbcl.texinfo && \
> ${SETENV} ${MAKE_ENV} ${GMAKE} asdf.info sbcl.info
>
> @@ -78,6 +84,8 @@
> chown -R 0:0 ${PREFIX}/lib/sbcl
>
> do-test:
> + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} DONT_CLEAN_SBCL_CONTRIB=1 \
> + /bin/sh make-target-contrib.sh
> cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} /bin/sh run-tests.sh
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/sbcl/distinfo,v
> retrieving revision 1.16
> diff -u -u -r1.16 distinfo
> --- distinfo 24 Jun 2018 18:33:36 -0000 1.16
> +++ distinfo 30 Apr 2019 04:18:48 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (sbcl-1.4.8-source.tar.bz2) = ziS2K4hIJiHCKKT9bIAjUDMLYmPhsbmEYO60qB1/szU=
> -SIZE (sbcl-1.4.8-source.tar.bz2) = 6040563
> +SHA256 (sbcl-1.5.2-source.tar.bz2) = 2sau8+x2KMKEox8iIu3l1H2dlPnP3/4PAO9A+VMePD8=
> +SIZE (sbcl-1.5.2-source.tar.bz2) = 6343957
> Index: patches/patch-contrib_asdf_Makefile
> ===================================================================
> RCS file: patches/patch-contrib_asdf_Makefile
> diff -N patches/patch-contrib_asdf_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-contrib_asdf_Makefile 30 Apr 2019 04:18:48 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Add an 'all' target to match other contrib modules.
> +
> +Index: contrib/asdf/Makefile
> +--- contrib/asdf/Makefile.orig
> ++++ contrib/asdf/Makefile
> +@@ -4,7 +4,7 @@ UIOP_FASL=$(DEST)/uiop.fasl
> + FASL=$(UIOP_FASL) $(ASDF_FASL)
> + FROB_READTABLE='(setf (sb-ext:readtable-base-char-preference *readtable*) :both)'
> +
> +-fasl:: $(UIOP_FASL) $(ASDF_FASL)
> ++fasl all:: $(UIOP_FASL) $(ASDF_FASL)
> + $(UIOP_FASL):: uiop.lisp ../../output/sbcl.core
> + mkdir -p $(DEST)
> + $(SBCL) --eval $(FROB_READTABLE) --eval '(compile-file #p"SYS:CONTRIB;ASDF;UIOP.LISP" :print nil :output-file (parse-native-namestring "$@"))' </dev/null
> Index: patches/patch-make-target-contrib_sh
> ===================================================================
> RCS file: patches/patch-make-target-contrib_sh
> diff -N patches/patch-make-target-contrib_sh
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-make-target-contrib_sh 30 Apr 2019 04:18:48 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Allow contribs to be build without running tests.
> +
> +Index: make-target-contrib.sh
> +--- make-target-contrib.sh.orig
> ++++ make-target-contrib.sh
> +@@ -84,7 +84,7 @@ for i in $contribs_to_build; do
> + test -f obj/asdf-cache/$i/test-passed.test-report && rm obj/asdf-cache/$i/test-passed.test-report
> + mkdir -p obj/asdf-cache/$i/
> + # hack to get exit codes right.
> +- if $GNUMAKE -C contrib/$i test < /dev/null 2>&1 && touch obj/asdf-cache/$i/test-passed.test-report ; then
> ++ if $GNUMAKE -C contrib/$i ${SBCL_CONTRIB_TARGET:-test} < /dev/null 2>&1 && touch obj/asdf-cache/$i/test-passed.test-report ; then
> + :
> + else
> + exit $?
> Index: patches/patch-src_compiler_generic_genesis_lisp
> ===================================================================
> RCS file: patches/patch-src_compiler_generic_genesis_lisp
> diff -N patches/patch-src_compiler_generic_genesis_lisp
> --- patches/patch-src_compiler_generic_genesis_lisp 21 Mar 2019 22:06:54 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,24 +0,0 @@
> -$OpenBSD: patch-src_compiler_generic_genesis_lisp,v 1.1 2019/03/21 22:06:54 sthen Exp $
> -
> -Fix build on i386 when the text segment is more than 2GB from the dynamic space,
> -such as when linked with lld.
> -
> -Index: src/compiler/generic/genesis.lisp
> ---- src/compiler/generic/genesis.lisp.orig
> -+++ src/compiler/generic/genesis.lisp
> -@@ -2118,9 +2118,12 @@ core and return a descriptor to it."
> - ;; Never record it. (FIXME: this is a problem for relocatable heap)
> - nil)
> - (:relative ; (used for arguments to X86 relative CALL instruction)
> -- (setf (bvref-32 gspace-data gspace-byte-offset)
> -- (the (signed-byte 32)
> -- (- addr (+ gspace-base gspace-byte-offset 4)))) ; 4 = size of rel32off
> -+ (let ((difference (- addr (+ gspace-base gspace-byte-offset 4)))) ; 4 = size of rel32off
> -+ (setf (bvref-32 gspace-data gspace-byte-offset)
> -+ (the (signed-byte 32)
> -+ (if (< difference #x-80000000)
> -+ (ldb (byte 32 0) difference)
> -+ difference))))
> - ;; Relative fixups are recorded if without the object.
> - ;; Except that read-only space contains calls to asm routines,
> - ;; and we don't record those fixups.
> Index: patches/patch-src_compiler_x86_parms_lisp
> ===================================================================
> RCS file: patches/patch-src_compiler_x86_parms_lisp
> diff -N patches/patch-src_compiler_x86_parms_lisp
> --- patches/patch-src_compiler_x86_parms_lisp 21 Mar 2019 22:06:54 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-src_compiler_x86_parms_lisp,v 1.1 2019/03/21 22:06:54 sthen Exp $
> -
> -Move the static spaces to an address which should be available under
> -both ld.bfd and ld.lld
> -
> -Index: src/compiler/x86/parms.lisp
> ---- src/compiler/x86/parms.lisp.orig
> -+++ src/compiler/x86/parms.lisp
> -@@ -204,7 +204,7 @@
> - #!+sunos (!gencgc-space-setup #x20000000 :dynamic-space-start #x48000000)
> - #!+freebsd (!gencgc-space-setup #x01000000 :dynamic-space-start #x58000000)
> - #!+dragonfly (!gencgc-space-setup #x01000000 :dynamic-space-start #x58000000)
> --#!+openbsd (!gencgc-space-setup #x3d000000 :dynamic-space-start #x8d000000)
> -+#!+openbsd (!gencgc-space-setup #x11000000 :dynamic-space-start #x8d000000)
> - #!+netbsd (!gencgc-space-setup #x20000000 :dynamic-space-start #x60000000)
> - #!+darwin (!gencgc-space-setup #x04000000 :dynamic-space-start #x10000000)
> -
> Index: patches/patch-src_runtime_Config_generic-openbsd
> ===================================================================
> RCS file: /cvs/ports/lang/sbcl/patches/patch-src_runtime_Config_generic-openbsd,v
> retrieving revision 1.3
> diff -u -u -r1.3 patch-src_runtime_Config_generic-openbsd
> --- patches/patch-src_runtime_Config_generic-openbsd 8 Mar 2018 15:17:39 -0000 1.3
> +++ patches/patch-src_runtime_Config_generic-openbsd 30 Apr 2019 04:18:48 -0000
> @@ -1,23 +1,11 @@
> $OpenBSD: patch-src_runtime_Config_generic-openbsd,v 1.3 2018/03/08 15:17:39 sthen Exp $
>
> -clang-5.0.0 doesn't pass -export-dynamic to the linker, instead it
> -passes a bogus -e export-dynamic to ld(1). Just use -Wl,--export-dynamic.
> -
> Don't try to guess (wrong) with clang. Just assume we have pie
>
> Index: src/runtime/Config.generic-openbsd
> --- src/runtime/Config.generic-openbsd.orig
> +++ src/runtime/Config.generic-openbsd
> -@@ -9,7 +9,7 @@
> - # provided with absolutely no warranty. See the COPYING and CREDITS
> - # files for more information.
> -
> --LINKFLAGS += -export-dynamic -Wl,-z,wxneeded
> -+LINKFLAGS += -Wl,--export-dynamic -Wl,-z,wxneeded
> - OS_LIBS += -lutil
> -
> - ifdef LISP_FEATURE_SB_THREAD
> -@@ -17,9 +17,7 @@ CFLAGS += -pthread
> +@@ -17,9 +17,7 @@ CFLAGS += -pthread -DOS_THREAD_STACK
> OS_LIBS += -pthread
> endif
>
> Index: patches/patch-src_runtime_Config_x86-openbsd
> ===================================================================
> RCS file: patches/patch-src_runtime_Config_x86-openbsd
> diff -N patches/patch-src_runtime_Config_x86-openbsd
> --- patches/patch-src_runtime_Config_x86-openbsd 29 Jun 2018 22:39:59 -0000 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-src_runtime_Config_x86-openbsd,v 1.5 2018/06/29 22:39:59 sthen Exp $
> -
> -Index: src/runtime/Config.x86-openbsd
> ---- src/runtime/Config.x86-openbsd.orig
> -+++ src/runtime/Config.x86-openbsd
> -@@ -14,10 +14,8 @@ include Config.generic-openbsd
> -
> - ASSEM_SRC += ldso-stubs.S
> -
> --CC = egcc
> --
> - # The -Z linker flag conflicts with the default address space
> - # locations used. If you wish to link the runtime using -Z option then
> - # please see the comments in src/compiler/x86/parms.lisp
> -
> --CFLAGS += -fno-omit-frame-pointer -mpreferred-stack-boundary=2
> -+CFLAGS += -fno-omit-frame-pointer
> Index: patches/patch-src_runtime_run-program_c
> ===================================================================
> RCS file: patches/patch-src_runtime_run-program_c
> diff -N patches/patch-src_runtime_run-program_c
> --- patches/patch-src_runtime_run-program_c 8 Mar 2018 15:17:39 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,33 +0,0 @@
> -$OpenBSD: patch-src_runtime_run-program_c,v 1.1 2018/03/08 15:17:39 sthen Exp $
> -
> -Work around a problem where non-PIC code ends up using a different
> -copy of environ than libc.
> -
> -Index: src/runtime/run-program.c
> ---- src/runtime/run-program.c.orig
> -+++ src/runtime/run-program.c
> -@@ -200,14 +200,18 @@ int spawn(char *program, char *argv[], int sin, int so
> - if (pwd && chdir(pwd) < 0) {
> - failure_code = 3;
> - } else {
> -+ /* Exec the program. */
> - if (envp) {
> -- environ = envp;
> -+ if (search)
> -+ execvpe(program, argv, envp);
> -+ else
> -+ execve(program, argv, envp);
> -+ } else {
> -+ if (search)
> -+ execvp(program, argv);
> -+ else
> -+ execv(program, argv);
> - }
> -- /* Exec the program. */
> -- if (search)
> -- execvp(program, argv);
> -- else
> -- execv(program, argv);
> - }
> -
> - /* When exec or chdir fails and channel is available, send the errno value. */
> Index: patches/patch-tests_run-compiler_sh
> ===================================================================
> RCS file: patches/patch-tests_run-compiler_sh
> diff -N patches/patch-tests_run-compiler_sh
> --- patches/patch-tests_run-compiler_sh 21 Mar 2019 22:06:54 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-tests_run-compiler_sh,v 1.1 2019/03/21 22:06:54 sthen Exp $
> -
> -Tests must be built with -fPIC to pass on i386
> -
> -Index: tests/run-compiler.sh
> ---- tests/run-compiler.sh.orig
> -+++ tests/run-compiler.sh
> -@@ -35,6 +35,7 @@ while [ $# -gt 0 ]; do
> - Linux-PowerPC) new=-fPIC ;;
> - NetBSD-PowerPC) new=-fPIC ;;
> - NetBSD-X86-64) new=-fPIC ;;
> -+ OpenBSD-X86) new=-fPIC ;;
> - OpenBSD-PowerPC) new=-fPIC ;;
> - OpenBSD-X86-64) new=-fPIC ;;
> - SunOS-SPARC) new=-fPIC ;;
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/lang/sbcl/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -u -r1.11 PLIST
> --- pkg/PLIST 8 Mar 2018 15:17:39 -0000 1.11
> +++ pkg/PLIST 30 Apr 2019 04:18:48 -0000
> @@ -9,6 +9,8 @@
> lib/sbcl/contrib/sb-aclrepl.fasl
> lib/sbcl/contrib/sb-bsd-sockets.asd
> lib/sbcl/contrib/sb-bsd-sockets.fasl
> +lib/sbcl/contrib/sb-capstone.asd
> +lib/sbcl/contrib/sb-capstone.fasl
> lib/sbcl/contrib/sb-cltl2.asd
> lib/sbcl/contrib/sb-cltl2.fasl
> lib/sbcl/contrib/sb-concurrency.asd
> @@ -48,4 +50,3 @@
> share/doc/sbcl/COPYING
> share/doc/sbcl/CREDITS
> share/doc/sbcl/NEWS
> -share/doc/sbcl/html/
'native_bootstrap threads' FLAVOR works and tests pass on amd64.
timo
Tuesday, April 30, 2019
[UPDATE] www/honk 0.4.0
Index: honk/Makefile
===================================================================
RCS file: /cvs/ports/www/honk/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- honk/Makefile 30 Apr 2019 07:58:17 -0000 1.1.1.1
+++ honk/Makefile 1 May 2019 05:08:23 -0000
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2019/04/30 07:58:17 bentley Exp $
+# $OpenBSD$
COMMENT = federated status updater
-DISTNAME = honk-0.3.0
+DISTNAME = honk-0.4.0
CATEGORIES = www
HOMEPAGE = https://humungus.tedunangst.com/r/honk
Index: honk/distinfo
===================================================================
RCS file: /cvs/ports/www/honk/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- honk/distinfo 30 Apr 2019 07:58:17 -0000 1.1.1.1
+++ honk/distinfo 1 May 2019 05:08:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (honk-0.3.0.tgz) = m3vCZ5Dk/n1+ofzRJad7/LQbDsiwUM4VHqBX1i2YnWM=
-SIZE (honk-0.3.0.tgz) = 158871
+SHA256 (honk-0.4.0.tgz) = jtt8cZM0vOzVRBvdDLzgNzq9qEbn/AdGSnUBG1KALTs=
+SIZE (honk-0.4.0.tgz) = 161078
Index: honk/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/honk/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- honk/pkg/PLIST 30 Apr 2019 07:58:17 -0000 1.1.1.1
+++ honk/pkg/PLIST 1 May 2019 05:08:23 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/30 07:58:17 bentley Exp $
+@comment $OpenBSD: PLIST,v$
@newgroup _honk:833
@newuser _honk:833:_honk:daemon:Honk User:${VARBASE}/honk:/sbin/nologin
@rcscript ${RCDIR}/honk
@@ -23,6 +23,8 @@ share/examples/honk/
share/examples/honk/schema.sql
@sample ${VARBASE}/honk/schema.sql
share/examples/honk/views/
+share/examples/honk/views/combos.html
+@sample ${VARBASE}/honk/views/combos.html
share/examples/honk/views/header.html
@sample ${VARBASE}/honk/views/header.html
share/examples/honk/views/honk.html
Update to v0.4.0
- add combos.html to PLIST
Changes: "codename Fore Score, fetches upstream posts as replies are
received to complete the thread, and also now resizes all saved images
to reduce storage needs. Some other stuff is better too." --
https://humungus.tedunangst.com/r/honk/h
===================================================================
RCS file: /cvs/ports/www/honk/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- honk/Makefile 30 Apr 2019 07:58:17 -0000 1.1.1.1
+++ honk/Makefile 1 May 2019 05:08:23 -0000
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2019/04/30 07:58:17 bentley Exp $
+# $OpenBSD$
COMMENT = federated status updater
-DISTNAME = honk-0.3.0
+DISTNAME = honk-0.4.0
CATEGORIES = www
HOMEPAGE = https://humungus.tedunangst.com/r/honk
Index: honk/distinfo
===================================================================
RCS file: /cvs/ports/www/honk/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- honk/distinfo 30 Apr 2019 07:58:17 -0000 1.1.1.1
+++ honk/distinfo 1 May 2019 05:08:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (honk-0.3.0.tgz) = m3vCZ5Dk/n1+ofzRJad7/LQbDsiwUM4VHqBX1i2YnWM=
-SIZE (honk-0.3.0.tgz) = 158871
+SHA256 (honk-0.4.0.tgz) = jtt8cZM0vOzVRBvdDLzgNzq9qEbn/AdGSnUBG1KALTs=
+SIZE (honk-0.4.0.tgz) = 161078
Index: honk/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/honk/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- honk/pkg/PLIST 30 Apr 2019 07:58:17 -0000 1.1.1.1
+++ honk/pkg/PLIST 1 May 2019 05:08:23 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/30 07:58:17 bentley Exp $
+@comment $OpenBSD: PLIST,v$
@newgroup _honk:833
@newuser _honk:833:_honk:daemon:Honk User:${VARBASE}/honk:/sbin/nologin
@rcscript ${RCDIR}/honk
@@ -23,6 +23,8 @@ share/examples/honk/
share/examples/honk/schema.sql
@sample ${VARBASE}/honk/schema.sql
share/examples/honk/views/
+share/examples/honk/views/combos.html
+@sample ${VARBASE}/honk/views/combos.html
share/examples/honk/views/header.html
@sample ${VARBASE}/honk/views/header.html
share/examples/honk/views/honk.html
Update to v0.4.0
- add combos.html to PLIST
Changes: "codename Fore Score, fetches upstream posts as replies are
received to complete the thread, and also now resizes all saved images
to reduce storage needs. Some other stuff is better too." --
https://humungus.tedunangst.com/r/honk/h
Remove useless python3 FLAVOR from devel/py-backports-abc
Here's another removal of a useless python3 FLAVOR in a port that
backports functionality.
The only port that uses this is py-tornado, and it doesn't use the
python3 flavor.
OK?
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-backports-abc/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 28 Apr 2019 20:51:30 -0000 1.5
+++ Makefile 1 May 2019 04:21:52 -0000
@@ -19,8 +19,7 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-FLAVORS = python3
-FLAVOR ?=
+# No python3 FLAVOR - port backports functionality to python 2.x
do-test:
cd ${WRKSRC} && ${MODPY_BIN} -m unittest discover
backports functionality.
The only port that uses this is py-tornado, and it doesn't use the
python3 flavor.
OK?
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-backports-abc/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 28 Apr 2019 20:51:30 -0000 1.5
+++ Makefile 1 May 2019 04:21:52 -0000
@@ -19,8 +19,7 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-FLAVORS = python3
-FLAVOR ?=
+# No python3 FLAVOR - port backports functionality to python 2.x
do-test:
cd ${WRKSRC} && ${MODPY_BIN} -m unittest discover
Re: OpenBSD maintainers Spring cleaning
On April 30, 2019 8:09:02 PM MDT, Tracey Emery <tracey@traceyemery.net> wrote:
>On April 30, 2019 3:50:24 PM MDT, Daniel Jakots <danj@chown.me> wrote:
>>Hi,
>>
>>We decided to email each maintainer to verify OpenBSD port maintainers
>>can be reached and wish to remain active. I'm going to send these
>>emails over the next few days.
>>
>>
>>So don't be surprised when you'll receive yours :)
>>
>>
>>Cheers,
>>Daniel
>
>I won't. Lol
>--
>Tracey Emery
Sorry, drinking. Disregard. Too fun not to reply! ;)
--
Tracey Emery
>On April 30, 2019 3:50:24 PM MDT, Daniel Jakots <danj@chown.me> wrote:
>>Hi,
>>
>>We decided to email each maintainer to verify OpenBSD port maintainers
>>can be reached and wish to remain active. I'm going to send these
>>emails over the next few days.
>>
>>
>>So don't be surprised when you'll receive yours :)
>>
>>
>>Cheers,
>>Daniel
>
>I won't. Lol
>--
>Tracey Emery
Sorry, drinking. Disregard. Too fun not to reply! ;)
--
Tracey Emery
Re: OpenBSD maintainers Spring cleaning
On April 30, 2019 3:50:24 PM MDT, Daniel Jakots <danj@chown.me> wrote:
>Hi,
>
>We decided to email each maintainer to verify OpenBSD port maintainers
>can be reached and wish to remain active. I'm going to send these
>emails over the next few days.
>
>
>So don't be surprised when you'll receive yours :)
>
>
>Cheers,
>Daniel
I won't. Lol
--
Tracey Emery
>Hi,
>
>We decided to email each maintainer to verify OpenBSD port maintainers
>can be reached and wish to remain active. I'm going to send these
>emails over the next few days.
>
>
>So don't be surprised when you'll receive yours :)
>
>
>Cheers,
>Daniel
I won't. Lol
--
Tracey Emery
Re: [UPDATE] devel/p5-Class-Inspector to 1.34
On Tue, 30 Apr 2019 15:56:58 -0700
Andrew Fresh <andrew@afresh1.com> wrote:
> A minor update to Class::Inspector to fix compatibility with
> Devel::Hide. Also noticed due to the PPI update.
>
> https://metacpan.org/changes/distribution/Class-Inspector
>
> No changes to test results from direct reverse dependencies.
>
> Comments, OK?
It builds fine and tests pass. OK cwen@
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Class-Inspector/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 12 Mar 2019 02:29:39 -0000 1.14
> +++ Makefile 30 Apr 2019 22:42:41 -0000
> @@ -4,10 +4,13 @@ COMMENT= get information about a
> class
> MODULES= cpan
> PKG_ARCH= *
> -DISTNAME= Class-Inspector-1.32
> +DISTNAME= Class-Inspector-1.34
> CATEGORIES= devel
>
> # Perl
> PERMIT_PACKAGE_CDROM= Yes
> +
> +# Hidden test dependency
> +TEST_DEPENDS= devel/p5-Devel-Hide
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Class-Inspector/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 12 Mar 2019 02:29:39 -0000 1.6
> +++ distinfo 30 Apr 2019 22:42:41 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (Class-Inspector-1.32.tar.gz) =
> zvrci1M45D5XC8Q/WD58mNU1wXsZa8+QhLtB1WHMBTU= -SIZE
> (Class-Inspector-1.32.tar.gz) = 25639 +SHA256
> (Class-Inspector-1.34.tar.gz)
> = /pqG3LPMx6mdaGXmtnShTSAWT3a9hPLrQ6r8xr8c8Ng= +SIZE
> (Class-Inspector-1.34.tar.gz) = 26111
>
Andrew Fresh <andrew@afresh1.com> wrote:
> A minor update to Class::Inspector to fix compatibility with
> Devel::Hide. Also noticed due to the PPI update.
>
> https://metacpan.org/changes/distribution/Class-Inspector
>
> No changes to test results from direct reverse dependencies.
>
> Comments, OK?
It builds fine and tests pass. OK cwen@
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Class-Inspector/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 12 Mar 2019 02:29:39 -0000 1.14
> +++ Makefile 30 Apr 2019 22:42:41 -0000
> @@ -4,10 +4,13 @@ COMMENT= get information about a
> class
> MODULES= cpan
> PKG_ARCH= *
> -DISTNAME= Class-Inspector-1.32
> +DISTNAME= Class-Inspector-1.34
> CATEGORIES= devel
>
> # Perl
> PERMIT_PACKAGE_CDROM= Yes
> +
> +# Hidden test dependency
> +TEST_DEPENDS= devel/p5-Devel-Hide
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Class-Inspector/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 12 Mar 2019 02:29:39 -0000 1.6
> +++ distinfo 30 Apr 2019 22:42:41 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (Class-Inspector-1.32.tar.gz) =
> zvrci1M45D5XC8Q/WD58mNU1wXsZa8+QhLtB1WHMBTU= -SIZE
> (Class-Inspector-1.32.tar.gz) = 25639 +SHA256
> (Class-Inspector-1.34.tar.gz)
> = /pqG3LPMx6mdaGXmtnShTSAWT3a9hPLrQ6r8xr8c8Ng= +SIZE
> (Class-Inspector-1.34.tar.gz) = 26111
>
Re: [NEW] www/honk
On Tue, Apr 30, 2019 at 09:18:53PM -0400, Horia Racoviceanu wrote:
> Upgrade to v0.4.0
> - add combos.html to PLIST
>
> Changes: "codename Fore Score, fetches upstream posts as replies are
> received to complete the thread, and also now resizes all saved images
> to reduce storage needs. Some other stuff is better too" --
> https://humungus.tedunangst.com/r/honk/h
>
Hi Horia,
honk has now been imported into the tree. Can you please start sending
new releases as cvs diffs? Thanks.
> On 4/26/19, James Turner <james@calminferno.net> wrote:
> > Looks good to me if someone wants to commit, ok jturner@. Or I can
> > commit with an ok.
> >
> > On Thu, Apr 25, 2019 at 12:04:34PM -0400, Horia Racoviceanu wrote:
> >> - Upgrade to v0.3.0
> >>
> >> Changes: https://humungus.tedunangst.com/r/honk/h
> >>
> >> On 4/20/19, Horia Racoviceanu <horia@racoviceanu.com> wrote:
> >> > - Remove rc_pre
> >> >
> >> > On 4/20/19, Horia Racoviceanu <horia@racoviceanu.com> wrote:
> >> >> - Remove defaults
> >> >> - Use syslog
> >> >> - Fix templates
> >> >>
> >> >> On 4/19/19, Stuart Henderson <stu@spacehopper.org> wrote:
> >> >>> This has various things (in Makefile and the rc script) explicitly
> >> >>> set
> >> >>> to the default (MAINTAINER, daemon_flags, daemon_rtable, etc), please
> >> >>> just
> >> >>> leave those lines out.
> >> >>>
> >> >>> The logging setup in this rc script will break with log rotation,
> >> >>> it would be better to use the method done with prometheus/influxdb.
> >> >>>
> >> >>> The template files (html/css etc) installed directly to /var probably
> >> >>> want installing to /usr/local/share/examples instead and copying with
> >> >>> @sample instead, so if users modify them they can still update.
> >> >>>
> >> >>>
> >> >>
> >> >> Thank you
> >> >>
> >> >
> >
> >
> >
> > --
> > James Turner
> >
--
James Turner
> Upgrade to v0.4.0
> - add combos.html to PLIST
>
> Changes: "codename Fore Score, fetches upstream posts as replies are
> received to complete the thread, and also now resizes all saved images
> to reduce storage needs. Some other stuff is better too" --
> https://humungus.tedunangst.com/r/honk/h
>
Hi Horia,
honk has now been imported into the tree. Can you please start sending
new releases as cvs diffs? Thanks.
> On 4/26/19, James Turner <james@calminferno.net> wrote:
> > Looks good to me if someone wants to commit, ok jturner@. Or I can
> > commit with an ok.
> >
> > On Thu, Apr 25, 2019 at 12:04:34PM -0400, Horia Racoviceanu wrote:
> >> - Upgrade to v0.3.0
> >>
> >> Changes: https://humungus.tedunangst.com/r/honk/h
> >>
> >> On 4/20/19, Horia Racoviceanu <horia@racoviceanu.com> wrote:
> >> > - Remove rc_pre
> >> >
> >> > On 4/20/19, Horia Racoviceanu <horia@racoviceanu.com> wrote:
> >> >> - Remove defaults
> >> >> - Use syslog
> >> >> - Fix templates
> >> >>
> >> >> On 4/19/19, Stuart Henderson <stu@spacehopper.org> wrote:
> >> >>> This has various things (in Makefile and the rc script) explicitly
> >> >>> set
> >> >>> to the default (MAINTAINER, daemon_flags, daemon_rtable, etc), please
> >> >>> just
> >> >>> leave those lines out.
> >> >>>
> >> >>> The logging setup in this rc script will break with log rotation,
> >> >>> it would be better to use the method done with prometheus/influxdb.
> >> >>>
> >> >>> The template files (html/css etc) installed directly to /var probably
> >> >>> want installing to /usr/local/share/examples instead and copying with
> >> >>> @sample instead, so if users modify them they can still update.
> >> >>>
> >> >>>
> >> >>
> >> >> Thank you
> >> >>
> >> >
> >
> >
> >
> > --
> > James Turner
> >
--
James Turner
Re: [UPDATE] devel/p5-Task-Weaken to 1.06
On Tue, 30 Apr 2019 15:55:16 -0700
Andrew Fresh <andrew@afresh1.com> wrote:
> A simple update I noticed due to being a dependency of PPI.
>
> No actual code changes that I spotted, but a recent release adjusting
> tests and such.
>
> https://metacpan.org/changes/distribution/Task-Weaken
>
> Comments, OK?
It builds fine and tests pass.
OK cwen@
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Task-Weaken/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 20 Mar 2016 19:56:35 -0000 1.12
> +++ Makefile 30 Apr 2019 22:36:07 -0000
> @@ -4,12 +4,12 @@ COMMENT= ensure that a platform has
> wea
> MODULES= cpan
> PKG_ARCH= *
> -DISTNAME = Task-Weaken-1.04
> +DISTNAME= Task-Weaken-1.06
> CATEGORIES= devel
>
> # perl
> PERMIT_PACKAGE_CDROM= Yes
>
> -CPAN_AUTHOR= ADAMK
> +FIX_EXTRACT_PERMISSIONS= Yes
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Task-Weaken/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 14 Dec 2014 16:57:27 -0000 1.5
> +++ distinfo 30 Apr 2019 22:36:07 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (Task-Weaken-1.04.tar.gz) =
> Z+JxxVkA/niJWE+RHaqUbhd7tgyK9Ewy9FhLh3Zq88Q= -SIZE
> (Task-Weaken-1.04.tar.gz) = 29976 +SHA256 (Task-Weaken-1.06.tar.gz) =
> I4P+252672RkaOqCSvv3yAEHZyDPug3yp6B0cm3NZr4= +SIZE
> (Task-Weaken-1.06.tar.gz) = 28404
>
Andrew Fresh <andrew@afresh1.com> wrote:
> A simple update I noticed due to being a dependency of PPI.
>
> No actual code changes that I spotted, but a recent release adjusting
> tests and such.
>
> https://metacpan.org/changes/distribution/Task-Weaken
>
> Comments, OK?
It builds fine and tests pass.
OK cwen@
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Task-Weaken/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 20 Mar 2016 19:56:35 -0000 1.12
> +++ Makefile 30 Apr 2019 22:36:07 -0000
> @@ -4,12 +4,12 @@ COMMENT= ensure that a platform has
> wea
> MODULES= cpan
> PKG_ARCH= *
> -DISTNAME = Task-Weaken-1.04
> +DISTNAME= Task-Weaken-1.06
> CATEGORIES= devel
>
> # perl
> PERMIT_PACKAGE_CDROM= Yes
>
> -CPAN_AUTHOR= ADAMK
> +FIX_EXTRACT_PERMISSIONS= Yes
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Task-Weaken/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 14 Dec 2014 16:57:27 -0000 1.5
> +++ distinfo 30 Apr 2019 22:36:07 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (Task-Weaken-1.04.tar.gz) =
> Z+JxxVkA/niJWE+RHaqUbhd7tgyK9Ewy9FhLh3Zq88Q= -SIZE
> (Task-Weaken-1.04.tar.gz) = 29976 +SHA256 (Task-Weaken-1.06.tar.gz) =
> I4P+252672RkaOqCSvv3yAEHZyDPug3yp6B0cm3NZr4= +SIZE
> (Task-Weaken-1.06.tar.gz) = 28404
>
Re: [NEW] www/honk
Upgrade to v0.4.0
- add combos.html to PLIST
Changes: "codename Fore Score, fetches upstream posts as replies are
received to complete the thread, and also now resizes all saved images
to reduce storage needs. Some other stuff is better too" --
https://humungus.tedunangst.com/r/honk/h
On 4/26/19, James Turner <james@calminferno.net> wrote:
> Looks good to me if someone wants to commit, ok jturner@. Or I can
> commit with an ok.
>
> On Thu, Apr 25, 2019 at 12:04:34PM -0400, Horia Racoviceanu wrote:
>> - Upgrade to v0.3.0
>>
>> Changes: https://humungus.tedunangst.com/r/honk/h
>>
>> On 4/20/19, Horia Racoviceanu <horia@racoviceanu.com> wrote:
>> > - Remove rc_pre
>> >
>> > On 4/20/19, Horia Racoviceanu <horia@racoviceanu.com> wrote:
>> >> - Remove defaults
>> >> - Use syslog
>> >> - Fix templates
>> >>
>> >> On 4/19/19, Stuart Henderson <stu@spacehopper.org> wrote:
>> >>> This has various things (in Makefile and the rc script) explicitly
>> >>> set
>> >>> to the default (MAINTAINER, daemon_flags, daemon_rtable, etc), please
>> >>> just
>> >>> leave those lines out.
>> >>>
>> >>> The logging setup in this rc script will break with log rotation,
>> >>> it would be better to use the method done with prometheus/influxdb.
>> >>>
>> >>> The template files (html/css etc) installed directly to /var probably
>> >>> want installing to /usr/local/share/examples instead and copying with
>> >>> @sample instead, so if users modify them they can still update.
>> >>>
>> >>>
>> >>
>> >> Thank you
>> >>
>> >
>
>
>
> --
> James Turner
>
- add combos.html to PLIST
Changes: "codename Fore Score, fetches upstream posts as replies are
received to complete the thread, and also now resizes all saved images
to reduce storage needs. Some other stuff is better too" --
https://humungus.tedunangst.com/r/honk/h
On 4/26/19, James Turner <james@calminferno.net> wrote:
> Looks good to me if someone wants to commit, ok jturner@. Or I can
> commit with an ok.
>
> On Thu, Apr 25, 2019 at 12:04:34PM -0400, Horia Racoviceanu wrote:
>> - Upgrade to v0.3.0
>>
>> Changes: https://humungus.tedunangst.com/r/honk/h
>>
>> On 4/20/19, Horia Racoviceanu <horia@racoviceanu.com> wrote:
>> > - Remove rc_pre
>> >
>> > On 4/20/19, Horia Racoviceanu <horia@racoviceanu.com> wrote:
>> >> - Remove defaults
>> >> - Use syslog
>> >> - Fix templates
>> >>
>> >> On 4/19/19, Stuart Henderson <stu@spacehopper.org> wrote:
>> >>> This has various things (in Makefile and the rc script) explicitly
>> >>> set
>> >>> to the default (MAINTAINER, daemon_flags, daemon_rtable, etc), please
>> >>> just
>> >>> leave those lines out.
>> >>>
>> >>> The logging setup in this rc script will break with log rotation,
>> >>> it would be better to use the method done with prometheus/influxdb.
>> >>>
>> >>> The template files (html/css etc) installed directly to /var probably
>> >>> want installing to /usr/local/share/examples instead and copying with
>> >>> @sample instead, so if users modify them they can still update.
>> >>>
>> >>>
>> >>
>> >> Thank you
>> >>
>> >
>
>
>
> --
> James Turner
>
Re: Xorg blanks until I switch to a TTY and back on 6.5
On Mon, Apr 29, 2019 at 05:05:25PM +1000, Jonathan Gray wrote:
> On Sun, Apr 28, 2019 at 07:26:54PM -0400, Charles wrote:
> > Hello list,
> >
> > Ever since the new inteldrm driver got merged into -current, shortly
> > before the 6.5 release, I'm seeing an odd new behavior on my Thinkpad
> > T430 -- when an external display is connected, Xorg blanks all screens
> > (but the mouse can still be seen) until I switch to a TTY and back with
> > (i.e. C-A-F4 then C-A-F5) after which point it goes back to normal.
> >
> > I'm glad the new inteldrm driver got merged, since it fixes several
> > other video issues I was having. This problem is very minor since the
> > workaround is just a few extra keystrokes when I dock or undock, but it
> > is nevertheless annoying.
> >
> > Is anyone else experiencing this issue on third gen core-I series Intel
> > chips with integrated graphics? Or on any other chips for that matter?
> >
> > I checked Xorg.0.log and didn't see anything suspicious. I also tried
> > disabling monitor hotplugging via Xorg.conf, but I either did it wrong
> > or it had no effect.
> >
> > I would attach xorg logs and dmesg, but AFAIK misc@ does not allow
> > attachments, and I don't want to annoy people with that much inline
> > info.
>
> Does this help?
>
> Index: sys/dev/pci/drm/drm_fb_helper.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/drm/drm_fb_helper.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 drm_fb_helper.c
> --- sys/dev/pci/drm/drm_fb_helper.c 14 Apr 2019 10:14:51 -0000 1.13
> +++ sys/dev/pci/drm/drm_fb_helper.c 29 Apr 2019 06:58:25 -0000
> @@ -575,6 +575,9 @@ static bool drm_fb_helper_is_bound(struc
> #ifdef notyet
> if (READ_ONCE(dev->master))
> return false;
> +#else
> + if (!SPLAY_EMPTY(&dev->files))
> + return false;
>
> On Sun, Apr 28, 2019 at 07:26:54PM -0400, Charles wrote:
> > Hello list,
> >
> > Ever since the new inteldrm driver got merged into -current, shortly
> > before the 6.5 release, I'm seeing an odd new behavior on my Thinkpad
> > T430 -- when an external display is connected, Xorg blanks all screens
> > (but the mouse can still be seen) until I switch to a TTY and back with
> > (i.e. C-A-F4 then C-A-F5) after which point it goes back to normal.
> >
> > I'm glad the new inteldrm driver got merged, since it fixes several
> > other video issues I was having. This problem is very minor since the
> > workaround is just a few extra keystrokes when I dock or undock, but it
> > is nevertheless annoying.
> >
> > Is anyone else experiencing this issue on third gen core-I series Intel
> > chips with integrated graphics? Or on any other chips for that matter?
> >
> > I checked Xorg.0.log and didn't see anything suspicious. I also tried
> > disabling monitor hotplugging via Xorg.conf, but I either did it wrong
> > or it had no effect.
> >
> > I would attach xorg logs and dmesg, but AFAIK misc@ does not allow
> > attachments, and I don't want to annoy people with that much inline
> > info.
>
> Does this help?
>
> Index: sys/dev/pci/drm/drm_fb_helper.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/drm/drm_fb_helper.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 drm_fb_helper.c
> --- sys/dev/pci/drm/drm_fb_helper.c 14 Apr 2019 10:14:51 -0000 1.13
> +++ sys/dev/pci/drm/drm_fb_helper.c 29 Apr 2019 06:58:25 -0000
> @@ -575,6 +575,9 @@ static bool drm_fb_helper_is_bound(struc
> #ifdef notyet
> if (READ_ONCE(dev->master))
> return false;
> +#else
> + if (!SPLAY_EMPTY(&dev->files))
> + return false;
>
Re: [ports-gcc-8] Unbreak net/toxcore
On Mon, 29 Apr 2019 23:48:15 +0200
Christian Weisgerber <naddy@mips.inka.de> wrote:
> Charlene Wendling:
>
> > > > http://build-failures.rhaalovely.net/powerpc/last/net/toxcore.log
> > >
> > > This port uses base-gcc, that doesn't recognise
> > > "-Wno-c99-extensions".
>
> This only disables a warning.
> How about simply removing the "-Wno-c99-extensions"?
I'll try once my partial libcdio bulk is done and either report the log
or propose another diff.
> --
> Christian "naddy" Weisgerber
> naddy@mips.inka.de
>
Christian Weisgerber <naddy@mips.inka.de> wrote:
> Charlene Wendling:
>
> > > > http://build-failures.rhaalovely.net/powerpc/last/net/toxcore.log
> > >
> > > This port uses base-gcc, that doesn't recognise
> > > "-Wno-c99-extensions".
>
> This only disables a warning.
> How about simply removing the "-Wno-c99-extensions"?
I'll try once my partial libcdio bulk is done and either report the log
or propose another diff.
> --
> Christian "naddy" Weisgerber
> naddy@mips.inka.de
>
Re: [ports-gcc-8] Unbreak multimedia/libmp4v2
On Mon, 29 Apr 2019 23:59:03 +0200
Christian Weisgerber <naddy@mips.inka.de> wrote:
> Charlene Wendling:
>
> > > > src/cmeta.cpp:1386:16: error: converting to 'bool' from
> > > > 'std::nullptr_t' requires direct-initialization [-fpermissive]
> > > > return NULL;
>
> If that's the only problem, then these could just be fixed by
> changing them to "return false".
TL;DR: i can't get libmp4v2 build with C++14.
Thanks for this one. There are a lot of them actually: mostly
narrowing to int errors, there is an integer overflow somewhere
i guess, but i can't find it, for example:
util/mp4art.cpp:378:14: error: case value evaluates to 4026531846,
which cannot be narrowed to type 'int' [-Wc++11-narrowing]
Repeated on lines 378, 382, 391, 395, 402, 406, 413
Using long [0] instead of int (badly) solves these errors, but then
the documentation cannot be generated, because it break long options
management (they've rolled their own...), so the build never
finishes.
I also considered updating the port, but the current code is
similar.
FreeBSD disables -Wc++11-narrowing, but it only hides the issue afaik.
> > > Again, it breaks because it wants C++<11.
> >
> > -.include <bsd.port.arch.mk>
> > -.if ${PROPERTIES:Mclang}
> > CXXFLAGS += -std=c++03
> > -.endif
>
> That really needs a #comment.
>
> Now when I see a naked -std=c++*, I don't know if its purpose is/was
> to switch an old compiler to a higher C++ standard, or to limit a
> new compiler to an older standard.
Especially that context may change in this regard, i'm pleading guilty.
I'm proposing this, what do you think about it?
> --
> Christian "naddy" Weisgerber
> naddy@mips.inka.de
>
Charlène.
[0] https://github.com/sergiomb2/libmp4v2/issues/163
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libmp4v2/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 29 Apr 2019 11:38:17 -0000 1.19
+++ Makefile 1 May 2019 00:17:13 -0000
@@ -27,6 +27,9 @@ USE_GMAKE = Yes
MAKE_FILE = GNUmakefile
CONFIGURE_STYLE = gnu
+# As of mp4v2-1.9.1, the code is written for c++03, using c++>=11 causes too
+# many narrowing to int issues in a roll-your-own option management, among
+# others.
CXXFLAGS += -std=c++03
.include <bsd.port.mk>
Christian Weisgerber <naddy@mips.inka.de> wrote:
> Charlene Wendling:
>
> > > > src/cmeta.cpp:1386:16: error: converting to 'bool' from
> > > > 'std::nullptr_t' requires direct-initialization [-fpermissive]
> > > > return NULL;
>
> If that's the only problem, then these could just be fixed by
> changing them to "return false".
TL;DR: i can't get libmp4v2 build with C++14.
Thanks for this one. There are a lot of them actually: mostly
narrowing to int errors, there is an integer overflow somewhere
i guess, but i can't find it, for example:
util/mp4art.cpp:378:14: error: case value evaluates to 4026531846,
which cannot be narrowed to type 'int' [-Wc++11-narrowing]
Repeated on lines 378, 382, 391, 395, 402, 406, 413
Using long [0] instead of int (badly) solves these errors, but then
the documentation cannot be generated, because it break long options
management (they've rolled their own...), so the build never
finishes.
I also considered updating the port, but the current code is
similar.
FreeBSD disables -Wc++11-narrowing, but it only hides the issue afaik.
> > > Again, it breaks because it wants C++<11.
> >
> > -.include <bsd.port.arch.mk>
> > -.if ${PROPERTIES:Mclang}
> > CXXFLAGS += -std=c++03
> > -.endif
>
> That really needs a #comment.
>
> Now when I see a naked -std=c++*, I don't know if its purpose is/was
> to switch an old compiler to a higher C++ standard, or to limit a
> new compiler to an older standard.
Especially that context may change in this regard, i'm pleading guilty.
I'm proposing this, what do you think about it?
> --
> Christian "naddy" Weisgerber
> naddy@mips.inka.de
>
Charlène.
[0] https://github.com/sergiomb2/libmp4v2/issues/163
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libmp4v2/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 29 Apr 2019 11:38:17 -0000 1.19
+++ Makefile 1 May 2019 00:17:13 -0000
@@ -27,6 +27,9 @@ USE_GMAKE = Yes
MAKE_FILE = GNUmakefile
CONFIGURE_STYLE = gnu
+# As of mp4v2-1.9.1, the code is written for c++03, using c++>=11 causes too
+# many narrowing to int issues in a roll-your-own option management, among
+# others.
CXXFLAGS += -std=c++03
.include <bsd.port.mk>
[UPDATE] devel/p5-Class-Inspector to 1.34
A minor update to Class::Inspector to fix compatibility with
Devel::Hide. Also noticed due to the PPI update.
https://metacpan.org/changes/distribution/Class-Inspector
No changes to test results from direct reverse dependencies.
Comments, OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/p5-Class-Inspector/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 12 Mar 2019 02:29:39 -0000 1.14
+++ Makefile 30 Apr 2019 22:42:41 -0000
@@ -4,10 +4,13 @@ COMMENT= get information about a class
MODULES= cpan
PKG_ARCH= *
-DISTNAME= Class-Inspector-1.32
+DISTNAME= Class-Inspector-1.34
CATEGORIES= devel
# Perl
PERMIT_PACKAGE_CDROM= Yes
+
+# Hidden test dependency
+TEST_DEPENDS= devel/p5-Devel-Hide
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/p5-Class-Inspector/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 12 Mar 2019 02:29:39 -0000 1.6
+++ distinfo 30 Apr 2019 22:42:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (Class-Inspector-1.32.tar.gz) = zvrci1M45D5XC8Q/WD58mNU1wXsZa8+QhLtB1WHMBTU=
-SIZE (Class-Inspector-1.32.tar.gz) = 25639
+SHA256 (Class-Inspector-1.34.tar.gz) = /pqG3LPMx6mdaGXmtnShTSAWT3a9hPLrQ6r8xr8c8Ng=
+SIZE (Class-Inspector-1.34.tar.gz) = 26111
Devel::Hide. Also noticed due to the PPI update.
https://metacpan.org/changes/distribution/Class-Inspector
No changes to test results from direct reverse dependencies.
Comments, OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/p5-Class-Inspector/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 12 Mar 2019 02:29:39 -0000 1.14
+++ Makefile 30 Apr 2019 22:42:41 -0000
@@ -4,10 +4,13 @@ COMMENT= get information about a class
MODULES= cpan
PKG_ARCH= *
-DISTNAME= Class-Inspector-1.32
+DISTNAME= Class-Inspector-1.34
CATEGORIES= devel
# Perl
PERMIT_PACKAGE_CDROM= Yes
+
+# Hidden test dependency
+TEST_DEPENDS= devel/p5-Devel-Hide
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/p5-Class-Inspector/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 12 Mar 2019 02:29:39 -0000 1.6
+++ distinfo 30 Apr 2019 22:42:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (Class-Inspector-1.32.tar.gz) = zvrci1M45D5XC8Q/WD58mNU1wXsZa8+QhLtB1WHMBTU=
-SIZE (Class-Inspector-1.32.tar.gz) = 25639
+SHA256 (Class-Inspector-1.34.tar.gz) = /pqG3LPMx6mdaGXmtnShTSAWT3a9hPLrQ6r8xr8c8Ng=
+SIZE (Class-Inspector-1.34.tar.gz) = 26111
[UPDATE] devel/p5-Task-Weaken to 1.06
A simple update I noticed due to being a dependency of PPI.
No actual code changes that I spotted, but a recent release adjusting
tests and such.
https://metacpan.org/changes/distribution/Task-Weaken
Comments, OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/p5-Task-Weaken/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 20 Mar 2016 19:56:35 -0000 1.12
+++ Makefile 30 Apr 2019 22:36:07 -0000
@@ -4,12 +4,12 @@ COMMENT= ensure that a platform has wea
MODULES= cpan
PKG_ARCH= *
-DISTNAME = Task-Weaken-1.04
+DISTNAME= Task-Weaken-1.06
CATEGORIES= devel
# perl
PERMIT_PACKAGE_CDROM= Yes
-CPAN_AUTHOR= ADAMK
+FIX_EXTRACT_PERMISSIONS= Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/p5-Task-Weaken/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 14 Dec 2014 16:57:27 -0000 1.5
+++ distinfo 30 Apr 2019 22:36:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (Task-Weaken-1.04.tar.gz) = Z+JxxVkA/niJWE+RHaqUbhd7tgyK9Ewy9FhLh3Zq88Q=
-SIZE (Task-Weaken-1.04.tar.gz) = 29976
+SHA256 (Task-Weaken-1.06.tar.gz) = I4P+252672RkaOqCSvv3yAEHZyDPug3yp6B0cm3NZr4=
+SIZE (Task-Weaken-1.06.tar.gz) = 28404
No actual code changes that I spotted, but a recent release adjusting
tests and such.
https://metacpan.org/changes/distribution/Task-Weaken
Comments, OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/p5-Task-Weaken/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 20 Mar 2016 19:56:35 -0000 1.12
+++ Makefile 30 Apr 2019 22:36:07 -0000
@@ -4,12 +4,12 @@ COMMENT= ensure that a platform has wea
MODULES= cpan
PKG_ARCH= *
-DISTNAME = Task-Weaken-1.04
+DISTNAME= Task-Weaken-1.06
CATEGORIES= devel
# perl
PERMIT_PACKAGE_CDROM= Yes
-CPAN_AUTHOR= ADAMK
+FIX_EXTRACT_PERMISSIONS= Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/p5-Task-Weaken/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 14 Dec 2014 16:57:27 -0000 1.5
+++ distinfo 30 Apr 2019 22:36:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (Task-Weaken-1.04.tar.gz) = Z+JxxVkA/niJWE+RHaqUbhd7tgyK9Ewy9FhLh3Zq88Q=
-SIZE (Task-Weaken-1.04.tar.gz) = 29976
+SHA256 (Task-Weaken-1.06.tar.gz) = I4P+252672RkaOqCSvv3yAEHZyDPug3yp6B0cm3NZr4=
+SIZE (Task-Weaken-1.06.tar.gz) = 28404
Re: [NEW]: p5-Mojolicious-Plugin-AccessLog
Hi Andrew,
On Sun, Apr 21, 2019 at 10:24:09AM -0700, andrew@afresh1.com wrote:
> > Here is a new version for p5-Mojolicious-Plugin-AccessLog and also
>
> The AccessLog plugin looks great, thanks.
>
> > the new p5-Mojolicious-Plugin-Thumbnail that I am using.
>
> The Thumbnail Plugin doesn't have any POD tests, so doesn't need the
> TEST_POD line and this isn't an XS module so I think that p5-Imager
> LIB_DEPENDS should be a RUN_DEPENDS, but other than that, looks good.
>
> Both of these are OK afresh1@ to import with those minor changes.
Here are new updates.
Thank you for the corrections.
--
Olivier Cherrier
Phone: +352691754777
mailto:oc@symacx.com
On Sun, Apr 21, 2019 at 10:24:09AM -0700, andrew@afresh1.com wrote:
> > Here is a new version for p5-Mojolicious-Plugin-AccessLog and also
>
> The AccessLog plugin looks great, thanks.
>
> > the new p5-Mojolicious-Plugin-Thumbnail that I am using.
>
> The Thumbnail Plugin doesn't have any POD tests, so doesn't need the
> TEST_POD line and this isn't an XS module so I think that p5-Imager
> LIB_DEPENDS should be a RUN_DEPENDS, but other than that, looks good.
>
> Both of these are OK afresh1@ to import with those minor changes.
Here are new updates.
Thank you for the corrections.
--
Olivier Cherrier
Phone: +352691754777
mailto:oc@symacx.com
update devel/pcre2 10.32 -> 10.33
This is an update for devel/pcre2 10.33, released April 16, 2019. I
tested it with wget. Changelog: https://www.pcre.org/changelog.txt
Here is some commentary on relevant parts of the changelog.
--8<---------------cut here---------------start------------->8---
3. Added support for callouts from pcre2_substitute(). After 10.33-RC1, but
prior to release, fixed a bug that caused a crash if pcre2_substitute() was
called with a NULL match context.
comment: minor bump pcre2-{8, 16, 32} because added new function
+T pcre2_set_substitute_callout_8
4. The POSIX functions are now all called pcre2_regcomp() etc., with wrapper
functions that use the standard POSIX names. However, in pcre2posix.h the POSIX
names are defined as macros. This should help avoid linking with the wrong
library in some environments while still exporting the POSIX names for
pre-existing programs that use them. (The Debian alternative names are also
defined as macros, but not documented.)
comment: minor bump pcre2-posix. Added new functions, while redefining
old symbols, like regcomp --> pcre2_regcomp.
+T pcre2_regcomp
+T pcre2_regerror
+T pcre2_regexec
+T pcre2_regfree
-PCRE2POSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
-PCRE2POSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
+PCRE2POSIX_EXP_DECL int pcre2_regcomp(regex_t *, const char *, int);
+PCRE2POSIX_EXP_DECL int pcre2_regexec(const regex_t *, const char *, size_t,
regmatch_t *, int);
-PCRE2POSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t);
-PCRE2POSIX_EXP_DECL void regfree(regex_t *);
+PCRE2POSIX_EXP_DECL size_t pcre2_regerror(int, const regex_t *, char *, size_t);
+PCRE2POSIX_EXP_DECL void pcre2_regfree(regex_t *);
+
+#define regcomp pcre2_regcomp
+#define regexec pcre2_regexec
+#define regerror pcre2_regerror
+#define regfree pcre2_regfree
6. Implement PCRE2_EXTRA_ESCAPED_CR_IS_LF (see Bugzilla 2315).
comment: minor bump because new symbol in pcre2.h
+#define PCRE2_EXTRA_ESCAPED_CR_IS_LF 0x00000010u /* C */
10. Implement PCRE2_COPY_MATCHED_SUBJECT for pcre2_match() (including JIT via
pcre2_match()) and pcre2_dfa_match(), but *not* the pcre2_jit_match() fast
path. Also, when a match fails, set the subject field in the match data to NULL
for tidiness - none of the substring extractors should reference this after
match failure.
comment: minor bump because new symbol in pcre2.h
+#define PCRE2_COPY_MATCHED_SUBJECT 0x00004000u
23. The RunGrepTest script used to cut out the test of NUL characters for
Solaris and MacOS as printf and sed can't handle them. It seems that the *BSD
systems can't either. I've inverted the test so that only those OS that are
known to work (currently only Linux) try to run this test.
comment: Now that the test checks for Linux, I am proposing to
s/Linux/OpenBSD/ in the patch that jca@ added. This seems to be the
easiest way to run this test now.
previous version:
uname=`uname`
if [ "$uname" != "SunOS" -a "$uname" != "Darwin" ] ; then
...
newest version:
uname=`uname`
case $uname in
Linux)
...
26. With PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL set, escape sequences such as \s
which are valid in character classes, but not as the end of ranges, were being
treated as literals. An example is [_-\s] (but not [\s-_] because that gave an
error at the *start* of a range). Now an "invalid range" error is given
independently of PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL.
comment: minor bump because new error code in pcre2_error.c "invalid
range in character class\0"
31. Implemented PCRE2_EXTRA_ALT_BSUX to support ECMAScript 6's \u{hhh}
construct.
comment: minor bump because new symbol in pcre2.h
+#define PCRE2_EXTRA_ALT_BSUX 0x00000020u /* C */
--8<---------------cut here---------------end--------------->8---
diff:
? my_test
? pcre2.h.patch
? pcre2_16_new
? pcre2_16_old
? pcre2_32_new
? pcre2_32_old
? pcre2_new
? pcre2_old
? pcre2_posix_new
? pcre2_posix_old
? pcre2posix.h.patch
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pcre2/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 3 Feb 2019 22:40:38 -0000 1.9
+++ Makefile 30 Apr 2019 22:07:59 -0000
@@ -2,12 +2,12 @@
COMMENT = perl-compatible regular expression library, version 2
-DISTNAME = pcre2-10.32
+DISTNAME = pcre2-10.33
-SHARED_LIBS += pcre2-16 0.2 # 7.1
-SHARED_LIBS += pcre2-32 0.2 # 7.1
-SHARED_LIBS += pcre2-8 0.3 # 7.1
-SHARED_LIBS += pcre2-posix 0.2 # 2.1
+SHARED_LIBS += pcre2-16 0.3 # 8.0
+SHARED_LIBS += pcre2-32 0.3 # 8.0
+SHARED_LIBS += pcre2-8 0.4 # 8.0
+SHARED_LIBS += pcre2-posix 0.3 # 2.2
CATEGORIES = devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/pcre2/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 31 Jan 2019 17:40:30 -0000 1.4
+++ distinfo 30 Apr 2019 22:07:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (pcre2-10.32.tar.gz) = nKm+cuGgTyK+MIMjyqjAbr0MUe/pnuESeBhsr7xP468=
-SIZE (pcre2-10.32.tar.gz) = 2169349
+SHA256 (pcre2-10.33.tar.gz) = 4uKJmpdIn8atGwzD2nlSx8ypkbSg99tmSbddlyECXTE=
+SIZE (pcre2-10.33.tar.gz) = 2234905
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/pcre2/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 26 Apr 2018 13:06:01 -0000 1.3
+++ pkg/PLIST 30 Apr 2019 22:07:59 -0000
@@ -82,6 +82,7 @@ lib/pkgconfig/libpcre2-posix.pc
@man man/man3/pcre2_set_parens_nest_limit.3
@man man/man3/pcre2_set_recursion_limit.3
@man man/man3/pcre2_set_recursion_memory_management.3
+@man man/man3/pcre2_set_substitute_callout.3
@man man/man3/pcre2_substitute.3
@man man/man3/pcre2_substring_copy_byname.3
@man man/man3/pcre2_substring_copy_bynumber.3
@@ -182,6 +183,7 @@ share/doc/pcre2/html/pcre2_set_offset_li
share/doc/pcre2/html/pcre2_set_parens_nest_limit.html
share/doc/pcre2/html/pcre2_set_recursion_limit.html
share/doc/pcre2/html/pcre2_set_recursion_memory_management.html
+share/doc/pcre2/html/pcre2_set_substitute_callout.html
share/doc/pcre2/html/pcre2_substitute.html
share/doc/pcre2/html/pcre2_substring_copy_byname.html
share/doc/pcre2/html/pcre2_substring_copy_bynumber.html
Index: patches/patch-RunGrepTest
===================================================================
RCS file: /cvs/ports/devel/pcre2/patches/patch-RunGrepTest,v
retrieving revision 1.1
diff -u -p -r1.1 patch-RunGrepTest
--- patches/patch-RunGrepTest 3 Feb 2019 22:40:38 -0000 1.1
+++ patches/patch-RunGrepTest 30 Apr 2019 22:08:10 -0000
@@ -5,12 +5,15 @@ Our sed(1) doesn't cope with NUL bytes a
Index: RunGrepTest
--- RunGrepTest.orig
+++ RunGrepTest
-@@ -723,7 +723,7 @@ printf '%c--------------------------- Test N7 --------
+@@ -723,9 +723,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc|
+ printf '%c--------------------------- Test N7 ------------------------------\r\n' - >>testtrygrep
uname=`uname`
- if [ "$uname" != "SunOS" -a "$uname" != "Darwin" ] ; then
- printf 'abc\0def' >testNinputgrep
-- $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | sed 's/\x00/ZERO/' >>testtrygrep
-+ $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | gsed 's/\x00/ZERO/' >>testtrygrep
- echo "" >>testtrygrep
- else
- echo '1:abcZERO2:def' >>testtrygrep
+ case $uname in
+- Linux)
++ OpenBSD)
+ printf 'abc\0def' >testNinputgrep
+- $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | sed 's/\x00/ZERO/' >>testtrygrep
++ $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | gsed 's/\x00/ZERO/' >>testtrygrep
+ echo "" >>testtrygrep
+ ;;
+ *)
tested it with wget. Changelog: https://www.pcre.org/changelog.txt
Here is some commentary on relevant parts of the changelog.
--8<---------------cut here---------------start------------->8---
3. Added support for callouts from pcre2_substitute(). After 10.33-RC1, but
prior to release, fixed a bug that caused a crash if pcre2_substitute() was
called with a NULL match context.
comment: minor bump pcre2-{8, 16, 32} because added new function
+T pcre2_set_substitute_callout_8
4. The POSIX functions are now all called pcre2_regcomp() etc., with wrapper
functions that use the standard POSIX names. However, in pcre2posix.h the POSIX
names are defined as macros. This should help avoid linking with the wrong
library in some environments while still exporting the POSIX names for
pre-existing programs that use them. (The Debian alternative names are also
defined as macros, but not documented.)
comment: minor bump pcre2-posix. Added new functions, while redefining
old symbols, like regcomp --> pcre2_regcomp.
+T pcre2_regcomp
+T pcre2_regerror
+T pcre2_regexec
+T pcre2_regfree
-PCRE2POSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
-PCRE2POSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
+PCRE2POSIX_EXP_DECL int pcre2_regcomp(regex_t *, const char *, int);
+PCRE2POSIX_EXP_DECL int pcre2_regexec(const regex_t *, const char *, size_t,
regmatch_t *, int);
-PCRE2POSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t);
-PCRE2POSIX_EXP_DECL void regfree(regex_t *);
+PCRE2POSIX_EXP_DECL size_t pcre2_regerror(int, const regex_t *, char *, size_t);
+PCRE2POSIX_EXP_DECL void pcre2_regfree(regex_t *);
+
+#define regcomp pcre2_regcomp
+#define regexec pcre2_regexec
+#define regerror pcre2_regerror
+#define regfree pcre2_regfree
6. Implement PCRE2_EXTRA_ESCAPED_CR_IS_LF (see Bugzilla 2315).
comment: minor bump because new symbol in pcre2.h
+#define PCRE2_EXTRA_ESCAPED_CR_IS_LF 0x00000010u /* C */
10. Implement PCRE2_COPY_MATCHED_SUBJECT for pcre2_match() (including JIT via
pcre2_match()) and pcre2_dfa_match(), but *not* the pcre2_jit_match() fast
path. Also, when a match fails, set the subject field in the match data to NULL
for tidiness - none of the substring extractors should reference this after
match failure.
comment: minor bump because new symbol in pcre2.h
+#define PCRE2_COPY_MATCHED_SUBJECT 0x00004000u
23. The RunGrepTest script used to cut out the test of NUL characters for
Solaris and MacOS as printf and sed can't handle them. It seems that the *BSD
systems can't either. I've inverted the test so that only those OS that are
known to work (currently only Linux) try to run this test.
comment: Now that the test checks for Linux, I am proposing to
s/Linux/OpenBSD/ in the patch that jca@ added. This seems to be the
easiest way to run this test now.
previous version:
uname=`uname`
if [ "$uname" != "SunOS" -a "$uname" != "Darwin" ] ; then
...
newest version:
uname=`uname`
case $uname in
Linux)
...
26. With PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL set, escape sequences such as \s
which are valid in character classes, but not as the end of ranges, were being
treated as literals. An example is [_-\s] (but not [\s-_] because that gave an
error at the *start* of a range). Now an "invalid range" error is given
independently of PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL.
comment: minor bump because new error code in pcre2_error.c "invalid
range in character class\0"
31. Implemented PCRE2_EXTRA_ALT_BSUX to support ECMAScript 6's \u{hhh}
construct.
comment: minor bump because new symbol in pcre2.h
+#define PCRE2_EXTRA_ALT_BSUX 0x00000020u /* C */
--8<---------------cut here---------------end--------------->8---
diff:
? my_test
? pcre2.h.patch
? pcre2_16_new
? pcre2_16_old
? pcre2_32_new
? pcre2_32_old
? pcre2_new
? pcre2_old
? pcre2_posix_new
? pcre2_posix_old
? pcre2posix.h.patch
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pcre2/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 3 Feb 2019 22:40:38 -0000 1.9
+++ Makefile 30 Apr 2019 22:07:59 -0000
@@ -2,12 +2,12 @@
COMMENT = perl-compatible regular expression library, version 2
-DISTNAME = pcre2-10.32
+DISTNAME = pcre2-10.33
-SHARED_LIBS += pcre2-16 0.2 # 7.1
-SHARED_LIBS += pcre2-32 0.2 # 7.1
-SHARED_LIBS += pcre2-8 0.3 # 7.1
-SHARED_LIBS += pcre2-posix 0.2 # 2.1
+SHARED_LIBS += pcre2-16 0.3 # 8.0
+SHARED_LIBS += pcre2-32 0.3 # 8.0
+SHARED_LIBS += pcre2-8 0.4 # 8.0
+SHARED_LIBS += pcre2-posix 0.3 # 2.2
CATEGORIES = devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/pcre2/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 31 Jan 2019 17:40:30 -0000 1.4
+++ distinfo 30 Apr 2019 22:07:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (pcre2-10.32.tar.gz) = nKm+cuGgTyK+MIMjyqjAbr0MUe/pnuESeBhsr7xP468=
-SIZE (pcre2-10.32.tar.gz) = 2169349
+SHA256 (pcre2-10.33.tar.gz) = 4uKJmpdIn8atGwzD2nlSx8ypkbSg99tmSbddlyECXTE=
+SIZE (pcre2-10.33.tar.gz) = 2234905
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/pcre2/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 26 Apr 2018 13:06:01 -0000 1.3
+++ pkg/PLIST 30 Apr 2019 22:07:59 -0000
@@ -82,6 +82,7 @@ lib/pkgconfig/libpcre2-posix.pc
@man man/man3/pcre2_set_parens_nest_limit.3
@man man/man3/pcre2_set_recursion_limit.3
@man man/man3/pcre2_set_recursion_memory_management.3
+@man man/man3/pcre2_set_substitute_callout.3
@man man/man3/pcre2_substitute.3
@man man/man3/pcre2_substring_copy_byname.3
@man man/man3/pcre2_substring_copy_bynumber.3
@@ -182,6 +183,7 @@ share/doc/pcre2/html/pcre2_set_offset_li
share/doc/pcre2/html/pcre2_set_parens_nest_limit.html
share/doc/pcre2/html/pcre2_set_recursion_limit.html
share/doc/pcre2/html/pcre2_set_recursion_memory_management.html
+share/doc/pcre2/html/pcre2_set_substitute_callout.html
share/doc/pcre2/html/pcre2_substitute.html
share/doc/pcre2/html/pcre2_substring_copy_byname.html
share/doc/pcre2/html/pcre2_substring_copy_bynumber.html
Index: patches/patch-RunGrepTest
===================================================================
RCS file: /cvs/ports/devel/pcre2/patches/patch-RunGrepTest,v
retrieving revision 1.1
diff -u -p -r1.1 patch-RunGrepTest
--- patches/patch-RunGrepTest 3 Feb 2019 22:40:38 -0000 1.1
+++ patches/patch-RunGrepTest 30 Apr 2019 22:08:10 -0000
@@ -5,12 +5,15 @@ Our sed(1) doesn't cope with NUL bytes a
Index: RunGrepTest
--- RunGrepTest.orig
+++ RunGrepTest
-@@ -723,7 +723,7 @@ printf '%c--------------------------- Test N7 --------
+@@ -723,9 +723,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc|
+ printf '%c--------------------------- Test N7 ------------------------------\r\n' - >>testtrygrep
uname=`uname`
- if [ "$uname" != "SunOS" -a "$uname" != "Darwin" ] ; then
- printf 'abc\0def' >testNinputgrep
-- $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | sed 's/\x00/ZERO/' >>testtrygrep
-+ $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | gsed 's/\x00/ZERO/' >>testtrygrep
- echo "" >>testtrygrep
- else
- echo '1:abcZERO2:def' >>testtrygrep
+ case $uname in
+- Linux)
++ OpenBSD)
+ printf 'abc\0def' >testNinputgrep
+- $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | sed 's/\x00/ZERO/' >>testtrygrep
++ $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | gsed 's/\x00/ZERO/' >>testtrygrep
+ echo "" >>testtrygrep
+ ;;
+ *)
OpenBSD maintainers Spring cleaning
Hi,
We decided to email each maintainer to verify OpenBSD port maintainers
can be reached and wish to remain active. I'm going to send these
emails over the next few days.
So don't be surprised when you'll receive yours :)
Cheers,
Daniel
We decided to email each maintainer to verify OpenBSD port maintainers
can be reached and wish to remain active. I'm going to send these
emails over the next few days.
So don't be surprised when you'll receive yours :)
Cheers,
Daniel
Re: 6.5 auto_install fails due to custom /var/tmp?
On 2019-04-30, Lyndon Nerenberg <lyndon@orthanc.ca> wrote:
>> Sadly, no :-(
>>
>> But I should be able to accomplish what I need using rc.firsttime and
>> a tiny bit of hackery.
>
> Sadly, no :-(
>
> What I was aiming for was to have the newly installed machines come
> up with a 2GB MFS /tmp and a ~20GB /var/tmp. But MFS /tmp really
> needs help in the system boot scripts.
>
> The critical part for us is that /var/tmp not overwhelm /var, and
> we can get that with the current scheme by sizing /tmp accordingly.
>
> --lyndon
>
>
My "workaround" when I've run into this during upgrades has been
to ditch the MFS /tmp and mount my previous /var/tmp partition there
instead.
If MFS was actually fast then doing this would make me sad, but it
isn't really, and sd0 is often on SSD these days...
>> Sadly, no :-(
>>
>> But I should be able to accomplish what I need using rc.firsttime and
>> a tiny bit of hackery.
>
> Sadly, no :-(
>
> What I was aiming for was to have the newly installed machines come
> up with a 2GB MFS /tmp and a ~20GB /var/tmp. But MFS /tmp really
> needs help in the system boot scripts.
>
> The critical part for us is that /var/tmp not overwhelm /var, and
> we can get that with the current scheme by sizing /tmp accordingly.
>
> --lyndon
>
>
My "workaround" when I've run into this during upgrades has been
to ditch the MFS /tmp and mount my previous /var/tmp partition there
instead.
If MFS was actually fast then doing this would make me sad, but it
isn't really, and sd0 is often on SSD these days...
Re: 6.5 auto_install fails due to custom /var/tmp?
Paul de Weerd <weerd@weirdnet.nl> wrote:
> On Tue, Apr 30, 2019 at 01:29:47PM -0700, Lyndon Nerenberg wrote:
> | > Sadly, no :-(
> | >
> | > But I should be able to accomplish what I need using rc.firsttime and
> | > a tiny bit of hackery.
> |
> | Sadly, no :-(
> |
> | What I was aiming for was to have the newly installed machines come
> | up with a 2GB MFS /tmp and a ~20GB /var/tmp. But MFS /tmp really
> | needs help in the system boot scripts.
>
> Why? I've been running with MFS /tmp for *years* on several machines.
>
> This indeed required some changes when /var/tmp was changed into a
> symlink to /tmp, but that was really no issue at all.
>
> There's very little difference between a /tmp on disk and a /tmp in
> RAM (through mfs): both get mounted during boot at the same time.
>
> [weerd@pom] $ grep /tmp /etc/fstab
> swap /tmp mfs rw,nodev,noatime,async,nosuid,-s=8388608
> [weerd@pom] $ df -h /tmp
> Filesystem Size Used Avail Capacity Mounted on
> mfs:12547 3.9G 227M 3.5G 6% /tmp
>
> | The critical part for us is that /var/tmp not overwhelm /var, and
> | we can get that with the current scheme by sizing /tmp accordingly.
>
> Having /var/tmp not overwhelm /var is accomplished by having /var/tmp
> symlink to /tmp (assuming /var and /tmp are on separate filesystems).
> If you need more room in /var/tmp then you want to assign to your MFS
> /tmp, then you need a different solution - but that's probably
> something that can also be solved in a different way (don't use
> /var/tmp for temporary storage, but another (dedicated) location for
> whatever needs to write so much there).
What hasn't been mentioned is why /var/tmp was made into a symbolic
link to /tmp.
Is your /var/tmp a seperate filesystem?
Can I have a temporary account to demonstrate the consequences of
filling /var?
> On Tue, Apr 30, 2019 at 01:29:47PM -0700, Lyndon Nerenberg wrote:
> | > Sadly, no :-(
> | >
> | > But I should be able to accomplish what I need using rc.firsttime and
> | > a tiny bit of hackery.
> |
> | Sadly, no :-(
> |
> | What I was aiming for was to have the newly installed machines come
> | up with a 2GB MFS /tmp and a ~20GB /var/tmp. But MFS /tmp really
> | needs help in the system boot scripts.
>
> Why? I've been running with MFS /tmp for *years* on several machines.
>
> This indeed required some changes when /var/tmp was changed into a
> symlink to /tmp, but that was really no issue at all.
>
> There's very little difference between a /tmp on disk and a /tmp in
> RAM (through mfs): both get mounted during boot at the same time.
>
> [weerd@pom] $ grep /tmp /etc/fstab
> swap /tmp mfs rw,nodev,noatime,async,nosuid,-s=8388608
> [weerd@pom] $ df -h /tmp
> Filesystem Size Used Avail Capacity Mounted on
> mfs:12547 3.9G 227M 3.5G 6% /tmp
>
> | The critical part for us is that /var/tmp not overwhelm /var, and
> | we can get that with the current scheme by sizing /tmp accordingly.
>
> Having /var/tmp not overwhelm /var is accomplished by having /var/tmp
> symlink to /tmp (assuming /var and /tmp are on separate filesystems).
> If you need more room in /var/tmp then you want to assign to your MFS
> /tmp, then you need a different solution - but that's probably
> something that can also be solved in a different way (don't use
> /var/tmp for temporary storage, but another (dedicated) location for
> whatever needs to write so much there).
What hasn't been mentioned is why /var/tmp was made into a symbolic
link to /tmp.
Is your /var/tmp a seperate filesystem?
Can I have a temporary account to demonstrate the consequences of
filling /var?
Re: 6.5 auto_install fails due to custom /var/tmp?
On Tue, Apr 30, 2019 at 01:29:47PM -0700, Lyndon Nerenberg wrote:
| > Sadly, no :-(
| >
| > But I should be able to accomplish what I need using rc.firsttime and
| > a tiny bit of hackery.
|
| Sadly, no :-(
|
| What I was aiming for was to have the newly installed machines come
| up with a 2GB MFS /tmp and a ~20GB /var/tmp. But MFS /tmp really
| needs help in the system boot scripts.
Why? I've been running with MFS /tmp for *years* on several machines.
This indeed required some changes when /var/tmp was changed into a
symlink to /tmp, but that was really no issue at all.
There's very little difference between a /tmp on disk and a /tmp in
RAM (through mfs): both get mounted during boot at the same time.
[weerd@pom] $ grep /tmp /etc/fstab
swap /tmp mfs rw,nodev,noatime,async,nosuid,-s=8388608
[weerd@pom] $ df -h /tmp
Filesystem Size Used Avail Capacity Mounted on
mfs:12547 3.9G 227M 3.5G 6% /tmp
| The critical part for us is that /var/tmp not overwhelm /var, and
| we can get that with the current scheme by sizing /tmp accordingly.
Having /var/tmp not overwhelm /var is accomplished by having /var/tmp
symlink to /tmp (assuming /var and /tmp are on separate filesystems).
If you need more room in /var/tmp then you want to assign to your MFS
/tmp, then you need a different solution - but that's probably
something that can also be solved in a different way (don't use
/var/tmp for temporary storage, but another (dedicated) location for
whatever needs to write so much there).
Cheers,
Paul 'WEiRD' de Weerd
--
>++++++++[<++++++++++>-]<+++++++.>+++[<------>-]<.>+++[<+
+++++++++++>-]<.>++[<------------>-]<+.--------------.[-]
http://www.weirdnet.nl/
| > Sadly, no :-(
| >
| > But I should be able to accomplish what I need using rc.firsttime and
| > a tiny bit of hackery.
|
| Sadly, no :-(
|
| What I was aiming for was to have the newly installed machines come
| up with a 2GB MFS /tmp and a ~20GB /var/tmp. But MFS /tmp really
| needs help in the system boot scripts.
Why? I've been running with MFS /tmp for *years* on several machines.
This indeed required some changes when /var/tmp was changed into a
symlink to /tmp, but that was really no issue at all.
There's very little difference between a /tmp on disk and a /tmp in
RAM (through mfs): both get mounted during boot at the same time.
[weerd@pom] $ grep /tmp /etc/fstab
swap /tmp mfs rw,nodev,noatime,async,nosuid,-s=8388608
[weerd@pom] $ df -h /tmp
Filesystem Size Used Avail Capacity Mounted on
mfs:12547 3.9G 227M 3.5G 6% /tmp
| The critical part for us is that /var/tmp not overwhelm /var, and
| we can get that with the current scheme by sizing /tmp accordingly.
Having /var/tmp not overwhelm /var is accomplished by having /var/tmp
symlink to /tmp (assuming /var and /tmp are on separate filesystems).
If you need more room in /var/tmp then you want to assign to your MFS
/tmp, then you need a different solution - but that's probably
something that can also be solved in a different way (don't use
/var/tmp for temporary storage, but another (dedicated) location for
whatever needs to write so much there).
Cheers,
Paul 'WEiRD' de Weerd
--
>++++++++[<++++++++++>-]<+++++++.>+++[<------>-]<.>+++[<+
+++++++++++>-]<.>++[<------------>-]<+.--------------.[-]
http://www.weirdnet.nl/
Sudden problems logging into websites
This is a strange problem:
There are two websites (a bank and a healthcare provider) that I can
access using Firefox ESR or Chromium on Linux (OpenSUSE Leap 15.0).
But just starting a few weeks ago, I cannot log into these sites using
my OpenBSD 6.4 machine. I could log in last month, but I am not able to
log in now. I have tried both Firefox ESR and Iridium on OpenBSD. I've
tried changing my user agent string. I've also deleted all of my
browser preferences, but I still cannot log in. In one case, the
website prints an obscure error message after I enter my password. On
the other website, each time I enter my password it asks me to log in
again, without any error message. I've contacted the website
administrators of one site, and they're clueless.
I have not changed anything on my OpenBSD machine within in the last
month. But one of the websites has updated its appearance within the
last month. So, these websites appear to have made some sort of change
that causes this problem on OpenBSD, but not on Linux.
Is anyone else seeing this behavior?
There are two websites (a bank and a healthcare provider) that I can
access using Firefox ESR or Chromium on Linux (OpenSUSE Leap 15.0).
But just starting a few weeks ago, I cannot log into these sites using
my OpenBSD 6.4 machine. I could log in last month, but I am not able to
log in now. I have tried both Firefox ESR and Iridium on OpenBSD. I've
tried changing my user agent string. I've also deleted all of my
browser preferences, but I still cannot log in. In one case, the
website prints an obscure error message after I enter my password. On
the other website, each time I enter my password it asks me to log in
again, without any error message. I've contacted the website
administrators of one site, and they're clueless.
I have not changed anything on my OpenBSD machine within in the last
month. But one of the websites has updated its appearance within the
last month. So, these websites appear to have made some sort of change
that causes this problem on OpenBSD, but not on Linux.
Is anyone else seeing this behavior?
Re: 6.5 auto_install fails due to custom /var/tmp?
> Sadly, no :-(
>
> But I should be able to accomplish what I need using rc.firsttime and
> a tiny bit of hackery.
Sadly, no :-(
What I was aiming for was to have the newly installed machines come
up with a 2GB MFS /tmp and a ~20GB /var/tmp. But MFS /tmp really
needs help in the system boot scripts.
The critical part for us is that /var/tmp not overwhelm /var, and
we can get that with the current scheme by sizing /tmp accordingly.
--lyndon
>
> But I should be able to accomplish what I need using rc.firsttime and
> a tiny bit of hackery.
Sadly, no :-(
What I was aiming for was to have the newly installed machines come
up with a 2GB MFS /tmp and a ~20GB /var/tmp. But MFS /tmp really
needs help in the system boot scripts.
The critical part for us is that /var/tmp not overwhelm /var, and
we can get that with the current scheme by sizing /tmp accordingly.
--lyndon
Re: 6.5 auto_install fails due to custom /var/tmp?
Nick Holland writes:
> normally, /var/tmp is a symlink to /tmp.
> It can't make the link. No surprise.
> Answer "Yes" to the "Continue anyway?" prompt, and all will be fine, I
> believe.
Sadly, no :-(
But I should be able to accomplish what I need using rc.firsttime and
a tiny bit of hackery.
--lyndon
> normally, /var/tmp is a symlink to /tmp.
> It can't make the link. No surprise.
> Answer "Yes" to the "Continue anyway?" prompt, and all will be fine, I
> believe.
Sadly, no :-(
But I should be able to accomplish what I need using rc.firsttime and
a tiny bit of hackery.
--lyndon
Re: Update [1/4]: devel/py-test 3.5.0 -> 4.4.0
It seems ok for me. Thank you for update.
On Mon, Apr 29, 2019 at 12:43 PM Stuart Henderson <stu@spacehopper.org> wrote:
>
> On 2019/04/28 23:27, Kurt Mosiejczuk wrote:
> > I actually found I was missing two RUN_DEPENDS, py-atomicwrites
> > and, for python 2.7, py-pathlib2.
> >
> > Those are included here.
> >
> > Besides the extensive testing I've done making sure we don't
> > regress, I tested all ports that list py-test as a BUILD_DEPENDS.
> >
> > devel/py-pluggy and devel/py-hypothesis updates are needed
> > for tests of this and other things. They are coming right after
> > this email.
>
> OK for the four (I would prefer to mention cpuinfo in a Makefile
> comment for devel/py-test-benchmark rather than just hidden in a patch
> though).
>
> +cc shadchin@, any comments?
>
> > --Kurt
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/py-test/Makefile,v
> > retrieving revision 1.30
> > diff -u -p -r1.30 Makefile
> > --- Makefile 28 Apr 2018 10:47:05 -0000 1.30
> > +++ Makefile 29 Apr 2019 03:09:46 -0000
> > @@ -2,13 +2,13 @@
> >
> > COMMENT= cross-project testing tool for Python
> >
> > -MODPY_EGG_VERSION= 3.5.0
> > +MODPY_EGG_VERSION = 4.4.0
> > DISTNAME= pytest-${MODPY_EGG_VERSION}
> > PKGNAME= py-test-${MODPY_EGG_VERSION}
> >
> > CATEGORIES= devel
> >
> > -HOMEPAGE= http://pytest.org/latest/
> > +HOMEPAGE = https://docs.pytest.org/en/latest/
> >
> > MAINTAINER= Alexandr Shadchin <shadchin@openbsd.org>
> >
> > @@ -18,29 +18,40 @@ PERMIT_PACKAGE_CDROM= Yes
> > MODULES= lang/python
> >
> > MODPY_PI = Yes
> > -MODPY_SETUPTOOLS= Yes
> > +MODPY_SETUPTOOLS = Yes
> > +MODPY_PYTEST = Yes
> > +MODPY_PYTEST_ARGS = testing
> >
> > FLAVORS= python3
> > FLAVOR?=
> >
> > -BUILD_DEPENDS= devel/py-setuptools_scm${MODPY_FLAVOR}
> > +BUILD_DEPENDS = devel/py-setuptools_scm${MODPY_FLAVOR}
> >
> > -RUN_DEPENDS= devel/py-attrs${MODPY_FLAVOR}>=17.4.0 \
> > +RUN_DEPENDS = devel/py-atomicwrites${MODPY_FLAVOR} \
> > + devel/py-attrs${MODPY_FLAVOR}>=17.4.0 \
> > devel/py-more-itertools${MODPY_FLAVOR} \
> > - devel/py-pluggy${MODPY_FLAVOR}>=0.6 \
> > - devel/py-py${MODPY_FLAVOR}>=1.5.0 \
> > + devel/py-pluggy${MODPY_FLAVOR}>=0.9 \
> > + devel/py-py${MODPY_FLAVOR} \
> > devel/py-setuptools${MODPY_FLAVOR} \
> > - devel/py-six${MODPY_FLAVOR}>=1.10.0
> > + devel/py-six${MODPY_FLAVOR}
> > .if !${FLAVOR:Mpython3}
> > -RUN_DEPENDS += devel/py-funcsigs
> > +RUN_DEPENDS += devel/py-funcsigs \
> > + devel/py-pathlib2
> > .endif
> >
> > -TEST_DEPENDS= ${RUN_DEPENDS} \
> > +TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH} \
> > + ${RUN_DEPENDS} \
> > devel/py-hypothesis${MODPY_FLAVOR} \
> > devel/py-mock${MODPY_FLAVOR} \
> > devel/py-nose${MODPY_FLAVOR} \
> > shells/bash \
> > www/py-requests${MODPY_FLAVOR}
> > +.if !${FLAVOR:Mpython3}
> > +TEST_DEPENDS += devel/py-pathlib2 \
> > + sysutils/py-scandir
> > +.endif
> > +
> > +
> >
> > post-install:
> > mv ${PREFIX}/bin/py.test{,${MODPY_BIN_SUFFIX}}
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/devel/py-test/distinfo,v
> > retrieving revision 1.17
> > diff -u -p -r1.17 distinfo
> > --- distinfo 28 Apr 2018 10:47:05 -0000 1.17
> > +++ distinfo 29 Apr 2019 03:09:46 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (pytest-3.5.0.tar.gz) = +uSR0YdPGZU3/VhyteHw50oAm5ed+dU9FVP9A9oXA+E=
> > -SIZE (pytest-3.5.0.tar.gz) = 830816
> > +SHA256 (pytest-4.4.0.tar.gz) = 8h0vH7ggCDDcu12OxGapyRIOINi1PHWF0YASXM4dKXo=
> > +SIZE (pytest-4.4.0.tar.gz) = 931197
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/devel/py-test/pkg/PLIST,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 PLIST
> > --- pkg/PLIST 28 Apr 2018 10:47:05 -0000 1.9
> > +++ pkg/PLIST 29 Apr 2019 03:09:46 -0000
> > @@ -11,7 +11,6 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}cacheprovider.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}debugging.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}deprecated.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}doctest.${MODPY_PYC_MAGIC_TAG}pyc
> > @@ -27,18 +26,22 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}nose.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}outcomes.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pastebin.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pathlib.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pytester.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}python_api.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}recwarn.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}reports.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}resultlog.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}setuponly.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}setupplan.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}skipping.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}stepwise.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}terminal.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}tmpdir.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}unittest.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}warning_types.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}warnings.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_argcomplete.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_code/
> > @@ -51,6 +54,12 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_code/_py2traceback.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_code/code.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_code/source.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/__init__.py
> > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/_io/${MODPY_PYCACHE}/
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/${MODPY_PYCACHE}saferepr.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/saferepr.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_version.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/
> > lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/__init__.py
> > @@ -65,7 +74,16 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/cacheprovider.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/capture.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/compat.py
> > -lib/python${MODPY_VERSION}/site-packages/_pytest/config.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/__init__.py
> > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}/
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}argparsing.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}findpaths.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/argparsing.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/exceptions.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/findpaths.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/debugging.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/deprecated.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/doctest.py
> > @@ -91,18 +109,22 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/nose.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/outcomes.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/pastebin.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/pathlib.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/pytester.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/python.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/python_api.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/recwarn.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/reports.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/resultlog.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/runner.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/setuponly.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/setupplan.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/skipping.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/stepwise.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/terminal.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/tmpdir.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/unittest.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/warning_types.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/warnings.py
> > lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> > lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> >
--
Alexandr Shadchin
On Mon, Apr 29, 2019 at 12:43 PM Stuart Henderson <stu@spacehopper.org> wrote:
>
> On 2019/04/28 23:27, Kurt Mosiejczuk wrote:
> > I actually found I was missing two RUN_DEPENDS, py-atomicwrites
> > and, for python 2.7, py-pathlib2.
> >
> > Those are included here.
> >
> > Besides the extensive testing I've done making sure we don't
> > regress, I tested all ports that list py-test as a BUILD_DEPENDS.
> >
> > devel/py-pluggy and devel/py-hypothesis updates are needed
> > for tests of this and other things. They are coming right after
> > this email.
>
> OK for the four (I would prefer to mention cpuinfo in a Makefile
> comment for devel/py-test-benchmark rather than just hidden in a patch
> though).
>
> +cc shadchin@, any comments?
>
> > --Kurt
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/py-test/Makefile,v
> > retrieving revision 1.30
> > diff -u -p -r1.30 Makefile
> > --- Makefile 28 Apr 2018 10:47:05 -0000 1.30
> > +++ Makefile 29 Apr 2019 03:09:46 -0000
> > @@ -2,13 +2,13 @@
> >
> > COMMENT= cross-project testing tool for Python
> >
> > -MODPY_EGG_VERSION= 3.5.0
> > +MODPY_EGG_VERSION = 4.4.0
> > DISTNAME= pytest-${MODPY_EGG_VERSION}
> > PKGNAME= py-test-${MODPY_EGG_VERSION}
> >
> > CATEGORIES= devel
> >
> > -HOMEPAGE= http://pytest.org/latest/
> > +HOMEPAGE = https://docs.pytest.org/en/latest/
> >
> > MAINTAINER= Alexandr Shadchin <shadchin@openbsd.org>
> >
> > @@ -18,29 +18,40 @@ PERMIT_PACKAGE_CDROM= Yes
> > MODULES= lang/python
> >
> > MODPY_PI = Yes
> > -MODPY_SETUPTOOLS= Yes
> > +MODPY_SETUPTOOLS = Yes
> > +MODPY_PYTEST = Yes
> > +MODPY_PYTEST_ARGS = testing
> >
> > FLAVORS= python3
> > FLAVOR?=
> >
> > -BUILD_DEPENDS= devel/py-setuptools_scm${MODPY_FLAVOR}
> > +BUILD_DEPENDS = devel/py-setuptools_scm${MODPY_FLAVOR}
> >
> > -RUN_DEPENDS= devel/py-attrs${MODPY_FLAVOR}>=17.4.0 \
> > +RUN_DEPENDS = devel/py-atomicwrites${MODPY_FLAVOR} \
> > + devel/py-attrs${MODPY_FLAVOR}>=17.4.0 \
> > devel/py-more-itertools${MODPY_FLAVOR} \
> > - devel/py-pluggy${MODPY_FLAVOR}>=0.6 \
> > - devel/py-py${MODPY_FLAVOR}>=1.5.0 \
> > + devel/py-pluggy${MODPY_FLAVOR}>=0.9 \
> > + devel/py-py${MODPY_FLAVOR} \
> > devel/py-setuptools${MODPY_FLAVOR} \
> > - devel/py-six${MODPY_FLAVOR}>=1.10.0
> > + devel/py-six${MODPY_FLAVOR}
> > .if !${FLAVOR:Mpython3}
> > -RUN_DEPENDS += devel/py-funcsigs
> > +RUN_DEPENDS += devel/py-funcsigs \
> > + devel/py-pathlib2
> > .endif
> >
> > -TEST_DEPENDS= ${RUN_DEPENDS} \
> > +TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH} \
> > + ${RUN_DEPENDS} \
> > devel/py-hypothesis${MODPY_FLAVOR} \
> > devel/py-mock${MODPY_FLAVOR} \
> > devel/py-nose${MODPY_FLAVOR} \
> > shells/bash \
> > www/py-requests${MODPY_FLAVOR}
> > +.if !${FLAVOR:Mpython3}
> > +TEST_DEPENDS += devel/py-pathlib2 \
> > + sysutils/py-scandir
> > +.endif
> > +
> > +
> >
> > post-install:
> > mv ${PREFIX}/bin/py.test{,${MODPY_BIN_SUFFIX}}
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/devel/py-test/distinfo,v
> > retrieving revision 1.17
> > diff -u -p -r1.17 distinfo
> > --- distinfo 28 Apr 2018 10:47:05 -0000 1.17
> > +++ distinfo 29 Apr 2019 03:09:46 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (pytest-3.5.0.tar.gz) = +uSR0YdPGZU3/VhyteHw50oAm5ed+dU9FVP9A9oXA+E=
> > -SIZE (pytest-3.5.0.tar.gz) = 830816
> > +SHA256 (pytest-4.4.0.tar.gz) = 8h0vH7ggCDDcu12OxGapyRIOINi1PHWF0YASXM4dKXo=
> > +SIZE (pytest-4.4.0.tar.gz) = 931197
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/devel/py-test/pkg/PLIST,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 PLIST
> > --- pkg/PLIST 28 Apr 2018 10:47:05 -0000 1.9
> > +++ pkg/PLIST 29 Apr 2019 03:09:46 -0000
> > @@ -11,7 +11,6 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}cacheprovider.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}capture.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}debugging.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}deprecated.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}doctest.${MODPY_PYC_MAGIC_TAG}pyc
> > @@ -27,18 +26,22 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}nose.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}outcomes.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pastebin.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pathlib.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}pytester.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}python_api.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}recwarn.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}reports.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}resultlog.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}setuponly.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}setupplan.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}skipping.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}stepwise.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}terminal.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}tmpdir.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}unittest.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}warning_types.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/${MODPY_PYCACHE}warnings.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_argcomplete.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_code/
> > @@ -51,6 +54,12 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_code/_py2traceback.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_code/code.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_code/source.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/__init__.py
> > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/_io/${MODPY_PYCACHE}/
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/${MODPY_PYCACHE}saferepr.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/_io/saferepr.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/_version.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/
> > lib/python${MODPY_VERSION}/site-packages/_pytest/assertion/__init__.py
> > @@ -65,7 +74,16 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/cacheprovider.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/capture.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/compat.py
> > -lib/python${MODPY_VERSION}/site-packages/_pytest/config.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/__init__.py
> > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}/
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}argparsing.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/${MODPY_PYCACHE}findpaths.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/argparsing.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/exceptions.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/config/findpaths.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/debugging.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/deprecated.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/doctest.py
> > @@ -91,18 +109,22 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/_pytest/nose.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/outcomes.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/pastebin.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/pathlib.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/pytester.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/python.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/python_api.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/recwarn.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/reports.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/resultlog.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/runner.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/setuponly.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/setupplan.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/skipping.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/stepwise.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/terminal.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/tmpdir.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/unittest.py
> > +lib/python${MODPY_VERSION}/site-packages/_pytest/warning_types.py
> > lib/python${MODPY_VERSION}/site-packages/_pytest/warnings.py
> > lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> > lib/python${MODPY_VERSION}/site-packages/pytest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> >
--
Alexandr Shadchin
Re: Upgrading a CARP firewall cluster
mabi writes:
> Now I would first like to upgrade the cluster to 6.4 and then to 6.5 and was
> wondering if it is possible to operate that cluster for a short amount of tim
> e having one node running 6.3 and the other node with 6.4 and then the same f
> or going to 6.4 to 6.5.
In general this is not a problem. We run several carp-ed firewall
(and load balancer/proxy) pairs, and upgrade them in this manner.
As was already mentioned, always read the release notes to look for
carp or pfsync changes that might cause trouble.
On our systems, we run the 'a' machine as primary and the 'b' machine
as backup. When upgrading, we do the 'b' machine first, since this
doesn't disrupt the primary. After the 'b' machine is fully configured,
monitor its state table to ensure it's consistent with the 'a'
machine. Once you are convinced pf is staying in sync, demote the
'a' machine and upgrade it.
Make sure you have 'net.inet.carp.preempt=1' in /etc/sysctl.conf, and
set advskew appropriately on each host in the pair.
--lyndon
> Now I would first like to upgrade the cluster to 6.4 and then to 6.5 and was
> wondering if it is possible to operate that cluster for a short amount of tim
> e having one node running 6.3 and the other node with 6.4 and then the same f
> or going to 6.4 to 6.5.
In general this is not a problem. We run several carp-ed firewall
(and load balancer/proxy) pairs, and upgrade them in this manner.
As was already mentioned, always read the release notes to look for
carp or pfsync changes that might cause trouble.
On our systems, we run the 'a' machine as primary and the 'b' machine
as backup. When upgrading, we do the 'b' machine first, since this
doesn't disrupt the primary. After the 'b' machine is fully configured,
monitor its state table to ensure it's consistent with the 'a'
machine. Once you are convinced pf is staying in sync, demote the
'a' machine and upgrade it.
Make sure you have 'net.inet.carp.preempt=1' in /etc/sysctl.conf, and
set advskew appropriately on each host in the pair.
--lyndon
Re: UPDATE: libdvdread 6.0.1 / libdvdnav 6.0.0 / libdvdcss
On Mon, Apr 29, 2019 at 08:37:58PM -0400, Kurt Mosiejczuk wrote:
> On Mon, Apr 29, 2019 at 07:39:30PM -0400, Brad Smith wrote:
> > ping.
>
> I compiled these libraries and used them to play a DVD on my amd64
> laptop.
>
> I again give OK kmos
>
> Anyone else want to OK?
>
> --Kurt
Go for it, I don't even have a dvd player to test it right now :(
> On Mon, Apr 29, 2019 at 07:39:30PM -0400, Brad Smith wrote:
> > ping.
>
> I compiled these libraries and used them to play a DVD on my amd64
> laptop.
>
> I again give OK kmos
>
> Anyone else want to OK?
>
> --Kurt
Go for it, I don't even have a dvd player to test it right now :(
Re: rm lang/jikes, java/junit
On Tue, Apr 30 2019, Ian Darwin <ian@darwinsys.com> wrote:
> I'm going to kill these two next week if nobody objects.
>
> junit, because everybody in Java-land should be using maven or gradle, not assembling dependencies with a pair of tweezers
>
> jikes, because it's old and unmaintained.
>
> Anyone who wants them kept automatically becomes maintainer.
ok jca@ to remove both.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
> I'm going to kill these two next week if nobody objects.
>
> junit, because everybody in Java-land should be using maven or gradle, not assembling dependencies with a pair of tweezers
>
> jikes, because it's old and unmaintained.
>
> Anyone who wants them kept automatically becomes maintainer.
ok jca@ to remove both.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
rm lang/jikes, java/junit
I'm going to kill these two next week if nobody objects.
junit, because everybody in Java-land should be using maven or gradle, not assembling dependencies with a pair of tweezers
jikes, because it's old and unmaintained.
Anyone who wants them kept automatically becomes maintainer.
junit, because everybody in Java-land should be using maven or gradle, not assembling dependencies with a pair of tweezers
jikes, because it's old and unmaintained.
Anyone who wants them kept automatically becomes maintainer.
NEW graphics/eggx-0.93r5
Port for eggx/PROCALL library. Only minor patches -- a few calls to
sprintf switched to snprintf.
I have also added a patch which causes their `make install` to also
generate a pkg-config pc file to make it easy to use with pkg-config if
desired.
I will take maintainership.
Tested on AMD64 with -current, tests on other platforms appreciated.
~ Charles
sprintf switched to snprintf.
I have also added a patch which causes their `make install` to also
generate a pkg-config pc file to make it easy to use with pkg-config if
desired.
I will take maintainership.
Tested on AMD64 with -current, tests on other platforms appreciated.
~ Charles
Press Update: Contractor fined for illegal asbestos work
| The latest health and safety headlines |
|
Health and Safety Executive - 5N1 Redgrave Court, Merton Road, Bootle, Merseyside L20 7HS
Subscribe to:
Posts (Atom)