CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/18 22:19:45 Log message: Import py3-qtwebengine-5.13.2; OK kn@ Python bindings for the Qt5 toolkit, QtWebEngine module Status: Vendor Tag: rsadowski Release Tags: rsadowski_20200519 N ports/www/py-qtwebengine/Makefile N ports/www/py-qtwebengine/distinfo N ports/www/py-qtwebengine/pkg/DESCR N ports/www/py-qtwebengine/pkg/PLIST No conflicts created by this import
UPDATE: net/snort 2.9.16
This updates Snort to 2.9.16.
https://blog.snort.org/2020/04/snort-29160-has-been-released.html
Upstream has a daq 2.0.7 release too, where the only change is the
addition of a daq.vcxproj file for 64-bit Windows. But their distfile
still ships with the configure script generated for daq-2.0.6, causing
the build to fail. I think they did not generate a new configure from
the 2.0.7 configure.ac.
However, for our purposes there is no functional change between
daq-2.0.6 and daq-2.0.7, so I did not spend too much time trying to make
it work since snort-2.9.16 builds and runs just fine with daq-2.0.6.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile1 Dec 2019 03:19:10 - 1.106
+++ Makefile19 May 2020 02:20:57 -
@@ -2,8 +2,8 @@
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.9.15
-RULESV = 29150
+DISTNAME = snort-2.9.16
+RULESV = 29160
SUBST_VARS = RULESV
CATEGORIES = net security
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo1 Dec 2019 03:19:10 - 1.42
+++ distinfo17 May 2020 01:14:58 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.15.tar.gz) = v7Q3dGRG73KgPFAdsTzW2l7dK0H1XIDEN7ooi+bafbo=
-SIZE (snort-2.9.15.tar.gz) = 6704763
+SHA256 (snort-2.9.16.tar.gz) = lojY7fHaCd7GV0AA+zwOYvmcVkKFh2FuF8YBA8C8utc=
+SIZE (snort-2.9.16.tar.gz) = 6948498
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_decode_h
--- patches/patch-src_decode_h 28 Jan 2018 03:09:12 - 1.11
+++ patches/patch-src_decode_h 17 May 2020 01:15:23 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_decode_h,v 1.11 2018
Index: src/decode.h
--- src/decode.h.orig
+++ src/decode.h
-@@ -835,9 +835,9 @@ typedef struct _SLLHdr {
+@@ -837,9 +837,9 @@ typedef struct _SLLHdr {
* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-preprocessors_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.20
diff -u -p -r1.20 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 1 Dec 2019 03:19:10
- 1.20
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 17 May 2020 01:15:25
-
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
Index: src/dynamic-preprocessors/Makefile.in
--- src/dynamic-preprocessors/Makefile.in.orig
+++ src/dynamic-preprocessors/Makefile.in
-@@ -1647,19 +1647,8 @@ clean-local:
+@@ -1649,19 +1649,8 @@ clean-local:
rm -rf include build
install-data-local:
Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v
retrieving revision 1.17
diff -u -p -r1.17 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 1 Dec 2019
03:19:10 - 1.17
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 17 May 2020
01:15:27 -
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/dcerpc2
@SO_WITH_STATIC_LIB_TRUE@libsf_dce2_preproc_la_LIBADD = \
@SO_WITH_STATIC_LIB_TRUE@ ../libsf_dynamic_preproc.la \
@SO_WITH_STATIC_LIB_TRUE@ $(am__append_1)
-@@ -608,7 +608,7 @@ distdir-am: $(DISTFILES)
+@@ -609,7 +609,7 @@ distdir-am: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
===
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in1 Dec 2019
03:19:10 - 1.15
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in17 May 2020
01:15:29 -
@@ -11,7 +11,7 @@ Index: src/dynamic-preprocessors/dnp3/Ma
@SO_WITH_STATIC_LIB_TRUE@libsf_dnp3_preproc_la_LIBADD = \
@SO_WITH_STATIC_LIB_TRUE@ ../libsf_dynamic_preproc.la \
@SO_WITH_STATIC_LIB_TRUE@ $(am__append_1)
-@@ -591,7 +591,7 @@ distdir-am: $(DISTFILES)
+@@ -592,7 +592,7 @@ distdir-am: $(DISTFILES)
done
check-am: all-am
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/18 19:23:09 Modified files: x11/mate/caja : Makefile Log message: Fix build of x11/mate/caja for base-gcc ok jca@
Re: sysutils/u-boot: Various u-boot changes
On Mon, May 18, 2020 at 08:09:21PM -0400, k...@intricatesoftware.com wrote:
> Various u-boot changes:
> * Rockchip now outputs a single image that combines idbloader.img
> and u-boot.itb called u-boot-rockchip.bin. It gets written at
> block 64. For example:
> dd if=u-boot-rockchip.bin of=/dev/sdXc seek=64
> * Fix rock64 gen3 SPL boot hang. Submitted upstream and awaiting
> review. Tested on both gen2 and gen3 boards.
> * Enable PCIe gen2 on rockpro64. I've been running with this
> since December and tested various PCIe boards.
>
> okay?
This looks fine, but isn't there also a PFRAG.arm change needed for
tinker-rk3288?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> retrieving revision 1.68
> diff -u -p -u -r1.68 Makefile
> --- Makefile 15 May 2020 12:53:13 - 1.68
> +++ Makefile 18 May 2020 22:11:35 -
> @@ -8,6 +8,7 @@ FLAVOR?= arm
>
> COMMENT= U-Boot firmware
> VERSION= 2020.04
> +REVISION=0
> DISTNAME=u-boot-${VERSION}
> PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
> FULLPKGNAME= ${PKGNAME}
> @@ -148,6 +149,7 @@ FILES=\
> u-boot-spl.kwb \
> u-boot-with-spl.bin \
> u-boot.itb \
> + u-boot-rockchip.bin \
> idbloader.img \
> spl/sunxi-spl.bin \
>
> Index: patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi
> ===
> RCS file: patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi
> diff -N patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi 18 May 2020
> 22:11:35 -
> @@ -0,0 +1,35 @@
> +$OpenBSD$
> +
> +Fix gen3 SPL boot hang
> +
> +Index: arch/arm/dts/rk3328-rock64-u-boot.dtsi
> +--- arch/arm/dts/rk3328-rock64-u-boot.dtsi.orig
> arch/arm/dts/rk3328-rock64-u-boot.dtsi
> +@@ -11,6 +11,27 @@
> + };
> + };
> +
> ++ {
> ++u-boot,dm-spl;
> ++};
> ++
> ++ {
> ++u-boot,dm-spl;
> ++};
> ++
> ++_gpio {
> ++u-boot,dm-spl;
> ++};
> ++
> ++_pull_up_4ma {
> ++u-boot,dm-spl;
> ++};
> ++
> + _host0_xhci {
> + status = "okay";
> ++};
> ++
> ++/* Need this and all the pinctrl/gpio stuff above to set pinmux */
> ++_sd {
> ++u-boot,dm-spl;
> + };
> Index: patches/patch-arch_arm_dts_rk3399-rockpro64_dts
> ===
> RCS file:
> /cvs/ports/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-rockpro64_dts,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 patch-arch_arm_dts_rk3399-rockpro64_dts
> --- patches/patch-arch_arm_dts_rk3399-rockpro64_dts 17 Jan 2020 14:24:42
> - 1.4
> +++ patches/patch-arch_arm_dts_rk3399-rockpro64_dts 18 May 2020 22:11:35
> -
> @@ -1,5 +1,7 @@
> $OpenBSD: patch-arch_arm_dts_rk3399-rockpro64_dts,v 1.4 2020/01/17 14:24:42
> kurt Exp $
>
> +Set baud rate, enable fan control and PCIe gen2.
> +
> Index: arch/arm/dts/rk3399-rockpro64.dts
> --- arch/arm/dts/rk3399-rockpro64.dts.orig
> +++ arch/arm/dts/rk3399-rockpro64.dts
> @@ -20,7 +22,15 @@ Index: arch/arm/dts/rk3399-rockpro64.dts
> #cooling-cells = <2>;
> fan-supply = <_dcin>;
> pwms = < 0 5 0>;
> -@@ -750,4 +751,43 @@
> +@@ -522,6 +523,7 @@
> +
> + {
> + ep-gpios = < RK_PD4 GPIO_ACTIVE_HIGH>;
> ++max-link-speed = <2>;
> + num-lanes = <4>;
> + pinctrl-names = "default";
> + pinctrl-0 = <_perst>;
> +@@ -750,4 +752,43 @@
>
> _mmu {
> status = "okay";
> Index: patches/patch-configs_rock64-rk3328_defconfig
> ===
> RCS file:
> /cvs/ports/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 patch-configs_rock64-rk3328_defconfig
> --- patches/patch-configs_rock64-rk3328_defconfig 7 Jan 2020 07:07:08
> - 1.2
> +++ patches/patch-configs_rock64-rk3328_defconfig 18 May 2020 22:11:35
> -
> @@ -1,9 +1,47 @@
> $OpenBSD: patch-configs_rock64-rk3328_defconfig,v 1.2 2020/01/07 07:07:08
> jsg Exp $
>
> +Fix gen3 SPL boot hang
> +
> Index: configs/rock64-rk3328_defconfig
> --- configs/rock64-rk3328_defconfig.orig
> +++ configs/rock64-rk3328_defconfig
> -@@ -73,7 +73,7 @@ CONFIG_RAM=y
> +@@ -1,6 +1,7 @@
> + CONFIG_ARM=y
> + CONFIG_ARCH_ROCKCHIP=y
> + CONFIG_SYS_TEXT_BASE=0x0020
> ++CONFIG_SPL_GPIO_SUPPORT=y
> + CONFIG_ENV_OFFSET=0x3F8000
> + CONFIG_ROCKCHIP_RK3328=y
> + CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> +@@ -25,6 +26,8 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
> + # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> + CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> + CONFIG_SPL_STACK_R=y
> ++CONFIG_SPL_I2C_SUPPORT=y
> ++CONFIG_SPL_POWER_SUPPORT=y
> + CONFIG_SPL_ATF=y
> + CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> + CONFIG_CMD_BOOTZ=y
> +@@ -36,7 +39,7 @@ CONFIG_CMD_TIME=y
> + CONFIG_SPL_OF_CONTROL=y
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 19:04:13 Modified files: mail/dovecot : Tag: OPENBSD_6_7 Makefile distinfo Log message: MFC dovecot update to 2.3.10.1 for security fixes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 18:58:55 Modified files: telephony/asterisk: Tag: OPENBSD_6_7 Makefile distinfo telephony/asterisk/patches: Tag: OPENBSD_6_7 patch-configure_ac patch-res_res_pjsip_pjsip_options_c telephony/asterisk/pkg: Tag: OPENBSD_6_7 PLIST-main Log message: MFC asterisk 16.10.0 update; with some crash and memory leak fixes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 18:56:55 Modified files: security/clamav: Tag: OPENBSD_6_7 Makefile distinfo Log message: MFC clamav update, DoS in PDF, out-of-bounds read in ARJ
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 18:55:41 Modified files: lang/php/7.2 : Tag: OPENBSD_6_7 Makefile distinfo lang/php/7.2/pkg: Tag: OPENBSD_6_7 PLIST-gd PLIST-main PLIST-mysqli lang/php/7.3 : Tag: OPENBSD_6_7 Makefile distinfo lang/php/7.3/pkg: Tag: OPENBSD_6_7 PLIST-gd PLIST-gmp PLIST-main PLIST-mysqli lang/php/7.4 : Tag: OPENBSD_6_7 Makefile distinfo lang/php/7.4/pkg: Tag: OPENBSD_6_7 PLIST-gd PLIST-gmp PLIST-main PLIST-mysqli Log message: MFC PHP updates
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 18:41:57 Modified files: sysutils/firmware/intel: Tag: OPENBSD_6_7 Makefile distinfo Log message: pull 20200508 intel microcode back to 6.7-stable
Re: x11/lumina 1.6 maintainer update
On 2020/05/18 22:30, Solene Rapenne wrote: > Le Wed, 29 Apr 2020 16:01:58 -0400, > a écrit : > > > All, > > > > > > > > I know we are in slowdown for 6.7 so I'm not asking that we push this > > in. However, I'd really appreciate it if others could try my update > > to get us from 1.4 to 1.6 of the Lumina Desktop Environment. I've > > included the diff below and would welcome feedback: > > > > Hello, > > something went wrong with your patch, it's not applicable, there are > lot of newlines in it, but removing them isn't enough to apply > correctly. > It was sent as text/html which was converted to readable text by the list server but that didn't do good things for the diff. Not that it would have been usable in text/html either!
devel/gdb: Fix backtrace across signals on amd64
Fix backtrace across signals on amd64
The 'Apply the retpoline transformation to indirect jumps in the
raw ASM' commit in 6.4 added an instruction to the sigcode.
This fixes the offset to look for sigreturn and mantains
backward compat till 5.0.
okay?
Index: Makefile
===
RCS file: /cvs/ports/devel/gdb/Makefile,v
retrieving revision 1.65
diff -u -p -u -r1.65 Makefile
--- Makefile29 Mar 2020 17:23:30 - 1.65
+++ Makefile18 May 2020 21:44:42 -
@@ -4,7 +4,7 @@ COMMENT=GNU debugger
CATEGORIES=devel
DISTNAME= gdb-7.12.1
-REVISION= 10
+REVISION= 11
HOMEPAGE= https://www.gnu.org/software/gdb/
Index: patches/patch-gdb_amd64obsd-tdep_c
===
RCS file: patches/patch-gdb_amd64obsd-tdep_c
diff -N patches/patch-gdb_amd64obsd-tdep_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-gdb_amd64obsd-tdep_c 18 May 2020 21:44:42 -
@@ -0,0 +1,107 @@
+$OpenBSD$
+
+Index: gdb/amd64obsd-tdep.c
+--- gdb/amd64obsd-tdep.c.orig
gdb/amd64obsd-tdep.c
+@@ -76,8 +76,40 @@ amd64obsd_iterate_over_regset_sections (struct gdbarch
+ /* Support for signal handlers. */
+
+ /* Default page size. */
+-static const int amd64obsd_page_size = 4096;
++static const CORE_ADDR amd64obsd_page_size = 4096;
+
++/* Offset & instructions for sigreturn(2). */
++
++#define SIGRETURN_INSN_LEN 9
++
++struct amd64obsd_sigreturn_info_t {
++ int offset;
++ gdb_byte sigreturn[SIGRETURN_INSN_LEN];
++};
++
++static const amd64obsd_sigreturn_info_t
++ amd64obsd_sigreturn_info[] = {
++ /* OpenBSD 6.4 */
++ { 9, { 0x48, 0xc7, 0xc0,
++ 0x67, 0x00, 0x00, 0x00, /* movq $SYS_sigreturn, %rax */
++ 0x0f, 0x05 } }, /* syscall */
++ /* OpenBSD 5.1 */
++ { 6, { 0x48, 0xc7, 0xc0,
++ 0x67, 0x00, 0x00, 0x00, /* movq $SYS_sigreturn, %rax */
++ 0x0f, 0x05 } }, /* syscall */
++ { 7, { 0x48, 0xc7, 0xc0,
++ 0x67, 0x00, 0x00, 0x00, /* movq $SYS_sigreturn, %rax */
++ 0x0f, 0x05 } }, /* syscall */
++ /* OpenBSD 5.0 */
++ { 6, { 0x48, 0xc7, 0xc0,
++ 0x67, 0x00, 0x00, 0x00, /* movq $SYS_sigreturn, %rax */
++ 0xcd, 0x80 } }, /* int $0x80 */
++ { 7, { 0x48, 0xc7, 0xc0,
++ 0x67, 0x00, 0x00, 0x00, /* movq $SYS_sigreturn, %rax */
++ 0xcd, 0x80 } }, /* int $0x80 */
++ { -1, {} }
++};
++
+ /* Return whether THIS_FRAME corresponds to an OpenBSD sigtramp
+routine. */
+
+@@ -86,20 +118,8 @@ amd64obsd_sigtramp_p (struct frame_info *this_frame)
+ {
+ CORE_ADDR pc = get_frame_pc (this_frame);
+ CORE_ADDR start_pc = (pc & ~(amd64obsd_page_size - 1));
+- const gdb_byte osigreturn[] =
+- {
+-0x48, 0xc7, 0xc0,
+-0x67, 0x00, 0x00, 0x00, /* movq $SYS_sigreturn, %rax */
+-0xcd, 0x80/* int $0x80 */
+- };
+- const gdb_byte sigreturn[] =
+- {
+-0x48, 0xc7, 0xc0,
+-0x67, 0x00, 0x00, 0x00, /* movq $SYS_sigreturn, %rax */
+-0x0f, 0x05/* syscall */
+- };
+- size_t buflen = (sizeof sigreturn) + 1;
+- gdb_byte *buf;
++ const amd64obsd_sigreturn_info_t *info;
++ gdb_byte buf[SIGRETURN_INSN_LEN];
+ const char *name;
+
+ /* If the function has a valid symbol name, it isn't a
+@@ -113,22 +133,22 @@ amd64obsd_sigtramp_p (struct frame_info *this_frame)
+ if (find_pc_section (pc) != NULL)
+ return 0;
+
+- /* If we can't read the instructions at START_PC, return zero. */
+- buf = (gdb_byte *) alloca ((sizeof sigreturn) + 1);
+- if (!safe_frame_unwind_memory (this_frame, start_pc + 6, buf, buflen))
+-return 0;
++ for (info = amd64obsd_sigreturn_info; info->offset != -1; info++)
++{
+
+- /* Check for sigreturn(2). Depending on how the assembler encoded
+- the `movq %rsp, %rdi' instruction, the code starts at offset 6 or
+- 7. OpenBSD 5.0 and later use the `syscall' instruction. Older
+- versions use `int $0x80'. Check for both. */
+- if (memcmp (buf, sigreturn, sizeof sigreturn)
+- && memcmp (buf + 1, sigreturn, sizeof sigreturn)
+- && memcmp (buf, osigreturn, sizeof osigreturn)
+- && memcmp (buf + 1, osigreturn, sizeof osigreturn))
+-return 0;
++ /* If we can't read the instructions at return zero. */
++ if (!safe_frame_unwind_memory (this_frame,
++start_pc + info->offset, buf, sizeof buf))
++continue;
+
+- return 1;
++ /* Check for sigreturn(2). */
++ if (memcmp (buf, info->sigreturn, sizeof buf))
++continue;
++
++ return 1;
++}
++
++ return 0;
+ }
+
+ /* Assuming THIS_FRAME is for a BSD sigtramp routine, return the
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 18:17:09 Modified files: devel/rttr : Makefile Log message: NO_TEST=Yes *** Parse error in /usr/ports/devel/rttr: Poisoned variable NO_TESTS is already set
Re: gnome-builder broken on i386
On 2020/05/17 12:09, Stuart Henderson wrote: > On 2020/05/14 09:17, Antoine Jacoutot wrote: > > Log message: > > Update to gnome-builder-3.36.0. > > Final link (cc -o src/gnome-builder [...]) fails on i386: > > ld: error: gdbwire.c:(.debug_info+0x993E71): has non-ABS relocation > R_386_GOTOFF against symbol '.LC74' > > I'll try it with ld.bfd when my next bulk build reaches the right point. > That didn't help, though that failed for a different reason ../gnome-builder-3.36.0/src/libide/core/ide-context.c:165: undefined reference to `peas_engine_get_default' ../gnome-builder-3.36.0/src/libide/core/ide-context.c:165: undefined reference to `peas_extension_set_new' ../gnome-builder-3.36.0/src/libide/core/ide-context.c:179: undefined reference to `peas_extension_set_foreach'
sysutils/u-boot: Various u-boot changes
Various u-boot changes:
* Rockchip now outputs a single image that combines idbloader.img
and u-boot.itb called u-boot-rockchip.bin. It gets written at
block 64. For example:
dd if=u-boot-rockchip.bin of=/dev/sdXc seek=64
* Fix rock64 gen3 SPL boot hang. Submitted upstream and awaiting
review. Tested on both gen2 and gen3 boards.
* Enable PCIe gen2 on rockpro64. I've been running with this
since December and tested various PCIe boards.
okay?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
retrieving revision 1.68
diff -u -p -u -r1.68 Makefile
--- Makefile15 May 2020 12:53:13 - 1.68
+++ Makefile18 May 2020 22:11:35 -
@@ -8,6 +8,7 @@ FLAVOR?=arm
COMMENT= U-Boot firmware
VERSION= 2020.04
+REVISION= 0
DISTNAME= u-boot-${VERSION}
PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
FULLPKGNAME= ${PKGNAME}
@@ -148,6 +149,7 @@ FILES=\
u-boot-spl.kwb \
u-boot-with-spl.bin \
u-boot.itb \
+ u-boot-rockchip.bin \
idbloader.img \
spl/sunxi-spl.bin \
Index: patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi
===
RCS file: patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi
diff -N patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-arch_arm_dts_rk3328-rock64-u-boot_dtsi18 May 2020
22:11:35 -
@@ -0,0 +1,35 @@
+$OpenBSD$
+
+Fix gen3 SPL boot hang
+
+Index: arch/arm/dts/rk3328-rock64-u-boot.dtsi
+--- arch/arm/dts/rk3328-rock64-u-boot.dtsi.orig
arch/arm/dts/rk3328-rock64-u-boot.dtsi
+@@ -11,6 +11,27 @@
+ };
+ };
+
++ {
++ u-boot,dm-spl;
++};
++
++ {
++ u-boot,dm-spl;
++};
++
++_gpio {
++ u-boot,dm-spl;
++};
++
++_pull_up_4ma {
++ u-boot,dm-spl;
++};
++
+ _host0_xhci {
+ status = "okay";
++};
++
++/* Need this and all the pinctrl/gpio stuff above to set pinmux */
++_sd {
++ u-boot,dm-spl;
+ };
Index: patches/patch-arch_arm_dts_rk3399-rockpro64_dts
===
RCS file:
/cvs/ports/sysutils/u-boot/patches/patch-arch_arm_dts_rk3399-rockpro64_dts,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-arch_arm_dts_rk3399-rockpro64_dts
--- patches/patch-arch_arm_dts_rk3399-rockpro64_dts 17 Jan 2020 14:24:42
- 1.4
+++ patches/patch-arch_arm_dts_rk3399-rockpro64_dts 18 May 2020 22:11:35
-
@@ -1,5 +1,7 @@
$OpenBSD: patch-arch_arm_dts_rk3399-rockpro64_dts,v 1.4 2020/01/17 14:24:42
kurt Exp $
+Set baud rate, enable fan control and PCIe gen2.
+
Index: arch/arm/dts/rk3399-rockpro64.dts
--- arch/arm/dts/rk3399-rockpro64.dts.orig
+++ arch/arm/dts/rk3399-rockpro64.dts
@@ -20,7 +22,15 @@ Index: arch/arm/dts/rk3399-rockpro64.dts
#cooling-cells = <2>;
fan-supply = <_dcin>;
pwms = < 0 5 0>;
-@@ -750,4 +751,43 @@
+@@ -522,6 +523,7 @@
+
+ {
+ ep-gpios = < RK_PD4 GPIO_ACTIVE_HIGH>;
++ max-link-speed = <2>;
+ num-lanes = <4>;
+ pinctrl-names = "default";
+ pinctrl-0 = <_perst>;
+@@ -750,4 +752,43 @@
_mmu {
status = "okay";
Index: patches/patch-configs_rock64-rk3328_defconfig
===
RCS file:
/cvs/ports/sysutils/u-boot/patches/patch-configs_rock64-rk3328_defconfig,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-configs_rock64-rk3328_defconfig
--- patches/patch-configs_rock64-rk3328_defconfig 7 Jan 2020 07:07:08
- 1.2
+++ patches/patch-configs_rock64-rk3328_defconfig 18 May 2020 22:11:35
-
@@ -1,9 +1,47 @@
$OpenBSD: patch-configs_rock64-rk3328_defconfig,v 1.2 2020/01/07 07:07:08 jsg
Exp $
+Fix gen3 SPL boot hang
+
Index: configs/rock64-rk3328_defconfig
--- configs/rock64-rk3328_defconfig.orig
+++ configs/rock64-rk3328_defconfig
-@@ -73,7 +73,7 @@ CONFIG_RAM=y
+@@ -1,6 +1,7 @@
+ CONFIG_ARM=y
+ CONFIG_ARCH_ROCKCHIP=y
+ CONFIG_SYS_TEXT_BASE=0x0020
++CONFIG_SPL_GPIO_SUPPORT=y
+ CONFIG_ENV_OFFSET=0x3F8000
+ CONFIG_ROCKCHIP_RK3328=y
+ CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
+@@ -25,6 +26,8 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
+ # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+ CONFIG_TPL_SYS_MALLOC_SIMPLE=y
+ CONFIG_SPL_STACK_R=y
++CONFIG_SPL_I2C_SUPPORT=y
++CONFIG_SPL_POWER_SUPPORT=y
+ CONFIG_SPL_ATF=y
+ CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
+ CONFIG_CMD_BOOTZ=y
+@@ -36,7 +39,7 @@ CONFIG_CMD_TIME=y
+ CONFIG_SPL_OF_CONTROL=y
+ CONFIG_TPL_OF_CONTROL=y
+ CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock64"
+-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names
interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
++CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks
assigned-clock-rates assigned-clock-parents"
+ CONFIG_TPL_OF_PLATDATA=y
+ CONFIG_ENV_IS_IN_MMC=y
+
Re: new misc/py-opcua
On Mon, May 18 2020, Alexander Bluhm wrote:
> Ping after unlock.
>
> On Mon, Apr 20, 2020 at 02:15:20AM +0200, Alexander Bluhm wrote:
>> Hi,
>>
>> I would like to browse OPC UA servers with a python GUI. For that
>> I need py-opcua, py-opcua-widgets, py-opcua-client. As py-opcua-widgets
>> does not compile with python2, I think we should only have python3
>> ports.
>>
>> ok?
>>
>> Description:
>> Pure Python OPC UA / IEC 62541 Client and Server Python 2, 3 and
>> pypy. OPC UA binary protocol implementation is quasi complete and
>> has been tested against many different OPC UA stacks. API offers
>> both a low level interface to send and receive all UA defined
>> structures and high level classes allowing to write a server or a
>> client in a few lines. It is easy to mix high level objects and
>> low level UA calls in one application.
>>
>> Description:
>> Common widgets for opcua-modeler og opcua-client-gui.
>>
>> Description:
>> Simple OPC-UA GUI client. Written using freeopcua python api and
>> pyqt. Most needed functionnalities are implemented including
>> subscribing for data changes and events, write variable values
>> listing attributes and references, and call methods.
Looks good overall, here are the points I noticed:
- for python3 libraries, please use FLAVORS=python3 + FLAVOR=python3
instead of MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}. This is the
idiom we try to use everywhere, please apply it in py-opcua and
py-opcua-widgets. Once this is done, you can update RUN_DEPENDS to
use ${MODPY_FLAVOR}.
- py-opcua-client looks like a pure application, please drop the "py-"
prefix in the port directory name and in the PKGNAME. Note that using
MODPY_VERSION=${MODPY_DEFAULT_VERSION_3} is appropriate here.
- please refresh the PLISTs
- py-opcua HOMEPAGE can use https:// like py-opcua-client
- s/og/and/ in py-opcua-widgets/pkg/DESCR?
I've been pondering importing those under misc/freeopcua, but there's
probably not much to factor out in a misc/freeopcua/Makefile.inc file.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: aircrack-ng-1.5.2p2 free(): chunk canary corrupted 0x11a3c50e6c00 0x2ac@0x2ac
Any improvements into upcoming 6.7 release regarding canary corruption issue? Martin
Re: [PATCH] net/dbip: add asn subpackage
On Mon, May 18 2020, Frederic Cambus wrote: > Hi ports@, > > Here is a diff to add an asn subpackage for net/dbip. > > From DESCR: > > The free DB-IP IP to ASN Lite database is a subset of the IP to ISP > database with reduced coverage and accuracy distributed under the Creative > Commons Attribution License. > > Comments? OK? ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 17:02:34 Modified files: lang/lucee : Makefile distinfo Log message: update to lucee-5.3.6.61
Re: [update] net/onioncat 0.3.5
Hi Stuart,
In result of work with software developer, I prepare latest stable improved
port 0.3.8.
Main improvements are:
* Stability (code patching to prevent segmentation faults)
* New functionality implemented
Like "distributed virtual switch" functionality;
Additional integrated loopback responders to simplify setup and debugging
* gcat symlink has been removed completely because of coreutils conflict
* man page has been improved to reflect all the changes made
OK?
--- Makefile.oldTue Jul 16 01:58:56 2019
+++ MakefileMon May 18 20:02:26 2020
@@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:35 sthen Exp $
-COMMENT = IP-Transparent Tor Hidden Service Connector
+COMMENT = IP-Transparent Tor and I2P Hidden Service Connector
-V =0.2.1
-DISTNAME = onioncat-$V
-REVISION = 1
+V =0.3.8
+DISTNAME = onioncat-${V}
+REVISION = 0
CATEGORIES = net
-HOMEPAGE = https://www.cypherpunk.at/onioncat_trac/
+HOMEPAGE = https://www.onioncat.org
MAINTAINER=Paul Irofti
@@ -16,13 +16,12 @@
WANTLIB = c pthread
-MASTER_SITES = http://www.cypherpunk.at/ocat/download/Source/$V/
+MASTER_SITES = https://www.cypherpunk.at/ocat/download/Source/0.3/
RUN_DEPENDS = net/tor
SEPARATE_BUILD = Yes
-CONFIGURE_STYLE = simple
-CONFIGURE_ARGS += --mandir=${PREFIX}/man
+CONFIGURE_STYLE = gnu
# Do not pick up gawk or mawk
CONFIGURE_ENV =AWK=awk
--- distinfo.oldWed Jun 24 08:34:54 2015
+++ distinfoMon May 18 20:03:30 2020
@@ -1,2 +1,2 @@
-SHA256 (onioncat-0.2.1.tar.gz) = Gge2K3LuZdEOcLly4q3hOH4iMrwGUnR+A76+cjXISo4=
-SIZE (onioncat-0.2.1.tar.gz) = 179988
+SHA256 (onioncat-0.3.8.tar.gz) =
9564d10c64161408a573256ba8aece9296499a753cbdae6bfbc3544e72a1d63b
+SIZE (onioncat-0.3.8.tar.gz) = 242144
--- pkg/DESCR.old Tue Dec 30 16:56:39 2008
+++ pkg/DESCR Fri May 15 00:53:34 2020
@@ -1,4 +1,4 @@
-OnionCat creates a transparent IP layer on top of Tor's hidden services.
+OnionCat creates a transparent IP layer on top of Tor or I2P hidden services.
It transmits any kind of IP-based data transparently through the Tor
network on a location hidden basis. You can think of it as a
point-to-multipoint VPN between hidden services.
--- pkg/PLIST.old Mon Oct 25 21:37:52 2010
+++ pkg/PLIST Fri May 15 00:53:34 2020
@@ -2,4 +2,5 @@
@bin bin/ocat
@man man/man1/ocat.1
share/doc/onioncat/
+share/doc/onioncat/Garlicat-HOWTO
share/doc/onioncat/README
Martin
> ‐‐‐ Original Message ‐‐‐
> On Tuesday, April 28, 2020 5:07 PM, Stuart Henderson s...@spacehopper.org
> wrote:
>
> > Oh, gcat is a symlink. Shouldn't have @bin and it seems pretty
> > useless since one can just use -I instead, so it's probably better to
> > remove rather than @conflict with a common package.
> > On 2020/04/28 16:29, Martin wrote:
> >
> > > 0.3.5a works stable for weeks. Anyway, I've asked the author about
> > > versioning.
> > > --- Makefile.old Fri Jul 12 23:48:35 2019
> > > +++ Makefile Tue Apr 28 18:28:15 2020
> > > @@ -1,13 +1,13 @@
> > > $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:35 sthen Exp $
> > > ==
> > > -COMMENT = IP-Transparent Tor Hidden Service Connector
> > > +COMMENT = IP-Transparent Tor and I2P Hidden Service Connector
> > > -V = 0.2.1
> > > -DISTNAME = onioncat-$V
> > > -REVISION = 1
> > > +V = 0.3.5a
> > > +DISTNAME = onioncat-${V}
> > > +REVISION = 0
> > > CATEGORIES = net
> > > -HOMEPAGE = https://www.cypherpunk.at/onioncat_trac/
> > > +HOMEPAGE = https://www.onioncat.org
> > > MAINTAINER= Paul Irofti piro...@openbsd.org
> > > @@ -16,13 +16,12 @@
> > > WANTLIB = c pthread
> > > -MASTER_SITES = http://www.cypherpunk.at/ocat/download/Source/$V/
> > > +MASTER_SITES = https://www.cypherpunk.at/ocat/download/Source/0.3/
> > > RUN_DEPENDS = net/tor
> > > SEPARATE_BUILD = Yes
> > > -CONFIGURE_STYLE = simple
> > > -CONFIGURE_ARGS += --mandir=${PREFIX}/man
> > > +CONFIGURE_STYLE = gnu
> > > Do not pick up gawk or mawk
> > >
> > > CONFIGURE_ENV = AWK=awk
> > > --- distinfo.old Sun Jan 18 06:14:44 2015
> > > +++ distinfo Mon Apr 27 16:57:48 2020
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (onioncat-0.2.1.tar.gz) =
> > > Gge2K3LuZdEOcLly4q3hOH4iMrwGUnR+A76+cjXISo4=
> > > -SIZE (onioncat-0.2.1.tar.gz) = 179988
> > > +SHA256 (onioncat-0.3.5a.tar.gz) =
> > > 9346847ab65f4e8e63f9bf34eb25a6049bb653e66efc017123e866eb64f48854
> > > +SIZE (onioncat-0.3.5a.tar.gz) = 246122
> > > --- pkg/PLIST.old Mon Oct 25 21:37:52 2010
> > > +++ pkg/PLIST Tue Apr 28 18:33:22 2020
> > > @@ -1,5 +1,8 @@
> > > @comment $OpenBSD: PLIST,v 1.3 2010/10/25 17:37:52 pirofti Exp $
> > > +@conflict coreutils-*
> > > +@bin bin/gcat
> > > @bin bin/ocat
> > > @man man/man1/ocat.1
> > > share/doc/onioncat/
> > > +share/doc/onioncat/Garlicat-HOWTO
> > > share/doc/onioncat/README
> > > --- pkg/DESCR.old Tue Dec 30 16:56:39 2008
> > > +++ pkg/DESCR Mon
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/05/18 16:28:23 Modified files: devel/llvm : Makefile Added files: devel/llvm/patches: patch-lib_CodeGen_SelectionDAG_DAGCombiner_cpp patch-lib_Target_PowerPC_PPCAsmPrinter_cpp patch-lib_Target_PowerPC_PPCISelDAGToDAG_cpp patch-lib_Target_PowerPC_PPCMCInstLower_cpp Log message: llvm: add powerpc improvements from base clang: - fix small pic for secure-plt mode (from kettenis@) - modify LLVM's DAGCombiner to skip an optimization if it would make an illegal ISD::ADDE node, fixing a fatal backend error (from gkoehler@ with help from mortimer@) OK jca@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/05/18 16:27:05 Removed files: databases/postgresql-plr/patches: patch-Makefile Log message: Zap empty patch
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: tra...@cvs.openbsd.org 2020/05/18 16:14:05 Modified files: devel/arduino-esp8266: Makefile distinfo devel/arduino-esp8266/pkg: PLIST Removed files: devel/arduino-esp8266/patches: patch-libraries_LittleFS_lib_littlefs_scripts_corrupt_py patch-libraries_LittleFS_lib_littlefs_scripts_debug_py patch-libraries_LittleFS_lib_littlefs_scripts_results_py Log message: Update arduino-esp8266 to 2.7.1. Ok jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: tra...@cvs.openbsd.org 2020/05/18 16:11:43 Modified files: devel/makeesparduino: Makefile distinfo devel/makeesparduino/patches: patch-makeEspArduino_mk devel/makeesparduino/pkg: PLIST Added files: devel/makeesparduino/patches: patch-tools_parse_arduino_pl Log message: Update makeesparduino to 5.0.2. ok jca@
Re: bsd.port.mk: Add EXTRACT_FILES
On 2020-05-18, Klemens Nanni wrote: > Passing EXTRACT_FILES as is has the advantage of using sh(1)'s brace > expansion as shown in the diff, using make's :QL would have the > advantage of not preventing porters from passing bogus values, I'm undecided, but I will mention that brace expansion is not part of POSIX sh. It's a Korn shell extension that our sh(1) happens to support. -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/05/18 14:44:54 Modified files: benchmarks : Makefile Log message: + hyperfine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/05/18 14:44:07 Log message: Import hyperfine-1.9.0 Command-line benchmarking tool. Features: - Statistical analysis across multiple runs. - Support for arbitrary shell commands. - Constant feedback about the benchmark progress and current estimates. - Warmup runs can be executed before the actual benchmark. - Cache-clearing commands can be set up before each timing run. - Statistical outlier detection to detect interference from other programs and caching effects. - Export results to various formats: CSV, JSON, Markdown, AsciiDoc. - Parameterized benchmarks (e.g. vary the number of threads). - Cross-platform ok sthen@ Status: Vendor Tag: solene Release Tags: solene_20200518 N ports/benchmarks/hyperfine/Makefile N ports/benchmarks/hyperfine/distinfo N ports/benchmarks/hyperfine/pkg/DESCR N ports/benchmarks/hyperfine/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/18 14:41:05 Modified files: sysutils/firmware/iwm: Makefile sysutils/firmware/iwm/pkg: PLIST Log message: Remove old firmware versions OK stsp sthen
Re: x11/lumina 1.6 maintainer update
Le Wed, 29 Apr 2020 16:01:58 -0400, a écrit : > All, > > > > I know we are in slowdown for 6.7 so I'm not asking that we push this > in. However, I'd really appreciate it if others could try my update > to get us from 1.4 to 1.6 of the Lumina Desktop Environment. I've > included the diff below and would welcome feedback: > Hello, something went wrong with your patch, it's not applicable, there are lot of newlines in it, but removing them isn't enough to apply correctly.
Re: iwm-firmware: remove old files
On 2020/05/18 21:30, Stefan Sperling wrote:
> On Mon, May 18, 2020 at 08:41:27PM +0200, Klemens Nanni wrote:
> > We're "after 6.7".
> >
> > OK?
>
> Looks OK to me. Please check with Stuart, too.
OK
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/firmware/iwm/Makefile,v
> > retrieving revision 1.13
> > diff -u -p -r1.13 Makefile
> > --- Makefile18 Nov 2019 11:36:56 - 1.13
> > +++ Makefile18 May 2020 18:40:04 -
> > @@ -2,21 +2,12 @@
> >
> > FW_DRIVER= iwm
> > FW_VER=20191022
> > -REVISION= 0
> > +REVISION= 1
> > DISTNAME= linux-firmware-${FW_VER}
> > EXTRACT_SUFX= .tar.xz
> >
> > HOMEPAGE= https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi
> > MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/firmware/
> > -
> > -# old ones for people bisecting kernels, remove after 6.7
> > -FW+= 316016 \
> > - 726016 \
> > - 726516 \
> > - 7265D 16 \
> > - 8000C 16 \
> > - 316822 \
> > - 826522
> >
> > FW+= 316017 \
> > 726017 \
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/sysutils/firmware/iwm/pkg/PLIST,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 PLIST
> > --- pkg/PLIST 18 Nov 2019 11:36:56 - 1.9
> > +++ pkg/PLIST 18 May 2020 18:39:58 -
> > @@ -1,17 +1,10 @@
> > @comment $OpenBSD: PLIST,v 1.9 2019/11/18 11:36:56 sthen Exp $
> > -firmware/iwm-3160-16
> > firmware/iwm-3160-17
> > -firmware/iwm-3168-22
> > firmware/iwm-3168-29
> > -firmware/iwm-7260-16
> > firmware/iwm-7260-17
> > -firmware/iwm-7265-16
> > firmware/iwm-7265-17
> > -firmware/iwm-7265D-16
> > firmware/iwm-7265D-29
> > -firmware/iwm-8000C-16
> > firmware/iwm-8000C-34
> > -firmware/iwm-8265-22
> > firmware/iwm-8265-34
> > firmware/iwm-9000-34
> > firmware/iwm-9260-34
> >
> >
>
Re: NEW: www/py-qtwebengine
On Mon, May 18, 2020 at 09:57:15PM +0200, Rafael Sadowski wrote: > Thanks kmos and kn for your feedback. I completely reworked the port. > I think the version is better. Any OKs? OK kn Some variables lack a space before "=".
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/18 13:59:58 Modified files: graphics/nomacs: Makefile distinfo graphics/nomacs/pkg: PLIST Removed files: graphics/nomacs/patches: patch-3rdparty_drif_drif_image_h patch-src_DkCore_DkImageStorage_cpp patch-src_DkCore_DkImageStorage_h patch-src_DkCore_DkMetaData_cpp patch-src_DkGui_DkNoMacs_cpp Log message: Update nomacs to 3.14.2
Re: NEW: www/py-qtwebengine
On Mon May 18, 2020 at 09:25:11AM -0400, Kurt Mosiejczuk wrote:
> On Mon, May 18, 2020 at 06:42:32AM +0200, Rafael Sadowski wrote:
> > Ok to import py-qtwebengine after we have unlocked x11/qt5/qtwebengine?
> > Diff below and tarball attached.
>
> Comments below
>
> > Rafael
> >
> > diff --git a/www/py-qtwebengine/Makefile b/www/py-qtwebengine/Makefile
> > new file mode 100644
> > index 000..d191af76948
> > --- /dev/null
> > +++ b/www/py-qtwebengine/Makefile
> > @@ -0,0 +1,52 @@
> > +# $OpenBSD: Makefile,v 1.22 2020/03/13 16:54:11 rsadowski Exp $
> > +
> > +COMMENT= python Qt5WebEngine bindings
> > +
> > +V= 5.13.2
> > +DISTNAME= PyQtWebEngine-${V}
> > +PKGNAME= py-qtwebengine-${V}
> > +
> > +CATEGORIES=www devel
> > +
> > +HOMEPAGE= https://www.riverbankcomputing.com/software/pyqtwebengine/intro
> > +
> > +MASTER_SITES=
> > https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${V}/
> > +
> > +# GPLv3 with exceptions for use with certain named open-source licenses
> > +PERMIT_PACKAGE=Yes
> > +
> > +LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
> > + x11/qt5/qtwebengine
> > +
> > +NO_TEST= Yes
> > +
> > +MODULES = lang/python \
> > + x11/qt5
> > +
> > +MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
>
> For a library like this, we've switched to using FLAVORS = python3 and
> FLAVOR = python3. It avoids having to look up whether or not a port is
> python3-only before deciding to put MODPY_FLAVOR at the end.
>
> > +
> > +RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
> > + devel/py-enum34 \
>
> Ending the last DEPENDS with a \ is a little weird, typo? Also, as kn
> pointed out, py-enum34 is not needed for a python3-only port.
>
> That's it for comments. I haven't build tested this, but saw those 2
> issues.
>
> --Kurt
>
Thanks kmos and kn for your feedback. I completely reworked the port.
I think the version is better. Any OKs?
- Add missing WANTLIB
- Add spaces after varname and =
- Add missing RUN nad BUILD depends
- Remove enum34 (From copy & waste)
- Add FLAVORS/FLAVOR pattern
- Add MAKE_FLAGS
- Regen PLIST
Cheers, Rafael
diff --git a/www/py-qtwebengine/Makefile b/www/py-qtwebengine/Makefile
new file mode 100644
index 000..22d9d9b7d65
--- /dev/null
+++ b/www/py-qtwebengine/Makefile
@@ -0,0 +1,59 @@
+# $OpenBSD: Makefile,v 1.22 2020/03/13 16:54:11 rsadowski Exp $
+
+COMMENT = python Qt5WebEngine bindings
+
+V =5.13.2
+DISTNAME = PyQtWebEngine-${V}
+PKGNAME = py-qtwebengine-${V}
+
+CATEGORIES = www devel
+
+HOMEPAGE = https://www.riverbankcomputing.com/software/pyqtwebengine/intro
+
+MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${V}/
+
+# GPLv3 with exceptions for use with certain named open-source licenses
+PERMIT_PACKAGE=Yes
+
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Positioning
+WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5WebChannel Qt5WebEngine
+WANTLIB += Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets m
+
+MODULES = lang/python \
+ x11/qt5
+
+FLAVORS = python3
+FLAVOR = python3
+
+LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
+ x11/qt5/qtwebengine
+
+RUN_DEPENDS = x11/py-sip-qt5${MODPY_FLAVOR} \
+ devel/py-sip${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR}
+
+BUILD_DEPENDS =x11/py-sip-qt5${MODPY_FLAVOR} \
+ devel/py-sip${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR}
+
+CONFIGURE_STYLE = simple
+
+CONFIGURE_SCRIPT = ${MODPY_BIN} ${WRKSRC}/configure.py
+
+QTVER =qt5
+PYQTVER = PyQt5
+SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
+
+CONFIGURE_ARGS += --qmake=${MODQT5_QMAKE} \
+ --pyqt-sipdir=${LOCALBASE}/${SIPDIR} \
+ --sip=${LOCALBASE}/bin/sip${MODPY_BIN_SUFFIX} \
+ --verbose
+
+MAKE_FLAGS = CC="${CC}" CXX="${CXX}"
+
+MAKE_ENV = INSTALL_ROOT="${WRKINST}"
+SUBST_VARS += QTVER PYQTVER SIPDIR
+
+NO_TEST = Yes
+
+.include
diff --git a/www/py-qtwebengine/distinfo b/www/py-qtwebengine/distinfo
new file mode 100644
index 000..235f1d233fd
--- /dev/null
+++ b/www/py-qtwebengine/distinfo
@@ -0,0 +1,2 @@
+SHA256 (PyQtWebEngine-5.13.2.tar.gz) =
QmSRG1hHx1ch2MnDCvkuWKIWvSXO7zf3q/khAFwdRak=
+SIZE (PyQtWebEngine-5.13.2.tar.gz) = 45234
diff --git a/www/py-qtwebengine/pkg/DESCR b/www/py-qtwebengine/pkg/DESCR
new file mode 100644
index 000..60e08bda355
--- /dev/null
+++ b/www/py-qtwebengine/pkg/DESCR
@@ -0,0 +1 @@
+Python bindings for the Qt5 toolkit, QtWebEngine module
diff --git a/www/py-qtwebengine/pkg/PLIST b/www/py-qtwebengine/pkg/PLIST
new file mode 100644
index 000..81d4e00e7b8
--- /dev/null
+++ b/www/py-qtwebengine/pkg/PLIST
@@ -0,0 +1,47 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/05/18 13:33:43 Modified files: multimedia/mlt/patches: patch-src_framework_mlt_property_c Log message: add comment explaining what's going on and why the current fix is fine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/18 13:30:56 Modified files: sysutils/firmware/amdgpu: Makefile sysutils/firmware/inteldrm: Makefile sysutils/firmware/iwm: Makefile sysutils/firmware/iwx: Makefile sysutils/firmware/radeondrm: Makefile sysutils/firmware/rtwn: Makefile Log message: Use EXTRACT_FILES No PLIST change, but "make show-size" massive reduction in size. These are all firmware ports with single big distfiles, other ports are either small or come with multiple distfiles for wich EXTRACT_FILES is not (yet) ready.
Re: iwm-firmware: remove old files
On Mon, May 18, 2020 at 08:41:27PM +0200, Klemens Nanni wrote:
> We're "after 6.7".
>
> OK?
Looks OK to me. Please check with Stuart, too.
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/firmware/iwm/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- Makefile 18 Nov 2019 11:36:56 - 1.13
> +++ Makefile 18 May 2020 18:40:04 -
> @@ -2,21 +2,12 @@
>
> FW_DRIVER= iwm
> FW_VER= 20191022
> -REVISION=0
> +REVISION=1
> DISTNAME=linux-firmware-${FW_VER}
> EXTRACT_SUFX=.tar.xz
>
> HOMEPAGE=https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi
> MASTER_SITES=https://cdn.kernel.org/pub/linux/kernel/firmware/
> -
> -# old ones for people bisecting kernels, remove after 6.7
> -FW+= 316016 \
> - 726016 \
> - 726516 \
> - 7265D 16 \
> - 8000C 16 \
> - 316822 \
> - 826522
>
> FW+= 316017 \
> 726017 \
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/firmware/iwm/pkg/PLIST,v
> retrieving revision 1.9
> diff -u -p -r1.9 PLIST
> --- pkg/PLIST 18 Nov 2019 11:36:56 - 1.9
> +++ pkg/PLIST 18 May 2020 18:39:58 -
> @@ -1,17 +1,10 @@
> @comment $OpenBSD: PLIST,v 1.9 2019/11/18 11:36:56 sthen Exp $
> -firmware/iwm-3160-16
> firmware/iwm-3160-17
> -firmware/iwm-3168-22
> firmware/iwm-3168-29
> -firmware/iwm-7260-16
> firmware/iwm-7260-17
> -firmware/iwm-7265-16
> firmware/iwm-7265-17
> -firmware/iwm-7265D-16
> firmware/iwm-7265D-29
> -firmware/iwm-8000C-16
> firmware/iwm-8000C-34
> -firmware/iwm-8265-22
> firmware/iwm-8265-34
> firmware/iwm-9000-34
> firmware/iwm-9260-34
>
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/18 13:11:30 Modified files: editors/calligra: Makefile distinfo editors/calligra/pkg: PLIST Log message: Bugfix update calligra to 3.2.1
UPDATE: devel/arduino-esp8266 2.7.1
Hello,
This updates the arduino-esp8266 tools to 2.7.1.
Changelog:
- https://github.com/esp8266/Arduino/releases
This and makeesparduino (which I forgot to mention) are running fine for
me for a few weeks now.
Ok?
--
Tracey Emery
Index: Makefile
===
RCS file: /cvs/ports/devel/arduino-esp8266/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 Makefile
--- Makefile23 Apr 2020 14:28:54 - 1.1.1.1
+++ Makefile18 May 2020 18:40:33 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2020/04/23 14:28:54 tracey Exp $
COMMENT = esp8266 arduino core toolset
-V =2.6.3
+V =2.7.1
DISTNAME = esp8266-${V}
PKGNAME = arduino-${DISTNAME}
Index: distinfo
===
RCS file: /cvs/ports/devel/arduino-esp8266/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo23 Apr 2020 14:28:54 - 1.1.1.1
+++ distinfo18 May 2020 18:40:33 -
@@ -1,2 +1,2 @@
-SHA256 (esp8266-2.6.3.zip) = iFefsFu3/aCwm/uzJavQ7qFeUemwnVe9nrD/jFGvW/E=
-SIZE (esp8266-2.6.3.zip) = 34257589
+SHA256 (esp8266-2.7.1.zip) = FREd8dEotwx+9Ig+n71OZy6j18mK3eUvqBDJnhaVbiA=
+SIZE (esp8266-2.7.1.zip) = 34446027
Index: patches/patch-libraries_LittleFS_lib_littlefs_scripts_corrupt_py
===
RCS file: patches/patch-libraries_LittleFS_lib_littlefs_scripts_corrupt_py
diff -N patches/patch-libraries_LittleFS_lib_littlefs_scripts_corrupt_py
--- patches/patch-libraries_LittleFS_lib_littlefs_scripts_corrupt_py23 Apr
2020 14:28:54 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-libraries_LittleFS_lib_littlefs_scripts_corrupt_py,v 1.1.1.1
2020/04/23 14:28:54 tracey Exp $
-
-Index: libraries/LittleFS/lib/littlefs/scripts/corrupt.py
libraries/LittleFS/lib/littlefs/scripts/corrupt.py.orig
-+++ libraries/LittleFS/lib/littlefs/scripts/corrupt.py
-@@ -34,7 +34,7 @@ def main(args):
- args.blocks.append('blocks/%x' % last)
-
- for block in args.blocks:
--print 'corrupting %s' % block
-+print('corrupting %s' % block)
- corrupt(block)
-
- if __name__ == "__main__":
Index: patches/patch-libraries_LittleFS_lib_littlefs_scripts_debug_py
===
RCS file: patches/patch-libraries_LittleFS_lib_littlefs_scripts_debug_py
diff -N patches/patch-libraries_LittleFS_lib_littlefs_scripts_debug_py
--- patches/patch-libraries_LittleFS_lib_littlefs_scripts_debug_py 23 Apr
2020 14:28:54 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-$OpenBSD: patch-libraries_LittleFS_lib_littlefs_scripts_debug_py,v 1.1.1.1
2020/04/23 14:28:54 tracey Exp $
-
-Index: libraries/LittleFS/lib/littlefs/scripts/debug.py
libraries/LittleFS/lib/littlefs/scripts/debug.py.orig
-+++ libraries/LittleFS/lib/littlefs/scripts/debug.py
-@@ -59,14 +59,14 @@ def main(*blocks):
- pass
-
- if not file:
--print 'Bad metadata pair {%s}' % ', '.join(blocks)
-+print('Bad metadata pair {%s}' % ', '.join(blocks))
- return 1
-
--print "--- %s ---" % ', '.join(v for _,v in sorted(versions,
reverse=True))
-+print("--- %s ---" % ', '.join(v for _,v in sorted(versions,
reverse=True)))
-
- # go through each tag, print useful information
--print "%-4s %-8s %-14s %3s %4s %s" % (
--'off', 'tag', 'type', 'id', 'len', 'dump')
-+print("%-4s %-8s %-14s %3s %4s %s" % (
-+'off', 'tag', 'type', 'id', 'len', 'dump'))
-
- tag = 0x
- off = 4
-@@ -92,13 +92,13 @@ def main(*blocks):
- else:
- crc = binascii.crc32(data, crc)
-
--print '%04x: %08x %-15s %3s %4s %-23s %-8s' % (
-+print('%04x: %08x %-15s %3s %4s %-23s %-8s' % (
- off, tag,
- typeof(type) + (' bad!' if iscrc and ~crc else ''),
- hex(id)[2:] if id != 0x3ff else '.',
- size if size != 0x3ff else 'x',
- ' '.join('%02x' % ord(c) for c in data[:8]),
--''.join(c if c >= ' ' and c <= '~' else '.' for c in data[:8]))
-+''.join(c if c >= ' ' and c <= '~' else '.' for c in data[:8])))
-
- off += size if size != 0x3ff else 0
- if iscrc:
Index: patches/patch-libraries_LittleFS_lib_littlefs_scripts_results_py
===
RCS file: patches/patch-libraries_LittleFS_lib_littlefs_scripts_results_py
diff -N patches/patch-libraries_LittleFS_lib_littlefs_scripts_results_py
--- patches/patch-libraries_LittleFS_lib_littlefs_scripts_results_py23 Apr
2020 14:28:54 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-libraries_LittleFS_lib_littlefs_scripts_results_py,v 1.1.1.1
UPDATE: devel/makeesparduino 5.0.2
Hello,
This updates makeEspArduino to 5.0.2.
Changelog:
- add support for visual studio code
- extract perl scripts
- couple of post fixes from 5.0.0
Ok?
--
Tracey Emery
Index: Makefile
===
RCS file: /cvs/ports/devel/makeesparduino/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 Makefile
--- Makefile23 Apr 2020 14:31:06 - 1.1.1.1
+++ Makefile18 May 2020 19:03:37 -
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2020/04/23 14:31:06 tracey Exp $
+# $OpenBSD$
COMMENT = makefile for ESP8266 and ESP32 Arduino projects
GH_ACCOUNT = plerup
GH_PROJECT = makeEspArduino
-GH_TAGNAME = 4.22.0
+GH_TAGNAME = 5.0.2
PKGNAME = makeesparduino-${GH_TAGNAME}
@@ -27,5 +27,6 @@ post-patch:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/makeEspArduino
cp -r ${WRKDIST}/*.mk ${PREFIX}/share/makeEspArduino/
+ cp -r ${WRKDIST}/tools ${PREFIX}/share/makeEspArduino/
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/makeesparduino/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo23 Apr 2020 14:31:06 - 1.1.1.1
+++ distinfo18 May 2020 19:03:37 -
@@ -1,2 +1,2 @@
-SHA256 (makeEspArduino-4.22.0.tar.gz) =
uqUhHKeLx0rrW+xoXm2A7l6LTfM2Jqegf4g49tnjM7w=
-SIZE (makeEspArduino-4.22.0.tar.gz) = 22314
+SHA256 (makeEspArduino-5.0.2.tar.gz) =
Xm/HwKIToQ2zJxLkSOvSNJh9jUkAf2MQqD0WCGCAdYk=
+SIZE (makeEspArduino-5.0.2.tar.gz) = 25007
Index: patches/patch-makeEspArduino_mk
===
RCS file: /cvs/ports/devel/makeesparduino/patches/patch-makeEspArduino_mk,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-makeEspArduino_mk
--- patches/patch-makeEspArduino_mk 23 Apr 2020 14:31:06 - 1.1.1.1
+++ patches/patch-makeEspArduino_mk 18 May 2020 19:03:37 -
@@ -1,10 +1,10 @@
-$OpenBSD: patch-makeEspArduino_mk,v 1.1.1.1 2020/04/23 14:31:06 tracey Exp $
+$OpenBSD$
Index: makeEspArduino.mk
--- makeEspArduino.mk.orig
+++ makeEspArduino.mk
-@@ -26,8 +26,13 @@ CHIP ?= esp8266
- BOARD ?= $(if $(filter $(CHIP), esp32),esp32,generic)
+@@ -26,8 +26,13 @@ __TOOLS_DIR := $(dir $(__THIS_FILE))tools
+ CHIP ?= esp8266
# Serial flashing parameters
-UPLOAD_PORT ?= $(shell ls -1tr /dev/tty*USB* 2>/dev/null | tail -1)
@@ -76,7 +76,7 @@ Index: makeEspArduino.mk
else
# Location defined, assume it is a git clone
ESP_ARDUINO_VERSION = $(call git_description,$(ESP_ROOT))
-@@ -213,6 +233,8 @@ LWIP_VARIANT ?= $(shell cat $(ESP_ROOT)/boards.txt | p
+@@ -215,6 +235,8 @@ LWIP_VARIANT ?= $(shell $(BOARD_OP) $(BOARD) first_lwi
# Handle possible changed state i.e. make command line parameters or changed
git versions
ifeq ($(OS), Darwin)
CMD_LINE := $(shell ps $$PPID -o command | tail -1)
@@ -85,8 +85,8 @@ Index: makeEspArduino.mk
else
CMD_LINE := $(shell tr "\0" " "
iwm-firmware: remove old files
We're "after 6.7".
OK?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/firmware/iwm/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile18 Nov 2019 11:36:56 - 1.13
+++ Makefile18 May 2020 18:40:04 -
@@ -2,21 +2,12 @@
FW_DRIVER= iwm
FW_VER=20191022
-REVISION= 0
+REVISION= 1
DISTNAME= linux-firmware-${FW_VER}
EXTRACT_SUFX= .tar.xz
HOMEPAGE= https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi
MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/firmware/
-
-# old ones for people bisecting kernels, remove after 6.7
-FW+= 316016 \
- 726016 \
- 726516 \
- 7265D 16 \
- 8000C 16 \
- 316822 \
- 826522
FW+= 316017 \
726017 \
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/firmware/iwm/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 18 Nov 2019 11:36:56 - 1.9
+++ pkg/PLIST 18 May 2020 18:39:58 -
@@ -1,17 +1,10 @@
@comment $OpenBSD: PLIST,v 1.9 2019/11/18 11:36:56 sthen Exp $
-firmware/iwm-3160-16
firmware/iwm-3160-17
-firmware/iwm-3168-22
firmware/iwm-3168-29
-firmware/iwm-7260-16
firmware/iwm-7260-17
-firmware/iwm-7265-16
firmware/iwm-7265-17
-firmware/iwm-7265D-16
firmware/iwm-7265D-29
-firmware/iwm-8000C-16
firmware/iwm-8000C-34
-firmware/iwm-8265-22
firmware/iwm-8265-34
firmware/iwm-9000-34
firmware/iwm-9260-34
Re: NEW: net/asdig v0.97
> Any idea why this is poking around in resolver internals rather than > just using the documented getrrsetbyname interface? > I don't know, may be it does not exists on Linux.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: tra...@cvs.openbsd.org 2020/05/18 12:36:18 Modified files: devel/avrdude : Makefile distinfo devel/avrdude/patches: patch-configure_ac patch-stk500v2_c devel/avrdude/pkg: PLIST Added files: devel/avrdude/patches: patch-fileio_c Removed files: devel/avrdude/patches: patch-avrdude_conf_in Log message: Update avrdude to 6.3. Testing Andrea Fleckens (Thanks!) Tweaks jca@ Ok sthen@
Re: NEW: telephony/resiprocate
On Mon, May 18, 2020 at 02:19:20PM +0100, Stuart Henderson wrote: > Looking pretty good, just a few comments: > > - those user.list entries should just say telephony/resiprocate. Fixed. > - I'm not sure we really need two readmes just telling people how to > generate a self-signed X.509 cert? We don't do that for webservers, > mailservers or other voip software). Good point. Generating the Diffie-Hellman parameters file is documented (as a comment) in each configuration file. With Let's Encrypt proper certificates can easily obtained and generating self-signed certificates is not different here compared to other software. So I just deleted both READMEs. > - I would prefer to lowercase reTurn (resiprocate is already lower-cased > so it then matches that, and matches other ports). I agree as it makes the naming more consistent (the file paths still use reTurn as they come directly from upstream). Thanks for your comments. Best regards, Ingo resiprocate.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/18 12:21:00 Modified files: sysutils/coreboot-utils: Makefile Log message: Use EXTRACT_FILES
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/18 12:18:33 Modified files: infrastructure/mk: bsd.port.mk Log message: Add EXTRACT_FILES Allow extraction of specific files only rather than all from distfile. OK sthen espie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 11:45:53 Modified files: mail/dovecot : Makefile distinfo Log message: update to Dovecot 2.3.10.1, ok Brad DOV-3784, CVE-2020-10957: Sending malformed NOOP command causes crash in submission, submission-login or lmtp service. DOV-3875, CVE-2020-10958: Sending command followed by sufficient number of newlines triggers a use-after-free bug that might crash submission-login, submission or lmtp service. DOV-1745, CVE-2020-10967: Sending mail with empty quoted localpart causes submission or lmtp component to crash.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/05/18 11:32:17 Modified files: games/julius : Makefile distinfo Log message: Update to julius-1.4.0 Changelog: https://github.com/bvschaik/julius/releases/tag/v1.4.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/05/18 11:11:08 Modified files: games/pentobi : Makefile distinfo games/pentobi/pkg: PLIST Added files: games/pentobi/patches: patch-pentobi_docbook_custom_xsl Log message: Update to pentobi-18.0 ok solene@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/05/18 11:02:35 Modified files: geo/osrm-backend: Makefile distinfo geo/osrm-backend/pkg: PLIST Log message: osrm-backend: update to 5.22, add powerpc to NOT_FOR_ARCHS, disable ccache Changelog: https://github.com/Project-OSRM/osrm-backend/blob/v5.22.0/CHANGELOG.md This can't be built on powerpc because devel/tbb does not support 64-bits atomics on ppc32 and forcing them does not help. OK bentley@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2020/05/18 10:46:10 Modified files: devel/mercurial: Makefile Log message: Missing dep for the new git extension.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: c...@cvs.openbsd.org2020/05/18 10:42:20 Modified files: devel/tbb : Makefile distinfo devel/tbb/files: OpenBSD.inc devel/tbb/patches: patch-Makefile patch-src_test_test_malloc_compliance_cpp devel/tbb/pkg : PLIST Removed files: devel/tbb/patches: patch-build_OpenBSD_inc patch-examples_parallel_for_tachyon_src_types_h patch-include_tbb_tbb_machine_h patch-src_rml_client_rml_factory_h patch-src_tbb_cache_aligned_allocator_cpp patch-src_tbbmalloc_frontend_cpp patch-src_tbbmalloc_tbbmalloc_cpp patch-src_test_harness_dynamic_libs_h Log message: tbb: update to 2020.2, remove upstreamed patches Changelog: https://github.com/oneapi-src/oneTBB/blob/v2020.2/CHANGES HOMEPAGE tweak and OK bentley@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 10:23:59 Modified files: graphics/libexif: Makefile distinfo Log message: update to libexif-0.6.22
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/05/18 10:06:20
Modified files:
devel/quirks : Makefile
devel/quirks/files: Quirks.pm
Log message:
{py => py3}-dulwich
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/18 09:48:07 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: 'py-cups' => 'py3-cups',
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/18 09:46:23 Modified files: print : Makefile print/py-cups : Makefile distinfo print/py-cups/pkg: PLIST Log message: Update to py3-cups-2.0.1. Move to py3 only (no more support for py2).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 09:42:59 Modified files: graphics/gimp/stable: Makefile Log message: sync gimp libs following libmypaint update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 09:42:56 Modified files: graphics/libmypaint: Makefile distinfo graphics/libmypaint/pkg: PLIST Log message: update to libmypaint-1.6.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/05/18 09:42:09 Modified files: graphics/sk1 : Makefile Log message: Remove py-cups from RDEP: no more python2 support in py-cups, sk1 should move to python3 but that means adding a python3 FLAVOR to x11/py-wxPython and I don't want to fall into the rabbit hole.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/18 09:38:26 Modified files: productivity/homebank: Makefile distinfo Log message: Bugfix update homebank to 5.4.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/05/18 09:29:08 Modified files: x11/qt5/qtwebengine: Makefile Log message: Add ONLY_FOR_ARCHS to amd64 aarch64 i386, spotted by cwen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 08:48:05 Modified files: graphics/mypaint-brushes: Makefile Log message: mypaint-brushes: add a comment noting that gimp blocks updating to 2.x
[PATCH] net/dbip: add asn subpackage
Hi ports@,
Here is a diff to add an asn subpackage for net/dbip.
>From DESCR:
The free DB-IP IP to ASN Lite database is a subset of the IP to ISP
database with reduced coverage and accuracy distributed under the Creative
Commons Attribution License.
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/net/dbip/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile5 Mar 2020 14:19:21 - 1.1.1.1
+++ Makefile18 May 2020 14:34:43 -
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2020/03/05 14:19:21 fcambus Exp $
SUBDIR =
+SUBDIR += asn
SUBDIR += city
SUBDIR += country
Index: asn/Makefile
===
RCS file: asn/Makefile
diff -N asn/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ asn/Makefile18 May 2020 14:34:43 -
@@ -0,0 +1,11 @@
+# $OpenBSD$
+
+COMMENT = DB-IP IP to ASN Lite: IPv4/v6 address to ASN
+
+DISTNAME = dbip-asn-lite-${V}.mmdb
+PKGNAME = dbip-asn-lite-${V:S/-/./}
+
+post-extract:
+ mv ${WRKSRC}/${DISTNAME} ${WRKSRC}/dbip-asn-lite.mmdb
+
+.include
Index: asn/distinfo
===
RCS file: asn/distinfo
diff -N asn/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -
+++ asn/distinfo18 May 2020 14:34:43 -
@@ -0,0 +1,2 @@
+SHA256 (dbip-asn-lite-2020-05.mmdb.gz) =
+xBCIJjag4XSxy8b3OQTaqJqc/Ahl6uVS1XPzb/Fbe8=
+SIZE (dbip-asn-lite-2020-05.mmdb.gz) = 3708208
Index: asn/pkg/DESCR
===
RCS file: asn/pkg/DESCR
diff -N asn/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -
+++ asn/pkg/DESCR 18 May 2020 14:34:43 -
@@ -0,0 +1,3 @@
+The free DB-IP IP to ASN Lite database is a subset of the IP to ISP
+database with reduced coverage and accuracy distributed under the Creative
+Commons Attribution License.
Index: asn/pkg/PLIST
===
RCS file: asn/pkg/PLIST
diff -N asn/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -
+++ asn/pkg/PLIST 18 May 2020 14:34:43 -
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST,v$
+db/dbip/
+db/dbip/dbip-asn-lite.mmdb
Re: coreboot-utils: extract only what's needed
On 2020-05-17, Christian Weisgerber wrote: > Should we have infrastructure support for this, like FreeBSD's > EXTRACT_ONLY? For the record: I misremembered. FreeBSD's EXTRACT_ONLY is something else entirely. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: UPDATE: sysutils/grive2
On Mon 18/05/2020 17:14, Paul Irofti wrote: > Hi, > > This updates grive to the latest version. > > It is required in order to be able to access Google Drive, as Google > decide to invalidate all non-official keys and is refusing all 3rd party > providers to re-register. > > The solution now is to request your own API keys and allow the program > to access your Drive through it, which is what this update adds > (among other things). > > This also includes a couple of off64_t -> int64_t changes :( > > OK? HOMEPAGE can be switched to https. 'make update-plist' results in a couple of additions to PLIST. Are these additions intentionally left out? If so, does it make sense to address (read: delete) them in the post-install phase?
UPDATE: sysutils/grive2
Hi,
This updates grive to the latest version.
It is required in order to be able to access Google Drive, as Google
decide to invalidate all non-official keys and is refusing all 3rd party
providers to re-register.
The solution now is to request your own API keys and allow the program
to access your Drive through it, which is what this update adds
(among other things).
This also includes a couple of off64_t -> int64_t changes :(
OK?
Paul
Index: Makefile
===
RCS file: /cvs/ports/sysutils/grive2/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile12 Jul 2019 20:49:43 - 1.11
+++ Makefile18 May 2020 14:09:55 -
@@ -2,9 +2,8 @@
COMMENT = third-party client for Google Drive
-VERSION = 0.5.0
+VERSION = 0.5.1
DISTNAME = grive2-${VERSION}
-REVISION = 2
CATEGORIES = sysutils
@@ -14,7 +13,7 @@ HOMEPAGE =http://yourcmc.ru/wiki/Grive
GH_ACCOUNT = vitalif
GH_PROJECT = grive2
-GH_COMMIT =ae06eccb38b2fe250c9ddeac3e3973f80b8a0aa9
+GH_COMMIT =548ea362f319cd1f7fcbad0344fde8449fa14255
# GPLv2 only
PERMIT_PACKAGE = Yes
Index: distinfo
===
RCS file: /cvs/ports/sysutils/grive2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo6 May 2017 15:10:18 - 1.3
+++ distinfo18 May 2020 14:09:55 -
@@ -1,2 +1,2 @@
-SHA256 (grive2-0.5.0-ae06eccb.tar.gz) =
oEWgC62rbFEVn9gwnghNQmr0AN69NXXlIgstcph7Zck=
-SIZE (grive2-0.5.0-ae06eccb.tar.gz) = 162870
+SHA256 (grive2-0.5.1-548ea362.tar.gz) =
wJIn9bDA483dfmpHEYa3sRNtOMb6DGC3hYgpiNzUd0A=
+SIZE (grive2-0.5.1-548ea362.tar.gz) = 169931
Index: patches/patch-grive_CMakeLists_txt
===
RCS file: /cvs/ports/sysutils/grive2/patches/patch-grive_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-grive_CMakeLists_txt
--- patches/patch-grive_CMakeLists_txt 30 Nov 2015 11:56:15 - 1.1.1.1
+++ patches/patch-grive_CMakeLists_txt 18 May 2020 14:09:55 -
@@ -1,9 +1,13 @@
$OpenBSD: patch-grive_CMakeLists_txt,v 1.1.1.1 2015/11/30 11:56:15 sthen Exp $
grive/CMakeLists.txt.orig Sun Oct 11 17:59:25 2015
-+++ grive/CMakeLists.txt Wed Nov 4 09:30:32 2015
-@@ -26,4 +26,4 @@ set_target_properties( grive_executable
+Index: grive/CMakeLists.txt
+--- grive/CMakeLists.txt.orig
grive/CMakeLists.txt
+@@ -25,7 +25,7 @@ set_target_properties( grive_executable
)
install(TARGETS grive_executable RUNTIME DESTINATION bin)
--install(FILES doc/grive.1 DESTINATION share/man/man1 )
+-
+install(FILES doc/grive.1 DESTINATION man/man1 )
+ if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES
"OpenBSD" )
+ install(FILES doc/grive.1 DESTINATION man/man1 )
+ else ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES
"OpenBSD" )
Index: patches/patch-libgrive_CMakeLists_txt
===
RCS file: /cvs/ports/sysutils/grive2/patches/patch-libgrive_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-libgrive_CMakeLists_txt
--- patches/patch-libgrive_CMakeLists_txt 30 Nov 2015 11:56:15 -
1.1.1.1
+++ patches/patch-libgrive_CMakeLists_txt 18 May 2020 14:09:55 -
@@ -1,11 +1,12 @@
$OpenBSD: patch-libgrive_CMakeLists_txt,v 1.1.1.1 2015/11/30 11:56:15 sthen
Exp $
libgrive/CMakeLists.txt.orig Sun Oct 11 17:59:25 2015
-+++ libgrive/CMakeLists.txtWed Nov 4 09:30:32 2015
-@@ -7,7 +7,6 @@ find_package(CURL REQUIRED)
- find_package(EXPAT REQUIRED)
+Index: libgrive/CMakeLists.txt
+--- libgrive/CMakeLists.txt.orig
libgrive/CMakeLists.txt
+@@ -6,7 +6,6 @@ find_package(LibGcrypt REQUIRED)
+ find_package(CURL REQUIRED)
find_package(Boost 1.40.0 COMPONENTS program_options filesystem
unit_test_framework regex system REQUIRED)
find_package(BFD)
-find_package(CppUnit)
find_package(Iberty)
- find_package(ZLIB)
+ find_package(PkgConfig)
Index: patches/patch-libgrive_src_base_Resource_cc
===
RCS file: patches/patch-libgrive_src_base_Resource_cc
diff -N patches/patch-libgrive_src_base_Resource_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libgrive_src_base_Resource_cc 18 May 2020 14:09:55 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libgrive/src/base/Resource.cc
+--- libgrive/src/base/Resource.cc.orig
libgrive/src/base/Resource.cc
+@@ -265,7 +265,7 @@ void Resource::FromLocal( Val& state )
+ FileType ft ;
+ try
+ {
+- os::Stat( path, _ctime, (off64_t*)_size, ) ;
++ os::Stat( path, _ctime, (int64_t*)_size, ) ;
+ }
+ catch ( os::Error )
+ {
Index:
Re: bsd.port.mk: Add EXTRACT_FILES
On Mon, May 18, 2020 at 03:13:07PM +0200, Marc Espie wrote:
> > @@ -1726,6 +1726,18 @@ Used to set DISTFILES default value to $
> > The decompression tool needed will be automatically added as
> > .Ev BUILD_DEPENDS .
> > Default value is .tar.gz.
> > +.It Ev EXTRACT_FILES
> > +Set to the list of files to actually extract from distfiles.
> > +Its content is subject to shell evaluation as part of
> > +.Ev EXTRACT_CASES
> > +and passed as
> > +.Ar file ...
> > +argument to
> > +.Xr tar 1 ,
> This lies, you also pass it to unzip.
Fair point, I'll adjust wording a bit.
> I'm a bit queasy with the lack of -- in unzip
Afterall it's cosmetics anyway: with `tar ... -- ${EXTRACT_FILES}' you
cannot pass options to this tar invocation, but nothing prevents stuff
like EXTRACT_FILES='; echo foo'.
> > +e.g., shell brace expansion may apply, but
> > +.Xr glob 7
> > +patterns must be escaped.
> Use ${EXTRACT_FILES:Q} ?
No, that breaks brace expansion:
$ make show=EXTRACT_FILES
coreboot-4.12/{src/commonlib,util}
$ make show=EXTRACT_FILES:Q
coreboot-4.12/\{src/commonlib,util\}
> > +Empty by default to extract all files.
> > .It Ev FAKE_FLAGS
> > Extra flags passed to ${MAKE_PROGRAM} during the
> > fake invocation.
> >
> >
>
Re: new misc/py-opcua
Ping after unlock. On Mon, Apr 20, 2020 at 02:15:20AM +0200, Alexander Bluhm wrote: > Hi, > > I would like to browse OPC UA servers with a python GUI. For that > I need py-opcua, py-opcua-widgets, py-opcua-client. As py-opcua-widgets > does not compile with python2, I think we should only have python3 > ports. > > ok? > > Description: > Pure Python OPC UA / IEC 62541 Client and Server Python 2, 3 and > pypy. OPC UA binary protocol implementation is quasi complete and > has been tested against many different OPC UA stacks. API offers > both a low level interface to send and receive all UA defined > structures and high level classes allowing to write a server or a > client in a few lines. It is easy to mix high level objects and > low level UA calls in one application. > > Description: > Common widgets for opcua-modeler og opcua-client-gui. > > Description: > Simple OPC-UA GUI client. Written using freeopcua python api and > pyqt. Most needed functionnalities are implemented including > subscribing for data changes and events, write variable values > listing attributes and references, and call methods. > > bluhm py-opcua.tgz Description: application/tar-gz py-opcua-widgets.tgz Description: application/tar-gz py-opcua-client.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/18 07:42:57 Modified files: benchmarks : Makefile Log message: +nuttcp
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2020/05/18 07:38:43 Log message: import nuttcp 8.2.2 OK sthen@ Comment: network performance measurement tool Description: nuttcp is a network performance measurement tool intended for use by network and system managers. Its most basic usage is to determine the raw TCP (or UDP) network layer throughput by transferring memory buffers from a source system across an interconnecting network to a destination system, either transferring data for a specified time interval, or alternatively transferring a specified number of bytes. In addition to reporting the achieved network throughput in Mbps, nuttcp also provides additional useful information related to the data transfer such as user, system, and wall-clock time, transmitter and receiver CPU utilization, and loss percentage (for UDP transfers). Status: Vendor Tag: bluhm Release Tags: bluhm_20200518 N ports/benchmarks/nuttcp/Makefile N ports/benchmarks/nuttcp/distinfo N ports/benchmarks/nuttcp/patches/patch-nuttcp_c N ports/benchmarks/nuttcp/pkg/DESCR N ports/benchmarks/nuttcp/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/05/18 07:29:02 Modified files: databases/freetds: Makefile distinfo Log message: update to freetds-1.1.39
Re: NEW: www/py-qtwebengine
On Mon, May 18, 2020 at 06:42:32AM +0200, Rafael Sadowski wrote:
> Ok to import py-qtwebengine after we have unlocked x11/qt5/qtwebengine?
> Diff below and tarball attached.
Comments below
> Rafael
>
> diff --git a/www/py-qtwebengine/Makefile b/www/py-qtwebengine/Makefile
> new file mode 100644
> index 000..d191af76948
> --- /dev/null
> +++ b/www/py-qtwebengine/Makefile
> @@ -0,0 +1,52 @@
> +# $OpenBSD: Makefile,v 1.22 2020/03/13 16:54:11 rsadowski Exp $
> +
> +COMMENT = python Qt5WebEngine bindings
> +
> +V= 5.13.2
> +DISTNAME=PyQtWebEngine-${V}
> +PKGNAME= py-qtwebengine-${V}
> +
> +CATEGORIES= www devel
> +
> +HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/intro
> +
> +MASTER_SITES=
> https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${V}/
> +
> +# GPLv3 with exceptions for use with certain named open-source licenses
> +PERMIT_PACKAGE= Yes
> +
> +LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
> + x11/qt5/qtwebengine
> +
> +NO_TEST= Yes
> +
> +MODULES =lang/python \
> + x11/qt5
> +
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
For a library like this, we've switched to using FLAVORS = python3 and
FLAVOR = python3. It avoids having to look up whether or not a port is
python3-only before deciding to put MODPY_FLAVOR at the end.
> +
> +RUN_DEPENDS =devel/py-sip${MODPY_FLAVOR} \
> + devel/py-enum34 \
Ending the last DEPENDS with a \ is a little weird, typo? Also, as kn
pointed out, py-enum34 is not needed for a python3-only port.
That's it for comments. I haven't build tested this, but saw those 2
issues.
--Kurt
> +
> +BUILD_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
> + devel/py-enum34 \
> +
> +NO_TEST =Yes
> +
> +CONFIGURE_STYLE =simple
> +
> +CONFIGURE_SCRIPT = ${MODPY_BIN} ${WRKSRC}/configure.py
> +
> +QTVER = qt5
> +PYQTVER =PyQt5
> +SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
> +
> +CONFIGURE_ARGS +=--qmake=${MODQT5_QMAKE} \
> + --pyqt-sipdir=${LOCALBASE}/${SIPDIR} \
> + --sip=${LOCALBASE}/bin/sip${MODPY_BIN_SUFFIX} \
> + --verbose
> +
> +MAKE_ENV = INSTALL_ROOT="${WRKINST}"
> +SUBST_VARS +=QTVER PYQTVER SIPDIR
> +
> +.include
> diff --git a/www/py-qtwebengine/distinfo b/www/py-qtwebengine/distinfo
> new file mode 100644
> index 000..235f1d233fd
> --- /dev/null
> +++ b/www/py-qtwebengine/distinfo
> @@ -0,0 +1,2 @@
> +SHA256 (PyQtWebEngine-5.13.2.tar.gz) =
> QmSRG1hHx1ch2MnDCvkuWKIWvSXO7zf3q/khAFwdRak=
> +SIZE (PyQtWebEngine-5.13.2.tar.gz) = 45234
> diff --git a/www/py-qtwebengine/pkg/DESCR b/www/py-qtwebengine/pkg/DESCR
> new file mode 100644
> index 000..60e08bda355
> --- /dev/null
> +++ b/www/py-qtwebengine/pkg/DESCR
> @@ -0,0 +1 @@
> +Python bindings for the Qt5 toolkit, QtWebEngine module
> diff --git a/www/py-qtwebengine/pkg/PLIST b/www/py-qtwebengine/pkg/PLIST
> new file mode 100644
> index 000..73b1352af36
> --- /dev/null
> +++ b/www/py-qtwebengine/pkg/PLIST
> @@ -0,0 +1,51 @@
> +@comment $OpenBSD: PLIST,v 1.6 2020/03/13 16:54:12 rsadowski Exp $
> +lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/
> +lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngine.pyi
> +@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngine.so
> +lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineCore.pyi
> +@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineCore.so
> +lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineWidgets.pyi
> +@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineWidgets.so
> +lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/INSTALLER
> +lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/METADATA
> +lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/RECORD
> +lib/${QTVER}/
> +lib/${QTVER}/qsci/
> +lib/${QTVER}/qsci/api/
> +lib/${QTVER}/qsci/api/python/
> +lib/${QTVER}/qsci/api/python/PyQtWebEngine.api
> +share/sip/
> +${SIPDIR}/
> +${SIPDIR}/QtWebEngine/
> +${SIPDIR}/QtWebEngine/QtWebEnginemod.sip
> +${SIPDIR}/QtWebEngine/qquickwebengineprofile.sip
> +${SIPDIR}/QtWebEngine/qquickwebenginescript.sip
> +${SIPDIR}/QtWebEngine/qtwebengineglobal.sip
> +${SIPDIR}/QtWebEngineCore/
> +${SIPDIR}/QtWebEngineCore/QtWebEngineCoremod.sip
> +${SIPDIR}/QtWebEngineCore/qwebengineclientcertificatestore.sip
> +${SIPDIR}/QtWebEngineCore/qwebenginecookiestore.sip
> +${SIPDIR}/QtWebEngineCore/qwebenginehttprequest.sip
> +${SIPDIR}/QtWebEngineCore/qwebenginenotification.sip
> +${SIPDIR}/QtWebEngineCore/qwebenginequotarequest.sip
> +${SIPDIR}/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
>
Re: NEW: telephony/resiprocate
On 2020/05/18 14:31, Ingo Feinerer wrote: > Hi, > > please find attached a port for the reSIProcate > (https://www.resiprocate.org/) SIP stack with STUN/TURN server and SIP > proxy/registrar server. It is an alternative to the Kamailio SIP server. > > $ cat pkg/DESCR-main > The reSIProcate components, particularly the SIP stack, are in use in both > commercial and open-source products. The project is dedicated to maintaining a > complete, correct, and commercially usable implementation of SIP and a few > related protocols. > > $ cat pkg/DESCR-repro > repro is an open-source, free SIP server which provides SIP proxy, registrar, > redirect, and identity services. > > $ cat pkg/DESCR-reTurn > reTurn is a highly efficient C++ open-source STUN/TURN server and client > library. It is an implementation of the latest STUN/TURN RFCs: RFC5389 (STUN), > and RFC5766 (TURN). > > I am using repro as SIP registrar for over 2 years now on amd64 without > problems > (initial submission: > https://marc.info/?l=openbsd-ports=150593554912043=2). > > OK to import? > > Note: I am using > 855 _return _return telephony/resiprocate/reTurn > 856 _repro _repro telephony/resiprocate/repro > for the moment (infrastructure/db/user.list). Looking pretty good, just a few comments: - those user.list entries should just say telephony/resiprocate. - I'm not sure we really need two readmes just telling people how to generate a self-signed X.509 cert? We don't do that for webservers, mailservers or other voip software). - I would prefer to lowercase reTurn (resiprocate is already lower-cased so it then matches that, and matches other ports).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/05/18 07:17:43 Modified files: security/botan2: Makefile distinfo security/botan2/patches: patch-src_cli_sandbox_cpp patch-src_tests_main_cpp security/botan2/pkg: PLIST Log message: Update to botan2 2.14.0. ok bluhm@ (MAINTAINER) tb@
Re: bsd.port.mk: Add EXTRACT_FILES
On Mon, May 18, 2020 at 01:46:38PM +0200, Klemens Nanni wrote:
> On Mon, May 18, 2020 at 12:17:01PM +0100, Stuart Henderson wrote:
> > I like it, can you work up something for the bsd.port.mk(5) manual please?
> Diff below tries to lay out the inner workings without being too
> specific; a bit tricky to prevent common pitfalls without explaining
> basic shell syntax/behaviour.
>
> > I agree the brace expansion is helpful for how this is used.
> Yup.
>
> Feedback?
>
> I'll also take OKs as the bsd.port.mk diff is a NOOP for every port not
> using EXTRACT_FILES.
>
>
> Index: share/man/man5/bsd.port.mk.5
> ===
> RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> retrieving revision 1.530
> diff -u -p -r1.530 bsd.port.mk.5
> --- share/man/man5/bsd.port.mk.5 20 Apr 2020 16:07:43 - 1.530
> +++ share/man/man5/bsd.port.mk.5 18 May 2020 11:30:05 -
> @@ -1697,21 +1697,21 @@ for archive in ${EXTRACT_ONLY}
> do
> case $$archive in
> *.tar.xz|*.tar.lzma)
> - xzcat ${FULLDISTDIR}/$$archive| tar xf -;;
> + xzcat ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
> *.tar.lz)
> - lunzip -c ${FULLDISTDIR}/$$archive| tar xf -;;
> + lunzip -c ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
> *.zip)
> - unzip -q ${FULLDISTDIR}/$$archive -d ${WRKDIR};;
> + unzip -q ${FULLDISTDIR}/$$archive -d ${WRKDIR} ${EXTRACT_FILES};;
> *.tar.bz2|*.tbz2|*.tbz)
> - bzip2 -dc ${FULLDISTDIR}/$$archive| tar xf -;;
> + bzip2 -dc ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
> *.shar.gz|*.shar.Z|*.sh.Z|*.sh.gz)
> gzcat ${FULLDISTDIR}/$$archive | /bin/sh;;
> *.shar|*.sh)
> /bin/sh ${FULLDISTDIR}/$$archive;;
> *.tar)
> - tar xf ${FULLDISTDIR}/$$archive;;
> + tar -xf ${FULLDISTDIR}/$$archive -- ${EXTRACT_FILES};;
> *)
> - gzip -dc ${FULLDISTDIR}/$$archive | tar xf -;;
> + gzip -dc ${FULLDISTDIR}/$$archive | tar -xf - -- ${EXTRACT_FILES};;
> esac
> done
> .Ed
> @@ -1726,6 +1726,9 @@ Used to set DISTFILES default value to $
> The decompression tool needed will be automatically added as
> .Ev BUILD_DEPENDS .
> Default value is .tar.gz.
> +.It Ev EXTRACT_FILES
> +Set to the list of files to actuall extract from distfiles.
> +Default is to extract all files.
> .It Ev FAKE_FLAGS
> Extra flags passed to ${MAKE_PROGRAM} during the
> fake invocation.
> Index: share/man/man5/bsd.port.mk.5
> ===
> RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> retrieving revision 1.530
> diff -u -p -r1.530 bsd.port.mk.5
> --- share/man/man5/bsd.port.mk.5 20 Apr 2020 16:07:43 - 1.530
> +++ share/man/man5/bsd.port.mk.5 18 May 2020 11:43:56 -
> @@ -1697,21 +1697,21 @@ for archive in ${EXTRACT_ONLY}
> do
> case $$archive in
> *.tar.xz|*.tar.lzma)
> - xzcat ${FULLDISTDIR}/$$archive| tar xf -;;
> + xzcat ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
> *.tar.lz)
> - lunzip -c ${FULLDISTDIR}/$$archive| tar xf -;;
> + lunzip -c ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
> *.zip)
> - unzip -q ${FULLDISTDIR}/$$archive -d ${WRKDIR};;
> + unzip -q ${FULLDISTDIR}/$$archive -d ${WRKDIR} ${EXTRACT_FILES};;
> *.tar.bz2|*.tbz2|*.tbz)
> - bzip2 -dc ${FULLDISTDIR}/$$archive| tar xf -;;
> + bzip2 -dc ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
> *.shar.gz|*.shar.Z|*.sh.Z|*.sh.gz)
> gzcat ${FULLDISTDIR}/$$archive | /bin/sh;;
> *.shar|*.sh)
> /bin/sh ${FULLDISTDIR}/$$archive;;
> *.tar)
> - tar xf ${FULLDISTDIR}/$$archive;;
> + tar -xf ${FULLDISTDIR}/$$archive -- ${EXTRACT_FILES};;
> *)
> - gzip -dc ${FULLDISTDIR}/$$archive | tar xf -;;
> + gzip -dc ${FULLDISTDIR}/$$archive | tar -xf - -- ${EXTRACT_FILES};;
> esac
> done
> .Ed
> @@ -1726,6 +1726,18 @@ Used to set DISTFILES default value to $
> The decompression tool needed will be automatically added as
> .Ev BUILD_DEPENDS .
> Default value is .tar.gz.
> +.It Ev EXTRACT_FILES
> +Set to the list of files to actually extract from distfiles.
> +Its content is subject to shell evaluation as part of
> +.Ev EXTRACT_CASES
> +and passed as
> +.Ar file ...
> +argument to
> +.Xr tar 1 ,
This lies, you also pass it to unzip.
I'm a bit queasy with the lack of -- in unzip
> +e.g., shell brace expansion may apply, but
> +.Xr glob 7
> +patterns must be escaped.
Use ${EXTRACT_FILES:Q} ?
> +Empty by default to extract all files.
> .It Ev FAKE_FLAGS
> Extra flags passed to ${MAKE_PROGRAM} during the
> fake invocation.
>
>
NEW: telephony/resiprocate
Hi, please find attached a port for the reSIProcate (https://www.resiprocate.org/) SIP stack with STUN/TURN server and SIP proxy/registrar server. It is an alternative to the Kamailio SIP server. $ cat pkg/DESCR-main The reSIProcate components, particularly the SIP stack, are in use in both commercial and open-source products. The project is dedicated to maintaining a complete, correct, and commercially usable implementation of SIP and a few related protocols. $ cat pkg/DESCR-repro repro is an open-source, free SIP server which provides SIP proxy, registrar, redirect, and identity services. $ cat pkg/DESCR-reTurn reTurn is a highly efficient C++ open-source STUN/TURN server and client library. It is an implementation of the latest STUN/TURN RFCs: RFC5389 (STUN), and RFC5766 (TURN). I am using repro as SIP registrar for over 2 years now on amd64 without problems (initial submission: https://marc.info/?l=openbsd-ports=150593554912043=2). OK to import? Note: I am using 855 _return _return telephony/resiprocate/reTurn 856 _repro _repro telephony/resiprocate/repro for the moment (infrastructure/db/user.list). Best regards, Ingo resiprocate.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/05/18 06:29:17 Modified files: devel : Makefile Log message: +rttr
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/05/18 06:28:33 Log message: Runtime Reflection Library for C++ mostly a dependency for kdenlive tweaks and okay rsadowski@ Status: Vendor Tag: espie Release Tags: ports N ports/devel/rttr/Makefile N ports/devel/rttr/distinfo N ports/devel/rttr/patches/patch-CMake_config_cmake N ports/devel/rttr/patches/patch-doc_CMakeLists_txt N ports/devel/rttr/pkg/PLIST N ports/devel/rttr/pkg/DESCR No conflicts created by this import
Re: NEW PORT: rttr (dependency for kdenlive)
On Sun, May 17, 2020 at 04:43:33PM +0200, Marc Espie wrote: > kdenlive lists this as "optional" but in actuality > it cheats and tries to download it on the side (which > obviously fails for us) > > The tests take forever to build, and some actually don't build with > clang/libc++, > so I've removed them, as the goal is only to build kdenlive Updated port with Rafael's suggestions rttr.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/05/18 06:18:09 Modified files: geo/qgis : Makefile distinfo Log message: Update to qgis 3.12.3.
FETCH_PACKAGES fix committed
I found the reason for a FETCH_PACKAGES bug, linked to pkg_add optimizations: with faster package updates, unchanged files would mean pkg_add would not always read to the end of the archive. Unfortunately, this also applies to symlinks at the end of the plist, as the meta-info is enough, AND this would also apply to grabbing newer versions of installed packages. I've committed a fix which knows a bit too much about internals, I might refactor it later, but this should get rid of the bewildering looking for foo-1.0 ... found followed by an error due to NOT copying the incomplete file which would be removed by caching...
Re: NEW: hyperfine: command line benchmarking tool
On 2020/05/18 12:55, Solene Rapenne wrote: > Le Sun, 17 May 2020 17:59:45 +0200, > "f.holop" a écrit : > > > hi, > > > > $ cat DESCR > > Command-line benchmarking tool. > > > > Features: > > - Statistical analysis across multiple runs. > > - Support for arbitrary shell commands. > > - Constant feedback about the benchmark progress and current > > estimates. > > - Warmup runs can be executed before the actual benchmark. > > - Cache-clearing commands can be set up before each timing run. > > - Statistical outlier detection to detect interference from other > > programs and caching effects. > > - Export results to various formats: CSV, JSON, Markdown, AsciiDoc. > > - Parameterized benchmarks (e.g. vary the number of threads). > > - Cross-platform > > > > > > -f > > compile fine and works fine (on amd64) > > I'd suggest using benchmarks category instead of sysutils. > Anyone else ok for importing? > SEPARATE_BUILD isn't needed, rust.port.mk sets it already. I agree with benchmarks (directory + category). I see why sysutils was chosen because it's not a benchmark itself, but it's clearly related to benchmarking, and we already have p5-Dumbbench in the category which is somewhat similar. And in cases where it could equally be one of two categories I tend to prefer the one with fewer ports in if there's a big difference (which is true here). sysutils could be an additional category if wanted. ok with those changed.
Re: bsd.port.mk: Add EXTRACT_FILES
On Mon, May 18, 2020 at 12:17:01PM +0100, Stuart Henderson wrote:
> I like it, can you work up something for the bsd.port.mk(5) manual please?
Diff below tries to lay out the inner workings without being too
specific; a bit tricky to prevent common pitfalls without explaining
basic shell syntax/behaviour.
> I agree the brace expansion is helpful for how this is used.
Yup.
Feedback?
I'll also take OKs as the bsd.port.mk diff is a NOOP for every port not
using EXTRACT_FILES.
Index: share/man/man5/bsd.port.mk.5
===
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.530
diff -u -p -r1.530 bsd.port.mk.5
--- share/man/man5/bsd.port.mk.520 Apr 2020 16:07:43 - 1.530
+++ share/man/man5/bsd.port.mk.518 May 2020 11:30:05 -
@@ -1697,21 +1697,21 @@ for archive in ${EXTRACT_ONLY}
do
case $$archive in
*.tar.xz|*.tar.lzma)
- xzcat ${FULLDISTDIR}/$$archive| tar xf -;;
+ xzcat ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
*.tar.lz)
- lunzip -c ${FULLDISTDIR}/$$archive| tar xf -;;
+ lunzip -c ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
*.zip)
- unzip -q ${FULLDISTDIR}/$$archive -d ${WRKDIR};;
+ unzip -q ${FULLDISTDIR}/$$archive -d ${WRKDIR} ${EXTRACT_FILES};;
*.tar.bz2|*.tbz2|*.tbz)
- bzip2 -dc ${FULLDISTDIR}/$$archive| tar xf -;;
+ bzip2 -dc ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
*.shar.gz|*.shar.Z|*.sh.Z|*.sh.gz)
gzcat ${FULLDISTDIR}/$$archive | /bin/sh;;
*.shar|*.sh)
/bin/sh ${FULLDISTDIR}/$$archive;;
*.tar)
- tar xf ${FULLDISTDIR}/$$archive;;
+ tar -xf ${FULLDISTDIR}/$$archive -- ${EXTRACT_FILES};;
*)
- gzip -dc ${FULLDISTDIR}/$$archive | tar xf -;;
+ gzip -dc ${FULLDISTDIR}/$$archive | tar -xf - -- ${EXTRACT_FILES};;
esac
done
.Ed
@@ -1726,6 +1726,9 @@ Used to set DISTFILES default value to $
The decompression tool needed will be automatically added as
.Ev BUILD_DEPENDS .
Default value is .tar.gz.
+.It Ev EXTRACT_FILES
+Set to the list of files to actuall extract from distfiles.
+Default is to extract all files.
.It Ev FAKE_FLAGS
Extra flags passed to ${MAKE_PROGRAM} during the
fake invocation.
Index: share/man/man5/bsd.port.mk.5
===
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.530
diff -u -p -r1.530 bsd.port.mk.5
--- share/man/man5/bsd.port.mk.520 Apr 2020 16:07:43 - 1.530
+++ share/man/man5/bsd.port.mk.518 May 2020 11:43:56 -
@@ -1697,21 +1697,21 @@ for archive in ${EXTRACT_ONLY}
do
case $$archive in
*.tar.xz|*.tar.lzma)
- xzcat ${FULLDISTDIR}/$$archive| tar xf -;;
+ xzcat ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
*.tar.lz)
- lunzip -c ${FULLDISTDIR}/$$archive| tar xf -;;
+ lunzip -c ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
*.zip)
- unzip -q ${FULLDISTDIR}/$$archive -d ${WRKDIR};;
+ unzip -q ${FULLDISTDIR}/$$archive -d ${WRKDIR} ${EXTRACT_FILES};;
*.tar.bz2|*.tbz2|*.tbz)
- bzip2 -dc ${FULLDISTDIR}/$$archive| tar xf -;;
+ bzip2 -dc ${FULLDISTDIR}/$$archive| tar -xf - -- ${EXTRACT_FILES};;
*.shar.gz|*.shar.Z|*.sh.Z|*.sh.gz)
gzcat ${FULLDISTDIR}/$$archive | /bin/sh;;
*.shar|*.sh)
/bin/sh ${FULLDISTDIR}/$$archive;;
*.tar)
- tar xf ${FULLDISTDIR}/$$archive;;
+ tar -xf ${FULLDISTDIR}/$$archive -- ${EXTRACT_FILES};;
*)
- gzip -dc ${FULLDISTDIR}/$$archive | tar xf -;;
+ gzip -dc ${FULLDISTDIR}/$$archive | tar -xf - -- ${EXTRACT_FILES};;
esac
done
.Ed
@@ -1726,6 +1726,18 @@ Used to set DISTFILES default value to $
The decompression tool needed will be automatically added as
.Ev BUILD_DEPENDS .
Default value is .tar.gz.
+.It Ev EXTRACT_FILES
+Set to the list of files to actually extract from distfiles.
+Its content is subject to shell evaluation as part of
+.Ev EXTRACT_CASES
+and passed as
+.Ar file ...
+argument to
+.Xr tar 1 ,
+e.g., shell brace expansion may apply, but
+.Xr glob 7
+patterns must be escaped.
+Empty by default to extract all files.
.It Ev FAKE_FLAGS
Extra flags passed to ${MAKE_PROGRAM} during the
fake invocation.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/05/18 05:20:35 Modified files: net: Makefile Log message: import asdig
Re: bsd.port.mk: Add EXTRACT_FILES
On 2020/05/18 12:51, Klemens Nanni wrote:
> Some ports have huge distfiles of which we only need a tiny fraction,
> see the coreboot-utils thread.
>
> My idea was to pass a list of files to the extract phase and it works
> just fine as seen in the diff below, based on this EXTRACT_FILES has no
> effect for .shar or .gz distfiles, but I don't see this as an issue.
>
> Technically, EXTRACT_FILES is a list of glob patterns read by tar(1).
>
> Diff below has the bsd.port.mk(5) bits as well as two examples:
> coreboot-utils dropping WRKDIR size from 205M to 7M and iwm-firmware
> reduced from 408M to 93M - no PLIST changes.
>
> Passing EXTRACT_FILES as is has the advantage of using sh(1)'s brace
> expansion as shown in the diff, using make's :QL would have the
> advantage of not preventing porters from passing bogus values, e.g.
> passing unquoted or unescaped asterisks which would mistakenly be
> interpreted by sh(1) instead of tar(1).
>
> I pass it as is because brace expansion makes it easy to use and
> EXTRACT_FILES wouldn't be the first variable to pass unsanitized shell
> code into parts of bsd.port.mk where arbitrary code is not meant to be.
>
> Feedback?
I like it, can you work up something for the bsd.port.mk(5) manual please?
I agree the brace expansion is helpful for how this is used.
> Index: infrastructure/mk/bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1534
> diff -u -p -U0 -r1.1534 bsd.port.mk
> --- infrastructure/mk/bsd.port.mk 20 Apr 2020 11:49:57 - 1.1534
> +++ infrastructure/mk/bsd.port.mk 18 May 2020 10:41:40 -
> @@ -1344,0 +1345 @@ EXTRACT_CASES ?=
> +EXTRACT_FILES ?=
> @@ -1353 +1354 @@ EXTRACT_CASES += *.zip) \
> - ${UNZIP} -oq ${FULLDISTDIR}/$$archive -d ${WRKDIR};;
> + ${UNZIP} -oq ${FULLDISTDIR}/$$archive -d ${WRKDIR} ${EXTRACT_FILES};;
> @@ -1360 +1361 @@ EXTRACT_CASES += *.tar.xz) \
> - xzdec <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
> + xzdec <${FULLDISTDIR}/$$archive | ${TAR} -xf - -- ${EXTRACT_FILES};;
> @@ -1362 +1363 @@ EXTRACT_CASES += *.tar.lzma) \
> - lzmadec <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
> + lzmadec <${FULLDISTDIR}/$$archive | ${TAR} -xf - -- ${EXTRACT_FILES};;
> @@ -1368 +1369 @@ EXTRACT_CASES += *.tar.lz) \
> - lunzip <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
> + lunzip <${FULLDISTDIR}/$$archive | ${TAR} -xf - -- ${EXTRACT_FILES};;
> @@ -1378 +1379 @@ EXTRACT_CASES += *.tar.bz2|*.tbz2|*.tbz)
> - ${BZIP2} -d <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
> + ${BZIP2} -d <${FULLDISTDIR}/$$archive | ${TAR} -xf - --
> ${EXTRACT_FILES};;
> @@ -1387 +1388 @@ EXTRACT_CASES += *.tar) \
> - ${TAR} xf ${FULLDISTDIR}/$$archive;;
> + ${TAR} -xf ${FULLDISTDIR}/$$archive -- ${EXTRACT_FILES};;
> @@ -1393 +1394 @@ EXTRACT_CASES += *.tar.gz|*.tgz) \
> - ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
> + ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive | ${TAR} -xf - --
> ${EXTRACT_FILES};;
> @@ -1397 +1398 @@ EXTRACT_CASES += *) \
> - ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
> + ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive | ${TAR} -xf - --
> ${EXTRACT_FILES};;
> Index: sysutils/firmware/iwm/Makefile
> ===
> RCS file: /cvs/ports/sysutils/firmware/iwm/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- sysutils/firmware/iwm/Makefile18 Nov 2019 11:36:56 - 1.13
> +++ sysutils/firmware/iwm/Makefile18 May 2020 10:41:46 -
> @@ -5,6 +5,7 @@ FW_VER= 20191022
> REVISION=0
> DISTNAME=linux-firmware-${FW_VER}
> EXTRACT_SUFX=.tar.xz
> +EXTRACT_FILES=
> ${DISTNAME}/{LICENCE.iwlwifi_firmware,iwlwifi-\*-\*.ucode}
>
> HOMEPAGE=https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi
> MASTER_SITES=https://cdn.kernel.org/pub/linux/kernel/firmware/
> Index: sysutils/coreboot-utils/Makefile
> ===
> RCS file: /cvs/ports/sysutils/coreboot-utils/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- sysutils/coreboot-utils/Makefile 14 May 2020 19:20:27 - 1.3
> +++ sysutils/coreboot-utils/Makefile 18 May 2020 10:26:38 -
> @@ -24,6 +24,8 @@ WANTLIB = c
> MASTER_SITES = https://coreboot.org/releases/
>
> EXTRACT_SUFX = .tar.xz
> +# extract only what's needed (7M) instead of everything (205M)
> +EXTRACT_FILES = ${DISTNAME}/{src/commonlib,util}
>
> USE_GMAKE = Yes
>
>
Re: NEW: net/asdig v0.97
Any idea why this is poking around in resolver internals rather than just using the documented getrrsetbyname interface?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/05/18 05:00:41 Log message: asdig is a simple tool for retrieving ASN (autonomous system number) match from IPv4/IPv6 published by services like Rezopole GoASMap or Cymru. For a given IPv4 or IPv6 it would display current BGP anouncements received at the BGP-infrastructure of the queried IP-to-AS reference server, or Internet Exchange Point (IXP) subnets from PeeringDB, or reserved subnets from Internet Assigned Numbers Authority (IANA). For a given AS number it would display a digest of the registered informations from Regional Internet Registries (RIR). https://github.com/Rezopole/asdig Thanks to kn@ and sthen@ for their input & help. OK kn@ Status: Vendor Tag: denis Release Tags: denis_20200518 N ports/net/asdig/Makefile N ports/net/asdig/distinfo N ports/net/asdig/pkg/DESCR N ports/net/asdig/pkg/PLIST No conflicts created by this import
Re: NEW: hyperfine: command line benchmarking tool
Le Sun, 17 May 2020 17:59:45 +0200, "f.holop" a écrit : > hi, > > $ cat DESCR > Command-line benchmarking tool. > > Features: > - Statistical analysis across multiple runs. > - Support for arbitrary shell commands. > - Constant feedback about the benchmark progress and current > estimates. > - Warmup runs can be executed before the actual benchmark. > - Cache-clearing commands can be set up before each timing run. > - Statistical outlier detection to detect interference from other > programs and caching effects. > - Export results to various formats: CSV, JSON, Markdown, AsciiDoc. > - Parameterized benchmarks (e.g. vary the number of threads). > - Cross-platform > > > -f compile fine and works fine (on amd64) I'd suggest using benchmarks category instead of sysutils. Anyone else ok for importing?
Re: NEW: www/py-qtwebengine
On Mon, May 18, 2020 at 06:42:32AM +0200, Rafael Sadowski wrote:
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> +
> +RUN_DEPENDS =devel/py-sip${MODPY_FLAVOR} \
> + devel/py-enum34 \
py-enum34 seems off, forgot to remove this one?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/05/18 04:54:15 Modified files: multimedia/mlt : Makefile Log message: missed --disable-rubberband in jca@'s mail
bsd.port.mk: Add EXTRACT_FILES
Some ports have huge distfiles of which we only need a tiny fraction,
see the coreboot-utils thread.
My idea was to pass a list of files to the extract phase and it works
just fine as seen in the diff below, based on this EXTRACT_FILES has no
effect for .shar or .gz distfiles, but I don't see this as an issue.
Technically, EXTRACT_FILES is a list of glob patterns read by tar(1).
Diff below has the bsd.port.mk(5) bits as well as two examples:
coreboot-utils dropping WRKDIR size from 205M to 7M and iwm-firmware
reduced from 408M to 93M - no PLIST changes.
Passing EXTRACT_FILES as is has the advantage of using sh(1)'s brace
expansion as shown in the diff, using make's :QL would have the
advantage of not preventing porters from passing bogus values, e.g.
passing unquoted or unescaped asterisks which would mistakenly be
interpreted by sh(1) instead of tar(1).
I pass it as is because brace expansion makes it easy to use and
EXTRACT_FILES wouldn't be the first variable to pass unsanitized shell
code into parts of bsd.port.mk where arbitrary code is not meant to be.
Feedback?
Index: infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1534
diff -u -p -U0 -r1.1534 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 20 Apr 2020 11:49:57 - 1.1534
+++ infrastructure/mk/bsd.port.mk 18 May 2020 10:41:40 -
@@ -1344,0 +1345 @@ EXTRACT_CASES ?=
+EXTRACT_FILES ?=
@@ -1353 +1354 @@ EXTRACT_CASES += *.zip) \
- ${UNZIP} -oq ${FULLDISTDIR}/$$archive -d ${WRKDIR};;
+ ${UNZIP} -oq ${FULLDISTDIR}/$$archive -d ${WRKDIR} ${EXTRACT_FILES};;
@@ -1360 +1361 @@ EXTRACT_CASES += *.tar.xz) \
- xzdec <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
+ xzdec <${FULLDISTDIR}/$$archive | ${TAR} -xf - -- ${EXTRACT_FILES};;
@@ -1362 +1363 @@ EXTRACT_CASES += *.tar.lzma) \
- lzmadec <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
+ lzmadec <${FULLDISTDIR}/$$archive | ${TAR} -xf - -- ${EXTRACT_FILES};;
@@ -1368 +1369 @@ EXTRACT_CASES += *.tar.lz) \
- lunzip <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
+ lunzip <${FULLDISTDIR}/$$archive | ${TAR} -xf - -- ${EXTRACT_FILES};;
@@ -1378 +1379 @@ EXTRACT_CASES += *.tar.bz2|*.tbz2|*.tbz)
- ${BZIP2} -d <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
+ ${BZIP2} -d <${FULLDISTDIR}/$$archive | ${TAR} -xf - --
${EXTRACT_FILES};;
@@ -1387 +1388 @@ EXTRACT_CASES += *.tar) \
- ${TAR} xf ${FULLDISTDIR}/$$archive;;
+ ${TAR} -xf ${FULLDISTDIR}/$$archive -- ${EXTRACT_FILES};;
@@ -1393 +1394 @@ EXTRACT_CASES += *.tar.gz|*.tgz) \
- ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
+ ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive | ${TAR} -xf - --
${EXTRACT_FILES};;
@@ -1397 +1398 @@ EXTRACT_CASES += *) \
- ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive | ${TAR} xf -;;
+ ${GZIP_CMD} -d <${FULLDISTDIR}/$$archive | ${TAR} -xf - --
${EXTRACT_FILES};;
Index: sysutils/firmware/iwm/Makefile
===
RCS file: /cvs/ports/sysutils/firmware/iwm/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- sysutils/firmware/iwm/Makefile 18 Nov 2019 11:36:56 - 1.13
+++ sysutils/firmware/iwm/Makefile 18 May 2020 10:41:46 -
@@ -5,6 +5,7 @@ FW_VER= 20191022
REVISION= 0
DISTNAME= linux-firmware-${FW_VER}
EXTRACT_SUFX= .tar.xz
+EXTRACT_FILES= ${DISTNAME}/{LICENCE.iwlwifi_firmware,iwlwifi-\*-\*.ucode}
HOMEPAGE= https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi
MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/firmware/
Index: sysutils/coreboot-utils/Makefile
===
RCS file: /cvs/ports/sysutils/coreboot-utils/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- sysutils/coreboot-utils/Makefile14 May 2020 19:20:27 - 1.3
+++ sysutils/coreboot-utils/Makefile18 May 2020 10:26:38 -
@@ -24,6 +24,8 @@ WANTLIB = c
MASTER_SITES = https://coreboot.org/releases/
EXTRACT_SUFX = .tar.xz
+# extract only what's needed (7M) instead of everything (205M)
+EXTRACT_FILES =${DISTNAME}/{src/commonlib,util}
USE_GMAKE =Yes
Re: NEW: net/asdig v0.97
OK kn
NEW: www/py-qtwebengine
Ok to import py-qtwebengine after we have unlocked x11/qt5/qtwebengine?
Diff below and tarball attached.
Rafael
diff --git a/www/py-qtwebengine/Makefile b/www/py-qtwebengine/Makefile
new file mode 100644
index 000..d191af76948
--- /dev/null
+++ b/www/py-qtwebengine/Makefile
@@ -0,0 +1,52 @@
+# $OpenBSD: Makefile,v 1.22 2020/03/13 16:54:11 rsadowski Exp $
+
+COMMENT= python Qt5WebEngine bindings
+
+V= 5.13.2
+DISTNAME= PyQtWebEngine-${V}
+PKGNAME= py-qtwebengine-${V}
+
+CATEGORIES=www devel
+
+HOMEPAGE= https://www.riverbankcomputing.com/software/pyqtwebengine/intro
+
+MASTER_SITES=
https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${V}/
+
+# GPLv3 with exceptions for use with certain named open-source licenses
+PERMIT_PACKAGE=Yes
+
+LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
+ x11/qt5/qtwebengine
+
+NO_TEST= Yes
+
+MODULES = lang/python \
+ x11/qt5
+
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+
+RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
+ devel/py-enum34 \
+
+BUILD_DEPENDS =devel/py-sip${MODPY_FLAVOR} \
+ devel/py-enum34 \
+
+NO_TEST = Yes
+
+CONFIGURE_STYLE = simple
+
+CONFIGURE_SCRIPT = ${MODPY_BIN} ${WRKSRC}/configure.py
+
+QTVER =qt5
+PYQTVER = PyQt5
+SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
+
+CONFIGURE_ARGS += --qmake=${MODQT5_QMAKE} \
+ --pyqt-sipdir=${LOCALBASE}/${SIPDIR} \
+ --sip=${LOCALBASE}/bin/sip${MODPY_BIN_SUFFIX} \
+ --verbose
+
+MAKE_ENV = INSTALL_ROOT="${WRKINST}"
+SUBST_VARS += QTVER PYQTVER SIPDIR
+
+.include
diff --git a/www/py-qtwebengine/distinfo b/www/py-qtwebengine/distinfo
new file mode 100644
index 000..235f1d233fd
--- /dev/null
+++ b/www/py-qtwebengine/distinfo
@@ -0,0 +1,2 @@
+SHA256 (PyQtWebEngine-5.13.2.tar.gz) =
QmSRG1hHx1ch2MnDCvkuWKIWvSXO7zf3q/khAFwdRak=
+SIZE (PyQtWebEngine-5.13.2.tar.gz) = 45234
diff --git a/www/py-qtwebengine/pkg/DESCR b/www/py-qtwebengine/pkg/DESCR
new file mode 100644
index 000..60e08bda355
--- /dev/null
+++ b/www/py-qtwebengine/pkg/DESCR
@@ -0,0 +1 @@
+Python bindings for the Qt5 toolkit, QtWebEngine module
diff --git a/www/py-qtwebengine/pkg/PLIST b/www/py-qtwebengine/pkg/PLIST
new file mode 100644
index 000..73b1352af36
--- /dev/null
+++ b/www/py-qtwebengine/pkg/PLIST
@@ -0,0 +1,51 @@
+@comment $OpenBSD: PLIST,v 1.6 2020/03/13 16:54:12 rsadowski Exp $
+lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/
+lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngine.pyi
+@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngine.so
+lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineCore.pyi
+@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineCore.so
+lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineWidgets.pyi
+@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineWidgets.so
+lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/INSTALLER
+lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/RECORD
+lib/${QTVER}/
+lib/${QTVER}/qsci/
+lib/${QTVER}/qsci/api/
+lib/${QTVER}/qsci/api/python/
+lib/${QTVER}/qsci/api/python/PyQtWebEngine.api
+share/sip/
+${SIPDIR}/
+${SIPDIR}/QtWebEngine/
+${SIPDIR}/QtWebEngine/QtWebEnginemod.sip
+${SIPDIR}/QtWebEngine/qquickwebengineprofile.sip
+${SIPDIR}/QtWebEngine/qquickwebenginescript.sip
+${SIPDIR}/QtWebEngine/qtwebengineglobal.sip
+${SIPDIR}/QtWebEngineCore/
+${SIPDIR}/QtWebEngineCore/QtWebEngineCoremod.sip
+${SIPDIR}/QtWebEngineCore/qwebengineclientcertificatestore.sip
+${SIPDIR}/QtWebEngineCore/qwebenginecookiestore.sip
+${SIPDIR}/QtWebEngineCore/qwebenginehttprequest.sip
+${SIPDIR}/QtWebEngineCore/qwebenginenotification.sip
+${SIPDIR}/QtWebEngineCore/qwebenginequotarequest.sip
+${SIPDIR}/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlrequestinfo.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlrequestinterceptor.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlrequestjob.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlscheme.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlschemehandler.sip
+${SIPDIR}/QtWebEngineWidgets/
+${SIPDIR}/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginecertificateerror.sip
+${SIPDIR}/QtWebEngineWidgets/qwebengineclientcertificateselection.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginecontextmenudata.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginedownloaditem.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginefullscreenrequest.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginehistory.sip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2020/05/18 04:33:17 Modified files: multimedia/mlt : Makefile distinfo multimedia/mlt/patches: patch-src_framework_Makefile multimedia/mlt/pkg: PLIST-gpl2 PLIST-main Added files: multimedia/mlt/patches: patch-src_framework_mlt_property_c patch-src_modules_avformat_producer_avformat_c Removed files: multimedia/mlt/patches: patch-configure patch-src_framework_mlt_property_h patch-src_modules_kino_endian_types_h patch-src_modules_plusgpl_consumer_cbrts_c patch-src_modules_videostab_stab_estimate_c Log message: update to a more recent mlt, which gives shotcut a fighting chance heavy lifting by tracey@, with a few more patches by me (specifically fix mutex issues and neuter some locale operations that don't work for us) this is enough for shotcut to start correctly, and necessary for kdenlive again. jca@ checked that synfig runs again okay rsadowski@
Re: NEW: net/asdig v0.97
On 2020/05/18 11:33, Denis Fondras wrote: > On Sun, May 17, 2020 at 09:19:33PM +0100, Stuart Henderson wrote: > > ah, I was hoping not to have another program using the libbind port, it > > is a complete bodge - mtr got rid of their dodgy DNS code so only zeek > > was left. I won't block import due to this but it's a bit annoying ;) > > > > did any of the rezopole lookups work for you? the only thing where I'm > > getting any results from queries that I've tried are IP lookups from > > team cymru's database. the rezopole ones all come back NO_DATA. > > > > It works fine from here : > > ===> Regression tests for asdig-0.97 > ./asdig 134.214.100.6 10.10.12.64 > 2a02:3d0:623:a000::8008 > 2060 | 134.214.0.0/16 | EU | ripe | 1993-09-01 | FR-RENATER > RFC1918 | 10.0.0.0/8 | | | | > 22822 | 2a02:3d0::/32 | US | arin | 2001-11-28 | LLNW > ./asdig -cumry 134.214.100.6 10.10.12.64 > 2a02:3d0:623:a000::8008 > unkown option "-cumry" > 2060 | 134.214.0.0/16 | EU | ripe | 1993-09-01 | FR-RENATER > RFC1918 | 10.0.0.0/8 | | | | > 22822 | 2a02:3d0::/32 | US | arin | 2001-11-28 | LLNW > ./asdig -cymru 134.214.100.6 10.10.12.64 > 2a02:3d0:623:a000::8008 > 2060 | 134.214.0.0/16 | FR | ripencc | 1989-07-25 > HOST_NOT_FOUND > 22822 | 2a02:3d0::/32 | US | ripencc | 2008-05-22 > ./asdig -rezopole 134.214.100.6 10.10.12.64 > 2a02:3d0:623:a000::8008 > 2060 | 134.214.0.0/16 | EU | ripe | 1993-09-01 | FR-RENATER > RFC1918 | 10.0.0.0/8 | | | | > 22822 | 2a02:3d0::/32 | US | arin | 2001-11-28 | LLNW > ./asdig -suffixv4=tagada.tsointsoin.fr 134.214.100.6 10.10.12.64 > 2a02:3d0:623:a000::8008 > HOST_NOT_FOUND > HOST_NOT_FOUND > 22822 | 2a02:3d0::/32 | US | arin | 2001-11-28 | LLNW > ./asdig -suffixv6=tagada.tsointsoin.fr 134.214.100.6 10.10.12.64 > 2a02:3d0:623:a000::8008 > 2060 | 134.214.0.0/16 | EU | ripe | 1993-09-01 | FR-RENATER > RFC1918 | 10.0.0.0/8 | | | | > HOST_NOT_FOUND > > Rezopole tells me there is no filtering in place. Also, querying Rezopole > servers worked in Klemens first test but later failed... ===> Regression tests for asdig-0.97 ./asdig 134.214.100.6 10.10.12.64 2a02:3d0:623:a000::8008 NO_DATA NO_DATA NO_DATA ./asdig -cumry 134.214.100.6 10.10.12.64 2a02:3d0:623:a000::8008 unkown option "-cumry" NO_DATA NO_DATA NO_DATA ./asdig -cymru 134.214.100.6 10.10.12.64 2a02:3d0:623:a000::8008 2060 | 134.214.0.0/16 | FR | ripencc | 1989-07-25 HOST_NOT_FOUND 22822 | 2a02:3d0::/32 | US | ripencc | 2008-05-22 ./asdig -rezopole 134.214.100.6 10.10.12.64 2a02:3d0:623:a000::8008 NO_DATA NO_DATA NO_DATA ./asdig -suffixv4=tagada.tsointsoin.fr 134.214.100.6 10.10.12.64 2a02:3d0:623:a000::8008 HOST_NOT_FOUND HOST_NOT_FOUND NO_DATA ./asdig -suffixv6=tagada.tsointsoin.fr 134.214.100.6 10.10.12.64 2a02:3d0:623:a000::8008 NO_DATA NO_DATA HOST_NOT_FOUND My nameserver is running unbound fwiw.
Re: Qemu error on OpenBSD
On 17/05/2020 23:26, Stuart Henderson wrote: On 2020/05/17 20:08, Stephan Mending wrote: On Sun, May 17, 2020 at 07:52:03PM +0200, Alexandre Ratchov wrote: On Sun, May 17, 2020 at 07:19:44PM +0200, Stephan Mending wrote: Hi, after upgrading to qemu 5.0.0 I'm getting the following error when trying to start a virtual machine. $ qemu-system-x86_64 -s -drive format=raw,file=/path/to/harddrive Could not allocate dynamic translator buffer Do you have any idea how to fix this? I'm running OpenBSD on AMD64 architecture on current branch. Increasing user datasize limit (see login.conf(5) fixed it for me. I tried that. Didn't solve it for me. datasize-cur=1024M datasize-max=8192M I cannot imagine that 8G are too little for a VM that i wanna assign 512M. Best regards, Stephan Your limit here is still 1G unless you do "ulimit -d" or some software calls setrlimit. So either try bumping datasize-cur some more, or "ulimit -d $((2*1024*1024))" or something before running qemu. It's exactly as you've mentioned. I bumped the datasize-cur to 4G and everything is working fine. Thanks alot !
Re: NEW: net/asdig v0.97
On Sun, May 17, 2020 at 09:19:33PM +0100, Stuart Henderson wrote:
> ah, I was hoping not to have another program using the libbind port, it
> is a complete bodge - mtr got rid of their dodgy DNS code so only zeek
> was left. I won't block import due to this but it's a bit annoying ;)
>
> did any of the rezopole lookups work for you? the only thing where I'm
> getting any results from queries that I've tried are IP lookups from
> team cymru's database. the rezopole ones all come back NO_DATA.
>
It works fine from here :
===> Regression tests for asdig-0.97
./asdig 134.214.100.6 10.10.12.64
2a02:3d0:623:a000::8008
2060 | 134.214.0.0/16 | EU | ripe | 1993-09-01 | FR-RENATER
RFC1918 | 10.0.0.0/8 | | | |
22822 | 2a02:3d0::/32 | US | arin | 2001-11-28 | LLNW
./asdig -cumry 134.214.100.6 10.10.12.64
2a02:3d0:623:a000::8008
unkown option "-cumry"
2060 | 134.214.0.0/16 | EU | ripe | 1993-09-01 | FR-RENATER
RFC1918 | 10.0.0.0/8 | | | |
22822 | 2a02:3d0::/32 | US | arin | 2001-11-28 | LLNW
./asdig -cymru 134.214.100.6 10.10.12.64
2a02:3d0:623:a000::8008
2060 | 134.214.0.0/16 | FR | ripencc | 1989-07-25
HOST_NOT_FOUND
22822 | 2a02:3d0::/32 | US | ripencc | 2008-05-22
./asdig -rezopole 134.214.100.6 10.10.12.64
2a02:3d0:623:a000::8008
2060 | 134.214.0.0/16 | EU | ripe | 1993-09-01 | FR-RENATER
RFC1918 | 10.0.0.0/8 | | | |
22822 | 2a02:3d0::/32 | US | arin | 2001-11-28 | LLNW
./asdig -suffixv4=tagada.tsointsoin.fr 134.214.100.6 10.10.12.64
2a02:3d0:623:a000::8008
HOST_NOT_FOUND
HOST_NOT_FOUND
22822 | 2a02:3d0::/32 | US | arin | 2001-11-28 | LLNW
./asdig -suffixv6=tagada.tsointsoin.fr 134.214.100.6 10.10.12.64
2a02:3d0:623:a000::8008
2060 | 134.214.0.0/16 | EU | ripe | 1993-09-01 | FR-RENATER
RFC1918 | 10.0.0.0/8 | | | |
HOST_NOT_FOUND
Rezopole tells me there is no filtering in place. Also, querying Rezopole
servers worked in Klemens first test but later failed...
> btw I had a look at converting to the libc resolver instead, some of the
> failures with this are due to asdig poking in resolver internals, some
> are due to our ancient nameser.h - I'd like to call those out in case
> anyone else bumps into them as we have to patch some other ports too:
>
> | asdig.cpp:62:31: error: use of undeclared identifier 'ns_c_in'
> | asdig.cpp:62:40: error: use of undeclared identifier 'ns_t_txt'
> | asdig.cpp:105:31: error: use of undeclared identifier 'ns_t_txt'
>
> - the patches for these would be ns_c_xx -> C_XX, ns_t_xx -> T_XX
>
Thank you Stuart & Klemens for the input, here is the latest version :
# $OpenBSD$
COMMENT = retrieve routing informations efficiently via dns queries
GH_ACCOUNT =rezopole
GH_PROJECT =asdig
GH_TAGNAME =v0.97
CATEGORIES =net
MAINTAINER =Denis Fondras
# GPLv2+
PERMIT_PACKAGE =Yes
WANTLIB += ${COMPILER_LIBCXX} c lib/libbind/bind m
LIB_DEPENDS = net/libbind
SEPARATE_BUILD =Yes
CONFIGURE_STYLE = autoreconf
CONFIGURE_ARGS =prefix=${PREFIX} \
mandir=${PREFIX}/man
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.16
# network access
TEST_IS_INTERACTIVE = Yes
TEST_TARGET = vimtest
.include
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2020/05/18 03:29:06 Modified files: games/ezquake : Makefile distinfo games/ezquake/patches: patch-Makefile Log message: Update to ezquake-3.2 Patch from maintainer Tom Murphy openbsd at pertho.net
Re: [New] Puppet6 - 6.14.0
On Mon, May 18, 2020 at 09:57:02AM +1000, Arthur Barton wrote: > I've extracted the puppetlabs puppet-agent debian package for 6.14, and it > looks like they bundle the following > $ grep module usr/share/doc/puppet-agent/bill-of-materials > module-puppetlabs-augeas_core 1.0.5 > module-puppetlabs-cron_core 1.0.3 > module-puppetlabs-host_core 1.0.3 > module-puppetlabs-mount_core 1.0.4 > module-puppetlabs-scheduled_task 1.0.0 > module-puppetlabs-selinux_core 1.0.4 > module-puppetlabs-sshkeys_core 1.0.3 > module-puppetlabs-yumrepo_core 1.0.6 > module-puppetlabs-zfs_core 1.0.4 > module-puppetlabs-zone_core 1.0.3 > > Extracting the package finds these in > (/)opt/puppetlabs/puppet/vendor_modules/ which is referenced here > https://puppet.com/docs/puppet/latest/configuration.html#vendormoduledir and > in the puppet-agent build manifest here > https://github.com/puppetlabs/puppet-agent/blob/6.4.x/configs/projects/puppet-agent.rb#L116 > > It looks like Debian are going to package the modules then make puppet-6 > depend on them > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=950182 Thanks for digging, much appreciated. > I could do likewise, or include a MESSAGE (like the one attached). I don't > know how to manage displaying it only for the v6 install however. I just imported Puppet 6, fixed two regressions from your patches and also committed your MESSAGE as slightly tweaked version. `pkg_add puppet%6` should work soon and display besaid MESSAGE.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/05/18 03:22:23 Modified files: sysutils/ruby-puppet/6: Makefile Added files: sysutils/ruby-puppet/6/pkg: MESSAGE Log message: Briefly mention refactored puppet modules Text from Arthur Barton, tweaks from me
Re: [update] botan2 2.14.0
OK bluhm@
Re: coreboot-utils: extract only what's needed
On 2020/05/18 00:28, Klemens Nanni wrote: > On Sun, May 17, 2020 at 09:55:51PM -, Christian Weisgerber wrote: > > Didn't this come up with another port relatively recently? > > Should we have infrastructure support for this, like FreeBSD's > > EXTRACT_ONLY? > Not that I know of, unless you mean sysutils/mdprint were I tweaked > post-extract a bit, but that is another special case with an archive in > an archive, so not the same as coreboot-utils. > > In general, it would make sense to have a variable which can hold files > to extract from the tarball; the existing extract infrastructure seems > simple enough to be extended this way. > The sysutils/firmware ports could make good use of this.
