[maintainer patch] fix tcl-snmptools -fno-common
Move the global variable to on main c file.
ok ?
Index: Makefile
===
RCS file: /cvs/OpenBSD/ports/net/tcl-snmptools/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- Makefile12 Jul 2019 21:15:35 - 1.7
+++ Makefile2 Feb 2021 06:51:44 -
@@ -5,7 +5,7 @@ COMMENT = Tcl package that provides SNMP
V =1.0
DISTNAME = tcl-snmptools-${V}
-REVISION = 1
+REVISION = 2
CATEGORIES = net
MAINTAINER = Matthieu Herrb
Index: patches/patch-generic_snmptools_c
===
RCS file: patches/patch-generic_snmptools_c
diff -N patches/patch-generic_snmptools_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-generic_snmptools_c 2 Feb 2021 06:50:04 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix for -fno-common
+
+Index: generic/snmptools.c
+--- generic/snmptools.c.orig
generic/snmptools.c
+@@ -39,6 +39,8 @@ static int snmpCmd(ClientData clientData, Tcl_Interp *
+
+ static int sessionCmd(ClientData clientData, Tcl_Interp *interp, int objc,
Tcl_Obj *CONST objv[]);
+
++Tcl_DString Result;
++
+ /*
+ * Function Bodies
+ */
Index: patches/patch-generic_util_h
===
RCS file: patches/patch-generic_util_h
diff -N patches/patch-generic_util_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-generic_util_h2 Feb 2021 06:50:38 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+fix for -fno-common
+
+--- generic/util.h.origTue Jan 29 10:09:38 2008
generic/util.h Tue Feb 2 07:43:51 2021
+@@ -48,7 +48,6 @@
+ # define TMP "/tmp"
+ #endif
+
+-Tcl_DString Result;
+ extern Tcl_DString Result;
+
+ int printres(const char *fmt, ...);
--
Matthieu Herrb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/02/01 23:53:29 Modified files: graphics/tumble: Makefile Added files: graphics/tumble/patches: patch-semantics_c patch-tumble_input_h Log message: fix tumble -fno-common build ok cwen@
Re: New port: Gaupol subtitle editor
Attached tarball.
From: Anindya Mukherjee
Sent: February 1, 2021 10:31 PM
To: Dimitri Karamazov
Cc: ports@openbsd.org
Subject: Re: New port: Gaupol subtitle editor
Hi, just to recap:
This package provides Gaupol, an editor for
text-based subtitle files.
Maintainer: Anindya Mukherjee
Homepage: https://otsaloma.io/gaupol/
Comments? OKs? I'm using it on my machine,
installed from pkg.
Thanks!
Anindya
From: Anindya Mukherjee
Sent: January 29, 2021 7:18 PM
To: Dimitri Karamazov
Cc: ports@openbsd.org
Subject: Re: New port: Gaupol subtitle editor
Updated tarball attached. I have added myself as
maintainer.
Thanks,
Anindya
From: Anindya Mukherjee
Sent: January 29, 2021 12:04 AM
To: Dimitri Karamazov
Cc: ports@openbsd.org
Subject: Re: New port: Gaupol subtitle editor
Hi,
Many thanks for the comments and fixes. Sure, I can take
maintainer. So, it looks like I only need to add maintainer
to your version? Build and package looks ok and runs.
Any other suggestions?
Thanks,
Anindya
From: Dimitri Karamazov
Sent: January 28, 2021 9:14 PM
To: Anindya Mukherjee
Cc: ports@openbsd.org
Subject: Re: New port: Gaupol subtitle editor
On Fri, Jan 29, 2021 at 04:28:50AM +, Dimitri Karamazov wrote:
> Hi, this is a port of gaupol, an editor for text-based subtitle files.
> It supports multiple subtitle file formats and provides means of
> creating, editing and translating subtitles and timing subtitles to
> match video.
>
> This is my first port, so there might be things I missed. I have tried
> to follow the porting guide closely. Please have a look and comment.
>
> Thanks,
> Anindya
I've reattached with some changes
-py-* nomenclature is used for python modules not for standalone ports
like this, so I've removed it.
-FLAVOR{s,} is also used for python modules only, MODPY_VERSION is suffice
in this case.
-rearranged the dependencies in alpha order and added some missing
runtime depends.
There are many tests available but most of those need xorg, access to which
_pbuild doesn't have? One can run them as a normal user though. I'm not sure
if MODPY_PYTEST is of any use if the tests don't run on their own.
Also I recommended you take maintainer since you're going to use it.
regards,
Dimitri
gaupol.tar.gz
Description: gaupol.tar.gz
Re: New port: Gaupol subtitle editor
Hi, just to recap:
This package provides Gaupol, an editor for
text-based subtitle files.
Maintainer: Anindya Mukherjee
Homepage: https://otsaloma.io/gaupol/
Comments? OKs? I'm using it on my machine,
installed from pkg.
Thanks!
Anindya
From: Anindya Mukherjee
Sent: January 29, 2021 7:18 PM
To: Dimitri Karamazov
Cc: ports@openbsd.org
Subject: Re: New port: Gaupol subtitle editor
Updated tarball attached. I have added myself as
maintainer.
Thanks,
Anindya
From: Anindya Mukherjee
Sent: January 29, 2021 12:04 AM
To: Dimitri Karamazov
Cc: ports@openbsd.org
Subject: Re: New port: Gaupol subtitle editor
Hi,
Many thanks for the comments and fixes. Sure, I can take
maintainer. So, it looks like I only need to add maintainer
to your version? Build and package looks ok and runs.
Any other suggestions?
Thanks,
Anindya
From: Dimitri Karamazov
Sent: January 28, 2021 9:14 PM
To: Anindya Mukherjee
Cc: ports@openbsd.org
Subject: Re: New port: Gaupol subtitle editor
On Fri, Jan 29, 2021 at 04:28:50AM +, Dimitri Karamazov wrote:
> Hi, this is a port of gaupol, an editor for text-based subtitle files.
> It supports multiple subtitle file formats and provides means of
> creating, editing and translating subtitles and timing subtitles to
> match video.
>
> This is my first port, so there might be things I missed. I have tried
> to follow the porting guide closely. Please have a look and comment.
>
> Thanks,
> Anindya
I've reattached with some changes
-py-* nomenclature is used for python modules not for standalone ports
like this, so I've removed it.
-FLAVOR{s,} is also used for python modules only, MODPY_VERSION is suffice
in this case.
-rearranged the dependencies in alpha order and added some missing
runtime depends.
There are many tests available but most of those need xorg, access to which
_pbuild doesn't have? One can run them as a normal user though. I'm not sure
if MODPY_PYTEST is of any use if the tests don't run on their own.
Also I recommended you take maintainer since you're going to use it.
regards,
Dimitri
Update lang/iverilog to 11.0 (fixes no-common)
iverilog still starts.
OK?
Subject: [PATCH] Update lang/iverilog to 11.0
This allows it to build with CXXFLAGS=-fno-common
---
lang/iverilog/Makefile | 4 ++--
lang/iverilog/distinfo | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git lang/iverilog/Makefile lang/iverilog/Makefile
index bbe47233bf8..544c327e9bc 100644
--- lang/iverilog/Makefile
+++ lang/iverilog/Makefile
@@ -2,7 +2,7 @@
COMMENT= Verilog simulation and synthesis tool
-V= 10.3
+V= 11.0
DISTNAME= verilog-$V
PKGNAME= iverilog-$V
CATEGORIES=lang devel
@@ -12,7 +12,7 @@ HOMEPAGE= http://iverilog.icarus.com/
# GPLv2+
PERMIT_PACKAGE=Yes
-MASTER_SITES= ftp://ftp.icarus.com/pub/eda/verilog/v10/
+MASTER_SITES= ftp://ftp.icarus.com/pub/eda/verilog/v11/
WANTLIB += ${COMPILER_LIBCXX} bz2 c curses m readline z
diff --git lang/iverilog/distinfo lang/iverilog/distinfo
index c8b46d726a4..fc16e0e27b1 100644
--- lang/iverilog/distinfo
+++ lang/iverilog/distinfo
@@ -1,2 +1,2 @@
-SHA256 (verilog-10.3.tar.gz) = hr1F5+EtG8h3LDzdOU5oqf7MsqbRSq99rgdztydDaO8=
-SIZE (verilog-10.3.tar.gz) = 1698889
+SHA256 (verilog-11.0.tar.gz) = 1UeFYWtj/mc5lI6ZZ0mWJPKd7VSttX4eAOuJdWemVdU=
+SIZE (verilog-11.0.tar.gz) = 1784307
--
2.30.0
Re: [NEW] devel/py-importlib_resources]
- Forwarded message from Dimitri Karamazov - Date: Tue, 2 Feb 2021 00:27:25 + From: Dimitri Karamazov To: Stuart Henderson Subject: Re: [NEW] devel/py-importlib_resources On Mon, Feb 01, 2021 at 09:45:57PM +, Stuart Henderson wrote: > On 2021/02/01 03:41, Dimitri Karamazov wrote: > > Information for inst:py3-importlib_resources-5.1.0 > > > > Comment: > > backport of the importlib.resources module > > > > Required by: > > qutebrowser-2.0.0 > > > > Description: > > importlib_resources is a backport of Python standard library > > importlib.resources > > module for older Pythons. Users of Python 3.9 and beyond should use the > > standard > > library module, since for these versions, importlib_resources just > > delegates to > > that module. > > > > Maintainer: Dimitri Karamazov > > > > WWW: https://pypi.python.org/pypi/importlib_resources > > > > Any comments/OK's? > > Please add a comment like "# remove when switching to Python 3.9" > to the makefile and rewrap DESCR so it isn't hard against column 80, > make test is very broken here, it's not a show-stopper if the port > otherwise works but please mention it in makefile (unless it can > be fixed :) > > Then it's OK sthen. > Reattached with the expected changes. - End forwarded message - py-importlib_resources.tar.gz Description: Binary data
Re: gitea rc script broken
Thanks to Pavels help we could figure out what happens here. I think the
matter is now resolved for him.
In my case adding the -w flag was needed. But that does not seam to be
the case in every setup.
# rcctl get gitea
gitea_class=daemon
gitea_flags=-w /var/gitea
gitea_rtable=0
gitea_timeout=30
gitea_user=_gitea
Thanks so mich and sorry for the noise!
Greetings
Leo
Am 01.02.2021 um 15:33 schrieb Leo Unglaub:
Hi,
the last commit to the gitea port simplefied the rc script. The
following diff was used:
diff --git a/www/gitea/pkg/gitea.rc b/www/gitea/pkg/gitea.rc
index 5a71caba4fb..0b7e4d745cd 100644
--- a/www/gitea/pkg/gitea.rc
+++ b/www/gitea/pkg/gitea.rc
@@ -1,21 +1,13 @@
#!/bin/ksh
#
-# $OpenBSD: gitea.rc,v 1.5 2019/02/14 10:08:53 pvk Exp $
+# $OpenBSD: gitea.rc,v 1.6 2021/01/17 21:07:41 pvk Exp $
daemon="${TRUEPREFIX}/sbin/gitea"
daemon_user="_gitea"
-daemon_flags="web -c ${SYSCONFDIR}/gitea/app.ini"
. /etc/rc.d/rc.subr
rc_bg=YES
rc_reload=NO
-rc_start() {
- ${rcexec} "env HOME=${LOCALSTATEDIR}/gitea USER=${daemon_user} \
- GITEA_WORK_DIR=${TRUEPREFIX}/share/gitea \
- GITEA_CUSTOM=${LOCALSTATEDIR}/gitea/custom \
- ${daemon} ${daemon_flags}"
-}
-
rc_cmd $1
However, this does not seam to work. The daemon does not start anymore.
If i revert back to the old script it still works fine. Is there a need
to use this simplification? Or would it be valid to switch back to the
original version?
CC @ Pavel Korovin because he did most of the work on this amazing port!
Thanks so much and greetings
Leo
$ cat /etc/rc.conf.local
httpd_flags=
pkg_scripts=gitea
smtpd_flags=NO
$ dmesg
OpenBSD 6.8-current (GENERIC) #271: Mon Jan 18 13:58:09 MST 2021
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC
real mem = 2080227328 (1983MB)
avail mem = 2002026496 (1909MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.8 @ 0xf5b00 (9 entries)
bios0: vendor Hetzner version "2017" date 11/11/2017
bios0: Hetzner vServer
acpi0 at bios0: ACPI 1.0
acpi0: sleep states S5
acpi0: tables DSDT FACP APIC
acpi0: wakeup devices
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel Xeon Processor (Skylake, IBRS), 2100.36 MHz, 06-55-04
cpu0:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,FSGSBASE,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,AVX512F,AVX512DQ,RDSEED,ADX,SMAP,CLWB,AVX512CD,AVX512BW,AVX512VL,PKU,MD_CLEAR,IBRS,IBPB,SSBD,ARAT,XSAVEOPT,XSAVEC,XGETBV1,MELTDOWN
cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB
64b/line 16-way L2 cache
cpu0: ITLB 255 4KB entries direct-mapped, 255 4MB entries direct-mapped
cpu0: DTLB 255 4KB entries direct-mapped, 255 4MB entries direct-mapped
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 1000MHz
ioapic0 at mainbus0: apid 0 pa 0xfec0, version 11, 24 pins
acpiprt0 at acpi0: bus 0 (PCI0)
"ACPI0006" at acpi0 not configured
acpipci0 at acpi0 PCI0
acpicmos0 at acpi0
"PNP0A06" at acpi0 not configured
"PNP0A06" at acpi0 not configured
"PNP0A06" at acpi0 not configured
"QEMU0002" at acpi0 not configured
"ACPI0010" at acpi0 not configured
acpicpu0 at acpi0: C1(@1 halt!)
cpu0: using VERW MDS workaround
pvbus0 at mainbus0: KVM
pvclock0 at pvbus0
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel 82441FX" rev 0x02
pcib0 at pci0 dev 1 function 0 "Intel 82371SB ISA" rev 0x00
pciide0 at pci0 dev 1 function 1 "Intel 82371SB IDE" rev 0x00: DMA,
channel 0 wired to compatibility, channel 1 wired to compatibility
pciide0: channel 0 disabled (no drives)
atapiscsi0 at pciide0 channel 1 drive 0
scsibus1 at atapiscsi0: 2 targets
cd0 at scsibus1 targ 0 lun 0: removable
cd0(pciide0:1:0): using PIO mode 4, DMA mode 2
piixpm0 at pci0 dev 1 function 3 "Intel 82371AB Power" rev 0x03: apic
0 int 9
iic0 at piixpm0
vga1 at pci0 dev 2 function 0 "Bochs VGA" rev 0x02
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
virtio0 at pci0 dev 3 function 0 "Qumranet Virtio Network" rev 0x00
vio0 at virtio0: address 96:00:00:1d:c0:5a
virtio0: msix shared
virtio1 at pci0 dev 4 function 0 "Qumranet Virtio SCSI" rev 0x00
vioscsi0 at virtio1: qsize 128
scsibus2 at vioscsi0: 255 targets
sd0 at scsibus2 targ 0 lun 0:
sd0: 19532MB, 512 bytes/sector, 40001536 sectors, thin
virtio1: msix shared
virtio2 at pci0 dev 5 function 0 "Qumranet Virtio Memory Balloon" rev
0x00
viomb0 at virtio2
virtio2: apic 0 int 10
virtio3 at pci0 dev 6 function 0 "Qumranet Virtio Console" rev 0x00
virtio3: no matching child driver; not configured
xhci0 at
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 18:22:54 Modified files: audio/mp3splt-gtk: Makefile distinfo audio/mp3splt-gtk/pkg: PLIST Added files: audio/mp3splt-gtk/patches: patch-src_player_window_c patch-src_splitpoints_window_h Removed files: audio/mp3splt-gtk/patches: patch-src_Makefile_in Log message: update to mp3splt-gtk-0.9.2 and add an -fno-common fix from gentoo i did have a crash once, but was unable to repeat it after i enabled debug_packages and played about with wth-radio-humppa.mp3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 18:15:19 Modified files: audio/libmp3splt: Makefile distinfo audio/libmp3splt/patches: patch-plugins_Makefile_in patch-src_plugins_c audio/libmp3splt/pkg: PLIST Removed files: audio/libmp3splt/patches: patch-src_checks_c patch-src_mp3splt_c Log message: update to libmp3splt-0.9.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 18:15:23 Modified files: audio/mp3splt : Makefile distinfo audio/mp3splt/pkg: PLIST Log message: update to mp3splt-2.6.2
Re: PostgreSQL 13.1 Upgrade
On 02/01 07:24, Daniel Jakots wrote: > Hi Pierre-Emmanuel and Jeremy, > > Is there anything blocking the update? Nothing for me. pea@ can handle the commits whenever he sees fit, or if he gives his OK, I can handle the commits. Thanks, Jeremy
Re: PostgreSQL 13.1 Upgrade
Hi Pierre-Emmanuel and Jeremy, Is there anything blocking the update? Cheers, Daniel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 17:23:19 Modified files: audio/py-eyed3 : Makefile distinfo audio/py-eyed3/pkg: PLIST Log message: update to eyeD3-0.9.6
Re: Collision in py-sip-4.19.19p0v0->4.19.24v0
On 2021/02/01 23:26, Mikolaj Kucharski wrote: > Hi, > > This happens for a while, but recently I don't have good chunk of time > to dive and provide a diff. Decided to finally sent an email. > > (I do have some not committed port on my machine) > > # pkg_add -Dupdate -Dupdatedepends -Drepair -u -U -V > quirks-3.524 signed on 2021-01-30T16:42:18Z > Collision in py-sip-4.19.19p0v0->4.19.24v0: the following files already exist > /usr/local/lib/python2.7/site-packages/PyQt5/sip.pyi > (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0) > /usr/local/lib/python2.7/site-packages/PyQt5/sip.so > (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0) > Can't install > py-qt5-5.13.2p1+py3-sip-qt5-5.5.0->py-qt5-5.15.2+py3-sip-qt5-5.5.0p0: can't > resolve py-sip-4.19.24v0 > Couldn't find updates for github-cli-1.5.0 promplot-0.17.0 py-qt5-5.13.2p1 > py-sip-4.19.19p0v0 py-sip-qt5-4.19.19p0 py3-hvac-0.10.6pre0 py3-sip-qt5-5.5.0 > Couldn't install py-qt5-5.15.2 py-sip-4.19.24v0 py3-sip-qt5-5.5.0p0 > > -- > Regards, > Mikolaj > I am a bit confused about how the two ports py-sip and py-sip-qt5 are setup with the most recent update. It seems to me like they are the wrong way round..
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/01 16:58:30 Modified files: databases/db/v3: Makefile databases/db/v3/patches: patch-tcl_tcl_db_pkg_c Added files: databases/db/v3/patches: patch-include_tcl_db_h Log message: databases/db/v3: fix for -fno-common
New: security/ruby-argon2 2.0.3
This is a new port for ruby-argon2, which is a Ruby wrapper for the
Argon2 password hash algorithm. It requires an update for ruby-ffi
(see diff below) as well as a new port for ruby-ffi-compiler (in
attached tarball).
Tested on amd64. OKs to import ruby-argon2 and ruby-ffi-compiler?
Thanks,
Jeremy
Index: Makefile
===
RCS file: /cvs/ports/devel/ruby-ffi/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile3 Feb 2020 19:04:05 - 1.25
+++ Makefile1 Feb 2021 22:35:59 -
@@ -2,7 +2,7 @@
COMMENT = cross-platform dynamic library loading for ruby
-DISTNAME = ffi-1.12.1
+DISTNAME = ffi-1.14.2
CATEGORIES = devel
HOMEPAGE= https://github.com/ffi/ffi
Index: distinfo
===
RCS file: /cvs/ports/devel/ruby-ffi/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo3 Feb 2020 19:04:05 - 1.9
+++ distinfo1 Feb 2021 22:36:19 -
@@ -1,2 +1,2 @@
-SHA256 (ffi-1.12.1.gem) = 0WZ0rgAnmnru1wX6hUr31yHPWwpKv2qALzBun4fsW0Q=
-SIZE (ffi-1.12.1.gem) = 896000
+SHA256 (ffi-1.14.2.gem) = fc4/4PBHpvd00UHUZnydI+4oyNxy++9hlNyjmICPD5Y=
+SIZE (ffi-1.14.2.gem) = 908288
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ruby-ffi/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 3 Feb 2020 19:04:05 - 1.10
+++ pkg/PLIST 1 Feb 2021 22:39:38 -
@@ -1,11 +1,6 @@
@comment $OpenBSD: PLIST,v 1.10 2020/02/03 19:04:05 jeremy Exp $
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
-${GEM_LIB}/gems/${DISTNAME}/.appveyor.yml
-${GEM_LIB}/gems/${DISTNAME}/.gitignore
-${GEM_LIB}/gems/${DISTNAME}/.gitmodules
-${GEM_LIB}/gems/${DISTNAME}/.travis.yml
-${GEM_LIB}/gems/${DISTNAME}/.yardopts
${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
${GEM_LIB}/gems/${DISTNAME}/COPYING
${GEM_LIB}/gems/${DISTNAME}/Gemfile
@@ -17,6 +12,7 @@ ${GEM_LIB}/gems/${DISTNAME}/ffi.gemspec
${GEM_LIB}/gems/${DISTNAME}/lib/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/ffi/abstract_memory.rb
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/autopointer.rb
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/buffer.rb
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/callback.rb
@@ -30,12 +26,16 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/ffi/mana
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/memorypointer.rb
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-darwin/
+${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-darwin/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-freebsd/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-freebsd/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-freebsd12/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-freebsd12/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-linux/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-linux/types.conf
+${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-openbsd/
+${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/aarch64-openbsd/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/arm-freebsd/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/arm-freebsd/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/arm-freebsd12/
@@ -86,6 +86,8 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/ffi/plat
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/powerpc-darwin/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/powerpc-linux/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/powerpc-linux/types.conf
+${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/powerpc-openbsd/
+${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/powerpc-openbsd/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/powerpc64-linux/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/powerpc64-linux/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/s390-linux/
@@ -98,6 +100,8 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/ffi/plat
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/sparc-solaris/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/sparc64-linux/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/sparc64-linux/types.conf
+${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/sparcv9-openbsd/
+${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/sparcv9-openbsd/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/sparcv9-solaris/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/sparcv9-solaris/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/x86_64-cygwin/
@@ -110,8 +114,12 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/ffi/plat
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/x86_64-freebsd/types.conf
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/x86_64-freebsd12/
${GEM_LIB}/gems/${DISTNAME}/lib/ffi/platform/x86_64-freebsd12/types.conf
Re: replace security/stegcracker with security/stegseek
On 2021/02/01 23:20, Sebastian Reitenbach wrote:
> Hi Stuart,
>
> Am Montag, Februar 01, 2021 17:20 CET, schrieb Stuart Henderson
> :
>
>
> >
> > - EPOCH=0 on stegseek because the version number is "higher" than that
> > of stegcracker
> >
> > - quirks $stem_extensions entry to rename the package
> >
> > - @pkgpath security/stegcracker in stegseek/pkg/PLIST
> >
>
> The stem_extensions in the quirks were my missing link.
> I also had to add @conflict marker, so in order to remove stegcracker when
> updating.
> Without it, it recognized that it has to update it, but in the end kept both
> installed.
@conflict is not needed. I think you tested with "make update" which
is only best-efforts, and doesn't cover complex update cases.
To test upgrade paths, install the old packages, place the new packages
and new quirks package on their own in a directory (say /tmp/test), and
run "env PKG_PATH=/tmp/test TRUSTED_PKG_PATH=/tmp/test pkg_add -u".
It correctly updates and removes the old package.
(I should put that paragraph in an editor macro ;)
> Also incorporated your patch you had in the other mail. Additionally had to
> include security/mhash
> in LIB_DEPENDS, as it also links against libmhash.
>
> Below the quirks that made the update work for me, and the updated tarball of
> the stegseek port attached.
>
> Now OK?
I missed it before but,
- it's forcing -O3 via src/CMakeLists.txt, it doesn't seem to allow
overrides so I think that will need patching
- there are C++ libraries in WANTLIB without setting COMPILER
so please set COMPILER=base-clang ports-gcc (it doesn't build with base-gcc)
portcheck picks up this problem
> cheers,
> Sebastian
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1146
> diff -u -r1.1146 Makefile
> --- Makefile 1 Feb 2021 14:07:52 - 1.1146
> +++ Makefile 1 Feb 2021 22:15:28 -
> @@ -5,7 +5,7 @@
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-3.534
> +PKGNAME =quirks-3.535
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1162
> diff -u -r1.1162 Quirks.pm
> --- files/Quirks.pm 1 Feb 2021 14:07:52 - 1.1162
> +++ files/Quirks.pm 1 Feb 2021 22:15:29 -
> @@ -541,6 +541,7 @@
> 'icinga-web' => 'icinga-web2',
> 'icinga-cgi' => 'icinga-web2',
> 'icinga-idoutils' => 'icinga2-ido-mysql',
> + 'stegcracker' => 'stegseek',
> };
>
> my $obsolete_reason = {
Collision in py-sip-4.19.19p0v0->4.19.24v0
Hi, This happens for a while, but recently I don't have good chunk of time to dive and provide a diff. Decided to finally sent an email. (I do have some not committed port on my machine) # pkg_add -Dupdate -Dupdatedepends -Drepair -u -U -V quirks-3.524 signed on 2021-01-30T16:42:18Z Collision in py-sip-4.19.19p0v0->4.19.24v0: the following files already exist /usr/local/lib/python2.7/site-packages/PyQt5/sip.pyi (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0) /usr/local/lib/python2.7/site-packages/PyQt5/sip.so (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0) Can't install py-qt5-5.13.2p1+py3-sip-qt5-5.5.0->py-qt5-5.15.2+py3-sip-qt5-5.5.0p0: can't resolve py-sip-4.19.24v0 Couldn't find updates for github-cli-1.5.0 promplot-0.17.0 py-qt5-5.13.2p1 py-sip-4.19.19p0v0 py-sip-qt5-4.19.19p0 py3-hvac-0.10.6pre0 py3-sip-qt5-5.5.0 Couldn't install py-qt5-5.15.2 py-sip-4.19.24v0 py3-sip-qt5-5.5.0p0 -- Regards, Mikolaj
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/01 16:02:13 Modified files: x11/menu-cache : Makefile Added files: x11/menu-cache/patches: patch-menu-cache-gen_menu-tags_h Log message: x11/menu-cache: fix build with -fno-common No recent upstream activity, but this is a straightforward fix for the accidental double definition of global variables. ok sthen@ ajacoutot@
mail/alpine: update to 2.24, fixing -fno-common
Someone who uses this, please test, alpine failing knocks out nearly
300 packages/subpackages from a build with -fno-common default (i.e.
for the clang11 update).
I know there are some users because there were reports of libressl
problems recently :)
I moved the XXX to a non-XXX comment near MASTER_SITES, the releases
are cut from that repo anyway.
Diff also at https://junkpile.org/alpine-2.24.diff
Index: Makefile
===
RCS file: /cvs/ports/mail/alpine/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile13 Sep 2020 08:05:08 - 1.48
+++ Makefile1 Feb 2021 22:42:24 -
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.48 2020/09/13 08:05:08 tb Exp $
-# XXX consider moving to https://repo.or.cz/alpine.git
-
COMMENT-main= UW e-mail client
COMMENT-c-client= UW c-client mail access routines
COMMENT-imap= UW IMAP4rev1/POP2/POP3 mail servers
@@ -10,7 +8,7 @@ COMMENT-pico= UW text editor
COMMENT-pilot= UW file system navigator
FIX_EXTRACT_PERMISSIONS = Yes
-V= 2.21
+V= 2.24
DISTNAME= alpine-${V}
EXTRACT_SUFX= .tar.xz
@@ -28,9 +26,8 @@ PKGNAME-mailutil= mailutil-uw-${V}
PKGNAME-pico= pico-${PICO_V}
PKGNAME-pilot= pilot-${PILOT_V}
-REVISION= 5
-REVISION-pico= 20
-REVISION-pilot=20
+REVISION-pico= 21
+REVISION-pilot=21
EPOCH-c-client=0
EPOCH-imap=0
@@ -42,14 +39,16 @@ CATEGORIES-c-client=devel mail
CATEGORIES-pico= editors
CATEGORIES-pilot= sysutils
-HOMEPAGE= http://alpine.x10host.com/
+HOMEPAGE= https://alpine.x10host.com/
# Apache 2.0
PERMIT_PACKAGE=Yes
-MASTER_SITES= http://alpine.x10host.com/alpine/release/
+# repo at https://repo.or.cz/alpine.git
+MASTER_SITES= https://alpine.x10host.com/alpine/release/src/
MULTI_PACKAGES=-main -c-client -imap -mailutil -pico -pilot
+DEBUG_PACKAGES=${BUILD_PACKAGES}
WANTLIB += c crypto iconv intl curses ssl
@@ -82,6 +81,7 @@ CONFIGURE_ARGS= --with-system-pinerc=${
--with-interactive-spellcheck=aspell \
--with-c-client-target=bso \
--with-debug-level=0 \
+ --with-bundled-tools \
--without-ldap \
--without-tcl \
--without-npa \
Index: distinfo
===
RCS file: /cvs/ports/mail/alpine/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo25 Apr 2017 09:20:53 - 1.8
+++ distinfo1 Feb 2021 22:42:24 -
@@ -1,2 +1,2 @@
-SHA256 (alpine-2.21.tar.xz) = YDC2iBuBaFRnVqs6XkNijY1WRTmwR2V44od3VXOndDg=
-SIZE (alpine-2.21.tar.xz) = 4720856
+SHA256 (alpine-2.24.tar.xz) = ZRqf+gop4rZGoKbg1aLIxQ8noHomphZAt8eD0G0KvO8=
+SIZE (alpine-2.24.tar.xz) = 7341676
Index: patches/patch-configure
===
RCS file: /cvs/ports/mail/alpine/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure
--- patches/patch-configure 25 Apr 2017 09:20:53 - 1.9
+++ patches/patch-configure 1 Feb 2021 22:42:24 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.9 2017/04/25 09:20:53 ajacoutot Exp $
configure.orig Mon Feb 6 01:06:22 2017
-+++ configure Tue Apr 25 11:10:08 2017
-@@ -13778,6 +13778,7 @@ fi
+Index: configure
+--- configure.orig
configure
+@@ -13714,6 +13714,7 @@ fi
fi
@@ -9,7 +10,7 @@ $OpenBSD: patch-configure,v 1.9 2017/04/
-@@ -14923,6 +14924,7 @@ $as_echo "$ac_res" >&6; }
+@@ -14859,6 +14860,7 @@ $as_echo "$ac_res" >&6; }
INCINTL=
fi
Index: patches/patch-doc_man1_alpine_1
===
RCS file: /cvs/ports/mail/alpine/patches/patch-doc_man1_alpine_1,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_man1_alpine_1
--- patches/patch-doc_man1_alpine_1 25 Apr 2017 09:20:53 - 1.1
+++ patches/patch-doc_man1_alpine_1 1 Feb 2021 22:42:24 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-doc_man1_alpine_1,v 1.1 2017/04/25 09:20:53 ajacoutot Exp $
doc/man1/alpine.1.orig Mon Feb 6 01:06:22 2017
-+++ doc/man1/alpine.1 Tue Apr 25 11:13:00 2017
-@@ -301,7 +301,7 @@ uses the following environment variables:
+Index: doc/man1/alpine.1
+--- doc/man1/alpine.1.orig
doc/man1/alpine.1
+@@ -318,7 +318,7 @@ uses the following environment variables:
.if n .ta 2.8i
.if t .ta 2.1i
@@ -10,7 +11,7 @@ $OpenBSD: patch-doc_man1_alpine_1,v 1.1
.br
~/mailDefault directory for mail folders.
.br
-@@ -337,7 +337,7 @@ uses the following environment variables:
+@@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/01 15:46:36 Modified files: devel/libmtp : Makefile distinfo devel/libmtp/pkg: PLIST Log message: devel/libmtp: update to 1.1.18, which includes a -fno-common fix ok sthen@
qstat update to git head
Quite a number of things have landed in qstat git since the last release in 2014, including fix for GCC10/clang11 which use -fno-common by default which we're trying to prepare for now. OK with this update? Index: Makefile === RCS file: /cvs/ports/games/qstat/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile12 Jul 2019 20:46:23 - 1.12 +++ Makefile1 Feb 2021 22:19:08 - @@ -4,7 +4,8 @@ COMMENT=displays the status of multi-pl GH_ACCOUNT=multiplay GH_PROJECT=qstat -GH_TAGNAME=v2.14 +GH_COMMIT= 502167b108b7d40daacfc75c2b5c9eb4c7714f2b +DISTNAME= qstat-2.14pl20201129 CATEGORIES=games MAINTAINER=Tom Murphy @@ -16,8 +17,8 @@ WANTLIB= c CONFIGURE_STYLE = autoreconf -AUTOCONF_VERSION = 2.61 -AUTOMAKE_VERSION = 1.9 +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.16 AUTORECONF = ./autogen.sh post-install: Index: distinfo === RCS file: /cvs/ports/games/qstat/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo18 Feb 2018 16:07:39 - 1.6 +++ distinfo1 Feb 2021 22:19:08 - @@ -1,2 +1,2 @@ -SHA256 (qstat-2.14.tar.gz) = rpBrdNTM6AV7WiZbdoWRAdqBBMKgfAXxGlH3yfAz74s= -SIZE (qstat-2.14.tar.gz) = 210440 +SHA256 (qstat-2.14pl20201129-502167b1.tar.gz) = qFHwQYPS9GoqKc9ty/hbmRCQIuxCPJuQ0h8884r3KAA= +SIZE (qstat-2.14pl20201129-502167b1.tar.gz) = 231705 Index: patches/patch-utils_h === RCS file: patches/patch-utils_h diff -N patches/patch-utils_h --- patches/patch-utils_h 18 Feb 2018 16:07:39 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-utils_h,v 1.1 2018/02/18 16:07:39 awolk Exp $ - -Index: utils.h utils.h.orig -+++ utils.h -@@ -8,7 +8,7 @@ - #define QSTAT_UTILS_H - - // BSD has strnstr --#if defined(__FreeBSD__) || defined(__MidnightBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__MidnightBSD__) - #ifndef HAVE_STRNSTR - #define HAVE_STRNSTR 1 - #endif /* HAVE_STRNSTR */
Re: replace security/stegcracker with security/stegseek
Hi Stuart,
Am Montag, Februar 01, 2021 17:20 CET, schrieb Stuart Henderson
:
>
> - EPOCH=0 on stegseek because the version number is "higher" than that
> of stegcracker
>
> - quirks $stem_extensions entry to rename the package
>
> - @pkgpath security/stegcracker in stegseek/pkg/PLIST
>
The stem_extensions in the quirks were my missing link.
I also had to add @conflict marker, so in order to remove stegcracker when
updating.
Without it, it recognized that it has to update it, but in the end kept both
installed.
Also incorporated your patch you had in the other mail. Additionally had to
include security/mhash
in LIB_DEPENDS, as it also links against libmhash.
Below the quirks that made the update work for me, and the updated tarball of
the stegseek port attached.
Now OK?
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1146
diff -u -r1.1146 Makefile
--- Makefile1 Feb 2021 14:07:52 - 1.1146
+++ Makefile1 Feb 2021 22:15:28 -
@@ -5,7 +5,7 @@
DISTFILES =
# API.rev
-PKGNAME = quirks-3.534
+PKGNAME = quirks-3.535
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1162
diff -u -r1.1162 Quirks.pm
--- files/Quirks.pm 1 Feb 2021 14:07:52 - 1.1162
+++ files/Quirks.pm 1 Feb 2021 22:15:29 -
@@ -541,6 +541,7 @@
'icinga-web' => 'icinga-web2',
'icinga-cgi' => 'icinga-web2',
'icinga-idoutils' => 'icinga2-ido-mysql',
+ 'stegcracker' => 'stegseek',
};
my $obsolete_reason = {
stegseek.tar.gz
Description: application/gzip
Re: Build failures from -fno-common (2021-02-01)
On 2021/02/01 22:38, Christian Weisgerber wrote: > Here is an updated list of ports that fail to build with -fno-common. Some of these have been fixed since the build was started, so if anyone is looking at fixing them, be sure to cvs up before spending time on them. > astro/wmglobe - ports@openbsd.org > astro/wmmoonclock - ports@openbsd.org > astro/wmspaceweather- ports@openbsd.org > astro/wmsun - ports@openbsd.org > audio/audacity UPDATEports@openbsd.org > audio/gimmix- ports@openbsd.org > audio/gtkpodUPDATEports@openbsd.org > audio/mp3splt-gtk UPDATEports@openbsd.org > audio/nspmod- ports@openbsd.org > audio/scmpc - ports@openbsd.org > audio/wmmp3 - ports@openbsd.org > audio/wmtune- ports@openbsd.org > audio/xhippo- ports@openbsd.org > audio/ympd - ports@openbsd.org > benchmarks/netperf UPDATEports@openbsd.org > cad/geda-gaf- e...@openbsd.org > cad/graywolf- jus...@atlantide.mooo.com > comms/birda - ports@openbsd.org > comms/efax - i...@openbsd.org > comms/jpilot- ports@openbsd.org > comms/lcdproc UPDATEports@openbsd.org > comms/minicom - ports@openbsd.org > comms/scmxx UPDATEports@openbsd.org > comms/seyon - ports@openbsd.org > comms/xastir- ports@openbsd.org > comms/xdx - ports@openbsd.org > databases/citus UPDATEports@openbsd.org > databases/db/v3 - ports@openbsd.org > databases/pgpoolUPDATEp...@openbsd.org > devel/arm-none-eabi/gdb UPDATEports@openbsd.org > devel/avr32/binutils- ports@openbsd.org > devel/blame - ports@openbsd.org > devel/boehm-gc UPDATEports@openbsd.org > devel/distccUPDATEports@openbsd.org > devel/libgcrootsUPDATEports@openbsd.org > devel/libmtpUPDATEports@openbsd.org > devel/libowfat - j.klem...@wemelug.de > devel/mingw - p...@irofti.net > devel/remakeUPDATEports@openbsd.org > devel/ti-msp430gcc - ports@openbsd.org > editors/beaver - ports@openbsd.org > editors/hexcurse- ports@openbsd.org > editors/hnb - ports@openbsd.org > editors/tea UPDATEports@openbsd.org > education/gamgi UPDATEports@openbsd.org > emulators/advancemame - ports@openbsd.org > emulators/coldfire - ports@openbsd.org > emulators/fuse UPDATEports@openbsd.org > emulators/libretro-genesis-plus-gx - ports@openbsd.org > emulators/pcsxr - ports@openbsd.org > emulators/simh - ports@openbsd.org > games/angband UPDATEe...@openbsd.org > games/atomix- ports@openbsd.org > games/clonekeen - e...@openbsd.org > games/corewars - ports@openbsd.org > games/egobooUPDATEports@openbsd.org > games/freeblocks- ports@openbsd.org > games/freedroid - ports@openbsd.org > games/freedroidrpg - ports@openbsd.org > games/gnugo - ports@openbsd.org > games/gnurobbo - ports@openbsd.org > games/gnushogi - ports@openbsd.org > games/heroes- anth...@anjbe.name > games/jumpnbump - bcal...@openbsd.org > games/lincity - ports@openbsd.org > games/megaglest/base- ports@openbsd.org > games/mirrormagic - ports@openbsd.org > games/nethack/3.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 15:12:27 Modified files: devel/libgcroots: Makefile distinfo devel/libgcroots/patches: patch-include_private_gcconfig_h devel/libgcroots/pkg: PLIST Log message: update to libgcroots-0.3.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 15:01:16 Modified files: net/isc-dhcp : Makefile net/isc-dhcp/patches: patch-keama_keama_c patch-keama_keama_h Added files: net/isc-dhcp/patches: patch-client_dhclient_c patch-common_discover_c patch-relay_dhcrelay_c patch-server_mdb6_c patch-server_mdb_c Log message: isc-dhcp: -fno-common fixes from upstream
x11/menu-cache: fix for -fno-common
Fix build with -fno-common.
The header file erroneously defines the global variables instead of
simply declaring them.
No recent upstream activity.
ok?
Index: Makefile
===
RCS file: /cvs/ports/x11/menu-cache/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile12 Jul 2019 20:51:17 - 1.11
+++ Makefile1 Feb 2021 21:46:32 -
@@ -4,7 +4,7 @@ COMMENT=caching mechanism for freedesk
DISTNAME= menu-cache-1.1.0
EXTRACT_SUFX= .tar.xz
-REVISION= 0
+REVISION= 1
SHARED_LIBS += menu-cache 1.0 # 4.1
Index: patches/patch-menu-cache-gen_menu-tags_h
===
RCS file: patches/patch-menu-cache-gen_menu-tags_h
diff -N patches/patch-menu-cache-gen_menu-tags_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-menu-cache-gen_menu-tags_h1 Feb 2021 21:46:32 -
@@ -0,0 +1,110 @@
+$OpenBSD$
+
+Index: menu-cache-gen/menu-tags.h
+--- menu-cache-gen/menu-tags.h.orig
menu-cache-gen/menu-tags.h
+@@ -22,38 +22,38 @@
+ #include
+ #include
+
+-FmXmlFileTag menuTag_Menu;
+-FmXmlFileTag menuTag_AppDir;
+-FmXmlFileTag menuTag_DefaultAppDirs;
+-FmXmlFileTag menuTag_DirectoryDir;
+-FmXmlFileTag menuTag_DefaultDirectoryDirs;
+-FmXmlFileTag menuTag_Include;
+-FmXmlFileTag menuTag_Exclude;
+-FmXmlFileTag menuTag_Filename;
+-FmXmlFileTag menuTag_Or;
+-FmXmlFileTag menuTag_And;
+-FmXmlFileTag menuTag_Not;
+-FmXmlFileTag menuTag_Category;
+-FmXmlFileTag menuTag_MergeFile;
+-FmXmlFileTag menuTag_MergeDir;
+-FmXmlFileTag menuTag_DefaultMergeDirs;
+-FmXmlFileTag menuTag_Directory;
+-FmXmlFileTag menuTag_Name;
+-FmXmlFileTag menuTag_Deleted;
+-FmXmlFileTag menuTag_NotDeleted;
+-FmXmlFileTag menuTag_OnlyUnallocated;
+-FmXmlFileTag menuTag_NotOnlyUnallocated;
+-FmXmlFileTag menuTag_All;
+-FmXmlFileTag menuTag_LegacyDir;
+-FmXmlFileTag menuTag_KDELegacyDirs;
+-FmXmlFileTag menuTag_Move;
+-FmXmlFileTag menuTag_Old;
+-FmXmlFileTag menuTag_New;
+-FmXmlFileTag menuTag_Layout;
+-FmXmlFileTag menuTag_DefaultLayout;
+-FmXmlFileTag menuTag_Menuname;
+-FmXmlFileTag menuTag_Separator;
+-FmXmlFileTag menuTag_Merge;
++extern FmXmlFileTag menuTag_Menu;
++extern FmXmlFileTag menuTag_AppDir;
++extern FmXmlFileTag menuTag_DefaultAppDirs;
++extern FmXmlFileTag menuTag_DirectoryDir;
++extern FmXmlFileTag menuTag_DefaultDirectoryDirs;
++extern FmXmlFileTag menuTag_Include;
++extern FmXmlFileTag menuTag_Exclude;
++extern FmXmlFileTag menuTag_Filename;
++extern FmXmlFileTag menuTag_Or;
++extern FmXmlFileTag menuTag_And;
++extern FmXmlFileTag menuTag_Not;
++extern FmXmlFileTag menuTag_Category;
++extern FmXmlFileTag menuTag_MergeFile;
++extern FmXmlFileTag menuTag_MergeDir;
++extern FmXmlFileTag menuTag_DefaultMergeDirs;
++extern FmXmlFileTag menuTag_Directory;
++extern FmXmlFileTag menuTag_Name;
++extern FmXmlFileTag menuTag_Deleted;
++extern FmXmlFileTag menuTag_NotDeleted;
++extern FmXmlFileTag menuTag_OnlyUnallocated;
++extern FmXmlFileTag menuTag_NotOnlyUnallocated;
++extern FmXmlFileTag menuTag_All;
++extern FmXmlFileTag menuTag_LegacyDir;
++extern FmXmlFileTag menuTag_KDELegacyDirs;
++extern FmXmlFileTag menuTag_Move;
++extern FmXmlFileTag menuTag_Old;
++extern FmXmlFileTag menuTag_New;
++extern FmXmlFileTag menuTag_Layout;
++extern FmXmlFileTag menuTag_DefaultLayout;
++extern FmXmlFileTag menuTag_Menuname;
++extern FmXmlFileTag menuTag_Separator;
++extern FmXmlFileTag menuTag_Merge;
+
+ typedef enum {
+ MERGE_NONE, /* starting value */
+@@ -152,19 +152,19 @@ typedef struct {
+ } MenuRule;
+
+ /* requested language(s) */
+-char **languages;
++extern char **languages;
+
+ /* list of menu files to monitor */
+-GSList *MenuFiles;
++extern GSList *MenuFiles;
+
+ /* list of menu dirs to monitor */
+-GSList *MenuDirs;
++extern GSList *MenuDirs;
+
+ /* list of available app dirs */
+-GSList *AppDirs;
++extern GSList *AppDirs;
+
+ /* list of available dir dirs */
+-GSList *DirDirs;
++extern GSList *DirDirs;
+
+ /* parse and merge menu files */
+ MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError
**error);
+@@ -177,7 +177,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char
+ void _free_layout_items(GList *data);
+
+ /* verbosity level */
+-gint verbose;
++extern gint verbose;
+
+ #define DBG if (verbose) g_debug
+ #define VDBG if (verbose > 1) g_debug
--
Christian "naddy" Weisgerber na...@mips.inka.de
Re: [NEW] devel/py-importlib_resources
On 2021/02/01 03:41, Dimitri Karamazov wrote: > Information for inst:py3-importlib_resources-5.1.0 > > Comment: > backport of the importlib.resources module > > Required by: > qutebrowser-2.0.0 > > Description: > importlib_resources is a backport of Python standard library > importlib.resources > module for older Pythons. Users of Python 3.9 and beyond should use the > standard > library module, since for these versions, importlib_resources just delegates > to > that module. > > Maintainer: Dimitri Karamazov > > WWW: https://pypi.python.org/pypi/importlib_resources > > Any comments/OK's? Please add a comment like "# remove when switching to Python 3.9" to the makefile and rewrap DESCR so it isn't hard against column 80, make test is very broken here, it's not a show-stopper if the port otherwise works but please mention it in makefile (unless it can be fixed :) Then it's OK sthen.
Build failures from -fno-common (2021-02-01)
Here is an updated list of ports that fail to build with -fno-common. astro/wmglobe - ports@openbsd.org astro/wmmoonclock - ports@openbsd.org astro/wmspaceweather- ports@openbsd.org astro/wmsun - ports@openbsd.org audio/audacity UPDATEports@openbsd.org audio/gimmix- ports@openbsd.org audio/gtkpodUPDATEports@openbsd.org audio/mp3splt-gtk UPDATEports@openbsd.org audio/nspmod- ports@openbsd.org audio/scmpc - ports@openbsd.org audio/wmmp3 - ports@openbsd.org audio/wmtune- ports@openbsd.org audio/xhippo- ports@openbsd.org audio/ympd - ports@openbsd.org benchmarks/netperf UPDATEports@openbsd.org cad/geda-gaf- e...@openbsd.org cad/graywolf- jus...@atlantide.mooo.com comms/birda - ports@openbsd.org comms/efax - i...@openbsd.org comms/jpilot- ports@openbsd.org comms/lcdproc UPDATEports@openbsd.org comms/minicom - ports@openbsd.org comms/scmxx UPDATEports@openbsd.org comms/seyon - ports@openbsd.org comms/xastir- ports@openbsd.org comms/xdx - ports@openbsd.org databases/citus UPDATEports@openbsd.org databases/db/v3 - ports@openbsd.org databases/pgpoolUPDATEp...@openbsd.org devel/arm-none-eabi/gdb UPDATEports@openbsd.org devel/avr32/binutils- ports@openbsd.org devel/blame - ports@openbsd.org devel/boehm-gc UPDATEports@openbsd.org devel/distccUPDATEports@openbsd.org devel/libgcrootsUPDATEports@openbsd.org devel/libmtpUPDATEports@openbsd.org devel/libowfat - j.klem...@wemelug.de devel/mingw - p...@irofti.net devel/remakeUPDATEports@openbsd.org devel/ti-msp430gcc - ports@openbsd.org editors/beaver - ports@openbsd.org editors/hexcurse- ports@openbsd.org editors/hnb - ports@openbsd.org editors/tea UPDATEports@openbsd.org education/gamgi UPDATEports@openbsd.org emulators/advancemame - ports@openbsd.org emulators/coldfire - ports@openbsd.org emulators/fuse UPDATEports@openbsd.org emulators/libretro-genesis-plus-gx - ports@openbsd.org emulators/pcsxr - ports@openbsd.org emulators/simh - ports@openbsd.org games/angband UPDATEe...@openbsd.org games/atomix- ports@openbsd.org games/clonekeen - e...@openbsd.org games/corewars - ports@openbsd.org games/egobooUPDATEports@openbsd.org games/freeblocks- ports@openbsd.org games/freedroid - ports@openbsd.org games/freedroidrpg - ports@openbsd.org games/gnugo - ports@openbsd.org games/gnurobbo - ports@openbsd.org games/gnushogi - ports@openbsd.org games/heroes- anth...@anjbe.name games/jumpnbump - bcal...@openbsd.org games/lincity - ports@openbsd.org games/megaglest/base- ports@openbsd.org games/mirrormagic - ports@openbsd.org games/nethack/3.6 - es...@openbsd.org games/oolite- n...@openbsd.org games/openjk- bcal...@openbsd.org games/opentyrian- ports@openbsd.org games/pacman-arena - ports@openbsd.org games/prboom
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 14:40:10 Modified files: devel/py-setuptools_scm: Makefile distinfo devel/py-setuptools_scm/pkg: PLIST Log message: update to setuptools_scm-3.4.1, from deserter666 at danwin1210.me, ok kn tweak from me: add TDEP on py-toml for py3 flavour (it's an optional run dep and used in tests; py2 flavour of py-toml was removed already)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 14:27:49 Modified files: x11/qt5/qtbase : Makefile Added files: x11/qt5/qtbase/patches: patch-src_corelib_io_qiodevice_cpp Log message: qtbase5: backport upstream fix; "Fixes a regression in Qt 5.15 causing QByteArray's that are returned by QIODevice::readLine() to consume large amounts of memory." ok rsadowski likely to fix, among other things, redonculous memory use in lconvert, as noticed in builds (and build failures) of astro/stellarium
Re: Update: devel/libmtp 1.1.18, -fno-common fix
On 2021/02/01 21:40, Christian Weisgerber wrote:
> This updates devel/libmtp to the latest release 1.1.18, which also
> includes a -fno-common fix. No major changes, one function was added.
>
> No idea how to test actual functionality.
>
> OK?
It works as well as the previous version did on my phone (which is,
not very well: it fetches some information, hangs at the end of file
listing transfers, but is unable to fetch actual files).
So, OK I guess!
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libmtp/Makefile,v
> retrieving revision 1.42
> diff -u -p -r1.42 Makefile
> --- Makefile 12 Jul 2019 20:44:39 - 1.42
> +++ Makefile 1 Feb 2021 20:35:57 -
> @@ -2,10 +2,10 @@
>
> COMMENT= Media Transfer Protocol (MTP) implementation
>
> -DISTNAME=libmtp-1.1.15
> +DISTNAME=libmtp-1.1.18
> CATEGORIES= devel
>
> -SHARED_LIBS += mtp 7.0 # 12.0
> +SHARED_LIBS += mtp 7.1 # 13.0
>
> HOMEPAGE=http://libmtp.sourceforge.net/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/libmtp/distinfo,v
> retrieving revision 1.18
> diff -u -p -r1.18 distinfo
> --- distinfo 28 Apr 2018 13:05:45 - 1.18
> +++ distinfo 1 Feb 2021 20:35:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (libmtp-1.1.15.tar.gz) = 0ECQC0Z1fjEbH7O/qMBdsJyLaBHgRLzoyIyfP206MCE=
> -SIZE (libmtp-1.1.15.tar.gz) = 805983
> +SHA256 (libmtp-1.1.18.tar.gz) = coD+UMBEyBigZmf0XqvKiE3qsxk8qoaC4LWB6EeigfA=
> +SIZE (libmtp-1.1.18.tar.gz) = 832463
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/libmtp/pkg/PLIST,v
> retrieving revision 1.17
> diff -u -p -r1.17 PLIST
> --- pkg/PLIST 31 Jan 2017 10:01:50 - 1.17
> +++ pkg/PLIST 1 Feb 2021 20:35:57 -
> @@ -21,7 +21,7 @@ bin/mtp-sendtr
> @bin bin/mtp-tracks
> @bin bin/mtp-trexist
> include/libmtp.h
> -lib/libmtp.a
> +@static-lib lib/libmtp.a
> lib/libmtp.la
> @lib lib/libmtp.so.${LIBmtp_VERSION}
> lib/pkgconfig/libmtp.pc
> --
> Christian "naddy" Weisgerber na...@mips.inka.de
>
Update: devel/libmtp 1.1.18, -fno-common fix
This updates devel/libmtp to the latest release 1.1.18, which also
includes a -fno-common fix. No major changes, one function was added.
No idea how to test actual functionality.
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/libmtp/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile12 Jul 2019 20:44:39 - 1.42
+++ Makefile1 Feb 2021 20:35:57 -
@@ -2,10 +2,10 @@
COMMENT= Media Transfer Protocol (MTP) implementation
-DISTNAME= libmtp-1.1.15
+DISTNAME= libmtp-1.1.18
CATEGORIES=devel
-SHARED_LIBS += mtp 7.0 # 12.0
+SHARED_LIBS += mtp 7.1 # 13.0
HOMEPAGE= http://libmtp.sourceforge.net/
Index: distinfo
===
RCS file: /cvs/ports/devel/libmtp/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo28 Apr 2018 13:05:45 - 1.18
+++ distinfo1 Feb 2021 20:35:57 -
@@ -1,2 +1,2 @@
-SHA256 (libmtp-1.1.15.tar.gz) = 0ECQC0Z1fjEbH7O/qMBdsJyLaBHgRLzoyIyfP206MCE=
-SIZE (libmtp-1.1.15.tar.gz) = 805983
+SHA256 (libmtp-1.1.18.tar.gz) = coD+UMBEyBigZmf0XqvKiE3qsxk8qoaC4LWB6EeigfA=
+SIZE (libmtp-1.1.18.tar.gz) = 832463
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/libmtp/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 31 Jan 2017 10:01:50 - 1.17
+++ pkg/PLIST 1 Feb 2021 20:35:57 -
@@ -21,7 +21,7 @@ bin/mtp-sendtr
@bin bin/mtp-tracks
@bin bin/mtp-trexist
include/libmtp.h
-lib/libmtp.a
+@static-lib lib/libmtp.a
lib/libmtp.la
@lib lib/libmtp.so.${LIBmtp_VERSION}
lib/pkgconfig/libmtp.pc
--
Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/01 13:29:00 Modified files: x11/kde-applications/okteta: Makefile distinfo x11/kde-applications/okteta/pkg: PLIST Log message: Update okteta to 0.26.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/01 13:28:05 Modified files: multimedia/mkvtoolnix: Makefile distinfo Log message: Update mkvtoolnix to 53.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 13:22:30 Modified files: net/sipsak : Makefile distinfo net/sipsak/pkg : PLIST Removed files: net/sipsak/patches: patch-header_f_c patch-header_f_h patch-helper_c patch-transport_c Log message: update to sipsak-0.9.8.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 13:15:47 Modified files: net/bird/1 : Makefile Added files: net/bird/1/patches: patch-sysdep_unix_krt_h Log message: bird/1: -fno-common fix from upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 13:13:27 Modified files: net/bird/2 : Makefile Added files: net/bird/2/patches: patch-nest_route_h Log message: bird/2: -fno-common fix from upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 13:04:53 Modified files: games/gargoyle : Makefile games/gargoyle/patches: patch-garglk_launchgtk_c Added files: games/gargoyle/patches: patch-garglk_launcher_c patch-garglk_launchmac_m patch-garglk_launchwin_c patch-terps_alan2_glkio_h patch-terps_alan2_main_c patch-terps_alan3_glkio_h patch-terps_alan3_output_h patch-terps_alan3_term_h patch-terps_jacl_glk_startup_c patch-terps_jacl_parser_c Log message: gargoyle: -fno-common fixes from upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 12:54:19 Modified files: net/mlvpn : Makefile Added files: net/mlvpn/patches: patch-src_mlvpn_c patch-src_mlvpn_h Log message: mlvpn: fix -fno-common, from upstream
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 12:52:01 Modified files: net/hping : Makefile Added files: net/hping/patches: patch-hping2_h Log message: hping: -fno-common fix, from FreeBSD ports
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 12:47:08 Modified files: net/echoping : Makefile Added files: net/echoping/patches: patch-echoping_c patch-echoping_h patch-http_c patch-smtp_c Log message: echoping: -fno-common fixes, adapted from FreeBSD ports
Re: [stellarium/qt5] uncaught exception of type std::bad_alloc
On Mon Feb 01, 2021 at 05:27:18PM +, Stuart Henderson wrote:
> On 2021/01/28 21:41, Rafael Sadowski wrote:
> > On Mon Jan 25, 2021 at 01:32:42PM +, Stuart Henderson wrote:
> > > astro/stellarium build is now failing on i386:
> > >
> > > FAILED: translations/stellarium-planetary-features/af.qm
> > > cd /pobj/stellarium-0.20.4/build-i386/po/stellarium-planetary-features &&
> > > /usr/local/lib/qt5/bin/lconvert -i
> > > /pobj/stellarium-0.20.4/stellarium-0.20.4/po/stellarium-planetary-features/af.po
> > > -o
> > > /pobj/stellarium-0.20.4/build-i386/translations/stellarium-planetary-features/af.qm
> > > terminating with uncaught exception of type std::bad_alloc: std::bad_alloc
> > > Abort trap (core dumped)
> > > ninja: build stopped: subcommand failed.
> >
> > I'm quite sure lconvert is running out of memory. The lconvert tasks
> > also consume over 4GB of memory on amd64.
> >
> > We could disable NLS (-DENABLE_NLS=OFF)
> >
> > >
> > > Built OK on 20210118 (post libc++ update), failed on 20210121, so I
> > > think this must have been following the Qt update.
> > >
> >
>
> this is likely to fix it.
Oh! Yes please, ok rsadowski
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
> retrieving revision 1.40
> diff -u -p -r1.40 Makefile
> --- Makefile 19 Jan 2021 06:16:29 - 1.40
> +++ Makefile 1 Feb 2021 17:25:50 -
> @@ -10,6 +10,8 @@ COMMENT-psql = PostgresSQL plugin for Q
> COMMENT-sqlite2 =SQLite 2.x plugin for Qt5
> COMMENT-tds =TDS plugin for Qt5
>
> +REVISION-main = 0
> +
> PKGNAME-mysql = qt5-mysql-${VERSION}
> PKGNAME-global = qt5-global-${VERSION}
> PKGNAME-psql = qt5-postgresql-${VERSION}
> Index: patches/patch-src_corelib_io_qiodevice_cpp
> ===
> RCS file: patches/patch-src_corelib_io_qiodevice_cpp
> diff -N patches/patch-src_corelib_io_qiodevice_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_corelib_io_qiodevice_cpp1 Feb 2021 17:25:50
> -
> @@ -0,0 +1,28 @@
> +$OpenBSD$
> +
> +https://codereview.qt-project.org/c/qt/qtbase/+/317907
> +
> +From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001
> +From: Kai Koehne
> +Date: Tue, 13 Oct 2020 15:47:31 +0200
> +Subject: [PATCH] Fix allocated memory of QByteArray returned by
> + QIODevice::readLine
> +
> +Index: src/corelib/io/qiodevice.cpp
> +--- src/corelib/io/qiodevice.cpp.orig
> src/corelib/io/qiodevice.cpp
> +@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize)
> + } else
> + readBytes = readLine(result.data(), result.size());
> +
> +-if (readBytes <= 0)
> ++if (readBytes <= 0) {
> + result.clear();
> +-else
> ++} else {
> + result.resize(readBytes);
> ++result.squeeze();
> ++}
> +
> + return result;
> + }
>
Re: UPDATE: Nextcloud-20.0.6
ping.
On Wed, 27 Jan 2021 at 10:04:20 +0100, Gonzalo L. Rodriguez wrote:
> Hello,
>
> Update for Nextcloud to 20.0.6:
>
> https://nextcloud.com/changelog/
>
> OK? Comments?
>
> Cheers.-
>
> --
>
> - gonzalo
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nextcloud/Makefile,v
> retrieving revision 1.62
> diff -u -p -r1.62 Makefile
> --- Makefile 26 Jan 2021 07:49:36 - 1.62
> +++ Makefile 26 Jan 2021 08:03:07 -
> @@ -2,7 +2,7 @@
>
> COMMENT= easy and universal access to shared and/or personal
> files
>
> -V= 20.0.5
> +V= 20.0.6
> DISTNAME=nextcloud-${V}
> EXTRACT_SUFX=.tar.bz2
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/nextcloud/distinfo,v
> retrieving revision 1.46
> diff -u -p -r1.46 distinfo
> --- distinfo 26 Jan 2021 07:49:36 - 1.46
> +++ distinfo 26 Jan 2021 08:03:07 -
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloud-20.0.5.tar.bz2) =
> XHDdMwJAEqFlH9CZEz0FLRKaTa3Gk19Eu5w+KzYL7+M=
> -SIZE (nextcloud-20.0.5.tar.bz2) = 105422202
> +SHA256 (nextcloud-20.0.6.tar.bz2) =
> hZFnFwQCuHa27xo3+kqqVhe2v4R7tdUKlPY2uuZaNLk=
> +SIZE (nextcloud-20.0.6.tar.bz2) = 105381388
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
> retrieving revision 1.49
> diff -u -p -r1.49 PLIST
> --- pkg/PLIST 26 Jan 2021 07:49:36 - 1.49
> +++ pkg/PLIST 26 Jan 2021 08:03:07 -
> @@ -6895,6 +6895,8 @@ nextcloud/apps/admin_audit/l10n/fr.js
> nextcloud/apps/admin_audit/l10n/fr.json
> nextcloud/apps/admin_audit/l10n/gl.js
> nextcloud/apps/admin_audit/l10n/gl.json
> +nextcloud/apps/admin_audit/l10n/he.js
> +nextcloud/apps/admin_audit/l10n/he.json
> nextcloud/apps/admin_audit/l10n/hr.js
> nextcloud/apps/admin_audit/l10n/hr.json
> nextcloud/apps/admin_audit/l10n/hu.js
> @@ -6907,10 +6909,14 @@ nextcloud/apps/admin_audit/l10n/ja.js
> nextcloud/apps/admin_audit/l10n/ja.json
> nextcloud/apps/admin_audit/l10n/ko.js
> nextcloud/apps/admin_audit/l10n/ko.json
> +nextcloud/apps/admin_audit/l10n/lt_LT.js
> +nextcloud/apps/admin_audit/l10n/lt_LT.json
> nextcloud/apps/admin_audit/l10n/nb.js
> nextcloud/apps/admin_audit/l10n/nb.json
> nextcloud/apps/admin_audit/l10n/nl.js
> nextcloud/apps/admin_audit/l10n/nl.json
> +nextcloud/apps/admin_audit/l10n/oc.js
> +nextcloud/apps/admin_audit/l10n/oc.json
> nextcloud/apps/admin_audit/l10n/pl.js
> nextcloud/apps/admin_audit/l10n/pl.json
> nextcloud/apps/admin_audit/l10n/pt_BR.js
> @@ -6929,6 +6935,8 @@ nextcloud/apps/admin_audit/l10n/sv.js
> nextcloud/apps/admin_audit/l10n/sv.json
> nextcloud/apps/admin_audit/l10n/tr.js
> nextcloud/apps/admin_audit/l10n/tr.json
> +nextcloud/apps/admin_audit/l10n/uk.js
> +nextcloud/apps/admin_audit/l10n/uk.json
> nextcloud/apps/admin_audit/l10n/zh_CN.js
> nextcloud/apps/admin_audit/l10n/zh_CN.json
> nextcloud/apps/admin_audit/l10n/zh_TW.js
> @@ -6982,6 +6990,8 @@ nextcloud/apps/cloud_federation_api/l10n
> nextcloud/apps/cloud_federation_api/l10n/en_GB.json
> nextcloud/apps/cloud_federation_api/l10n/es.js
> nextcloud/apps/cloud_federation_api/l10n/es.json
> +nextcloud/apps/cloud_federation_api/l10n/eu.js
> +nextcloud/apps/cloud_federation_api/l10n/eu.json
> nextcloud/apps/cloud_federation_api/l10n/fr.js
> nextcloud/apps/cloud_federation_api/l10n/fr.json
> nextcloud/apps/cloud_federation_api/l10n/gl.js
> @@ -7016,6 +7026,8 @@ nextcloud/apps/cloud_federation_api/l10n
> nextcloud/apps/cloud_federation_api/l10n/tr.json
> nextcloud/apps/cloud_federation_api/l10n/zh_CN.js
> nextcloud/apps/cloud_federation_api/l10n/zh_CN.json
> +nextcloud/apps/cloud_federation_api/l10n/zh_TW.js
> +nextcloud/apps/cloud_federation_api/l10n/zh_TW.json
> nextcloud/apps/cloud_federation_api/lib/
> nextcloud/apps/cloud_federation_api/lib/AppInfo/
> nextcloud/apps/cloud_federation_api/lib/AppInfo/Application.php
> @@ -7333,6 +7345,8 @@ nextcloud/apps/contactsinteraction/l10n/
> nextcloud/apps/contactsinteraction/l10n/pl.json
> nextcloud/apps/contactsinteraction/l10n/pt_BR.js
> nextcloud/apps/contactsinteraction/l10n/pt_BR.json
> +nextcloud/apps/contactsinteraction/l10n/sc.js
> +nextcloud/apps/contactsinteraction/l10n/sc.json
> nextcloud/apps/contactsinteraction/l10n/sk.js
> nextcloud/apps/contactsinteraction/l10n/sk.json
> nextcloud/apps/contactsinteraction/l10n/sl.js
> @@ -7341,6 +7355,8 @@ nextcloud/apps/contactsinteraction/l10n/
> nextcloud/apps/contactsinteraction/l10n/tr.json
> nextcloud/apps/contactsinteraction/l10n/zh_CN.js
> nextcloud/apps/contactsinteraction/l10n/zh_CN.json
> +nextcloud/apps/contactsinteraction/l10n/zh_TW.js
> +nextcloud/apps/contactsinteraction/l10n/zh_TW.json
> nextcloud/apps/contactsinteraction/lib/
> nextcloud/apps/contactsinteraction/lib/AddressBook.php
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 11:21:07 Modified files: databases/web2ldap: Makefile distinfo databases/web2ldap/pkg: PLIST Log message: update to web2ldap-1.5.112, from Lucas Raab (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 11:20:46 Modified files: databases/py-ldap0: Makefile distinfo Log message: update to py-ldap0-1.1.4, from Lucas Raab (maintainer)
Re: Update net/echoping [WIP]
On 2021/02/01 01:03, Klemens Nanni wrote: > Came here for "-fno-common". > > Not sure why we're patching things in our 5.2.0 version from 2004 when > there was 6.0.0 released in 2007. I've updated it. It still needs work for -fno-common though.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 11:10:44 Modified files: net/echoping : Makefile distinfo net/echoping/pkg: DESCR PLIST Added files: net/echoping/patches: patch-recreate-autofiles Removed files: net/echoping/patches: patch-configure patch-util_c Log message: update to echoping-6.0.2, started by kn@, finished by me
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2021/02/01 10:41:39 Modified files: comms/c3270: Makefile distinfo Added files: comms/c3270/patches: patch-Common_print_command_c patch-c3270_screen_c Removed files: comms/c3270/patches: patch-Common_telnet_c Log message: Update to c3270 4.0ga10 Fixes issues with -fno-common.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/01 10:40:50 Modified files: education/epte : Makefile Added files: education/epte/patches: patch-endprog_c Log message: Fix "-fno-common" build
Re: [stellarium/qt5] uncaught exception of type std::bad_alloc
On 2021/01/28 21:41, Rafael Sadowski wrote:
> On Mon Jan 25, 2021 at 01:32:42PM +, Stuart Henderson wrote:
> > astro/stellarium build is now failing on i386:
> >
> > FAILED: translations/stellarium-planetary-features/af.qm
> > cd /pobj/stellarium-0.20.4/build-i386/po/stellarium-planetary-features &&
> > /usr/local/lib/qt5/bin/lconvert -i
> > /pobj/stellarium-0.20.4/stellarium-0.20.4/po/stellarium-planetary-features/af.po
> > -o
> > /pobj/stellarium-0.20.4/build-i386/translations/stellarium-planetary-features/af.qm
> > terminating with uncaught exception of type std::bad_alloc: std::bad_alloc
> > Abort trap (core dumped)
> > ninja: build stopped: subcommand failed.
>
> I'm quite sure lconvert is running out of memory. The lconvert tasks
> also consume over 4GB of memory on amd64.
>
> We could disable NLS (-DENABLE_NLS=OFF)
>
> >
> > Built OK on 20210118 (post libc++ update), failed on 20210121, so I
> > think this must have been following the Qt update.
> >
>
this is likely to fix it.
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile19 Jan 2021 06:16:29 - 1.40
+++ Makefile1 Feb 2021 17:25:50 -
@@ -10,6 +10,8 @@ COMMENT-psql =PostgresSQL plugin for Q
COMMENT-sqlite2 = SQLite 2.x plugin for Qt5
COMMENT-tds = TDS plugin for Qt5
+REVISION-main =0
+
PKGNAME-mysql =qt5-mysql-${VERSION}
PKGNAME-global = qt5-global-${VERSION}
PKGNAME-psql = qt5-postgresql-${VERSION}
Index: patches/patch-src_corelib_io_qiodevice_cpp
===
RCS file: patches/patch-src_corelib_io_qiodevice_cpp
diff -N patches/patch-src_corelib_io_qiodevice_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_corelib_io_qiodevice_cpp 1 Feb 2021 17:25:50 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+https://codereview.qt-project.org/c/qt/qtbase/+/317907
+
+From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001
+From: Kai Koehne
+Date: Tue, 13 Oct 2020 15:47:31 +0200
+Subject: [PATCH] Fix allocated memory of QByteArray returned by
+ QIODevice::readLine
+
+Index: src/corelib/io/qiodevice.cpp
+--- src/corelib/io/qiodevice.cpp.orig
src/corelib/io/qiodevice.cpp
+@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize)
+ } else
+ readBytes = readLine(result.data(), result.size());
+
+-if (readBytes <= 0)
++if (readBytes <= 0) {
+ result.clear();
+-else
++} else {
+ result.resize(readBytes);
++result.squeeze();
++}
+
+ return result;
+ }
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/01 10:17:28 Modified files: archivers/gshar+gunshar: Makefile archivers/gshar+gunshar/pkg: PLIST Log message: archivers/gshar+gunshar: enable NLS and install message catalogs Disabling NLS is buggy, the build already picked up libintl. Tweak the -fno-common fix.
Re: UPDATE: Japana-2.0.6
On Mon, Feb 01, 2021 at 05:54:17PM +0100, Gonzalo L. Rodriguez wrote:
> Hello,
>
> Update for Japana to 2.0.6:
>
> https://www.cgarbs.de/japana.en.html
>
> OK? Comments?
>
> Cheers.-
>
> --
>
> - gonzalo
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/japana/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 12 Jul 2019 20:50:47 - 1.10
> +++ Makefile 1 Feb 2021 16:52:05 -
> @@ -2,10 +2,9 @@
>
> COMMENT =proxy that can transliterate japanese
>
> -DISTNAME = japana-2.0.5
> -REVISION = 0
> +DISTNAME = japana-2.0.6
> CATEGORIES = www japanese converters
> -HOMEPAGE = http://www.h.shuttle.de/mitch/japana.en.html
> +HOMEPAGE = https://www.cgarbs.de/japana.en.html
>
> MAINTAINER = Marc Espie
>
> @@ -13,7 +12,7 @@ MAINTAINER =Marc Espie PERMIT_PACKAGE = Yes
>
>
> -MASTER_SITES = http://www.h.shuttle.de/mitch/stuff/
> +MASTER_SITES = https://www.cgarbs.de/stuff/
> RUN_DEPENDS =japanese/p5-Text-Kakasi \
> devel/p5-AppConfig \
> www/p5-libwww
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/japana/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 18 Jan 2015 03:15:38 - 1.3
> +++ distinfo 1 Feb 2021 16:52:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (japana-2.0.5.tar.gz) = fO+qRox8jnFz0tQmyPR5tpFfI943IdUn1m/lWqWYFMI=
> -SIZE (japana-2.0.5.tar.gz) = 18765
> +SHA256 (japana-2.0.6.tar.gz) = 8zGCPjNaqxrcYVL9toLOA5UdCU0S3Q8tWEF3LHaLhqc=
> +SIZE (japana-2.0.6.tar.gz) = 20173
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/japana/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 3 Jul 2011 23:13:14 - 1.3
> +++ pkg/PLIST 1 Feb 2021 16:52:05 -
> @@ -3,4 +3,4 @@
> sbin/japana
> share/examples/japana/
> share/examples/japana/japana.conf
> -@sample /etc/japana.conf
> +@sample ${SYSCONFDIR}/japana.conf
Looks good, okay
UPDATE: Japana-2.0.6
Hello,
Update for Japana to 2.0.6:
https://www.cgarbs.de/japana.en.html
OK? Comments?
Cheers.-
--
- gonzalo
Index: Makefile
===
RCS file: /cvs/ports/www/japana/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:50:47 - 1.10
+++ Makefile1 Feb 2021 16:52:05 -
@@ -2,10 +2,9 @@
COMMENT = proxy that can transliterate japanese
-DISTNAME = japana-2.0.5
-REVISION = 0
+DISTNAME = japana-2.0.6
CATEGORIES = www japanese converters
-HOMEPAGE = http://www.h.shuttle.de/mitch/japana.en.html
+HOMEPAGE = https://www.cgarbs.de/japana.en.html
MAINTAINER = Marc Espie
@@ -13,7 +12,7 @@ MAINTAINER = Marc Espie http://www.h.shuttle.de/mitch/stuff/
+MASTER_SITES = https://www.cgarbs.de/stuff/
RUN_DEPENDS = japanese/p5-Text-Kakasi \
devel/p5-AppConfig \
www/p5-libwww
Index: distinfo
===
RCS file: /cvs/ports/www/japana/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Jan 2015 03:15:38 - 1.3
+++ distinfo1 Feb 2021 16:52:05 -
@@ -1,2 +1,2 @@
-SHA256 (japana-2.0.5.tar.gz) = fO+qRox8jnFz0tQmyPR5tpFfI943IdUn1m/lWqWYFMI=
-SIZE (japana-2.0.5.tar.gz) = 18765
+SHA256 (japana-2.0.6.tar.gz) = 8zGCPjNaqxrcYVL9toLOA5UdCU0S3Q8tWEF3LHaLhqc=
+SIZE (japana-2.0.6.tar.gz) = 20173
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/japana/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 3 Jul 2011 23:13:14 - 1.3
+++ pkg/PLIST 1 Feb 2021 16:52:05 -
@@ -3,4 +3,4 @@
sbin/japana
share/examples/japana/
share/examples/japana/japana.conf
-@sample /etc/japana.conf
+@sample ${SYSCONFDIR}/japana.conf
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/01 09:51:22 Modified files: archivers/arc : Makefile archivers/arc/patches: patch-arclzw_c patch-arcunp_c Log message: Fix "-fno-common" build, from FreeBSD
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/01 09:43:29 Modified files: archivers/gshar+gunshar: Makefile Log message: Fix build with "-fno-common"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 09:20:57 Modified files: misc/remind: Makefile distinfo Log message: update to remind-3.3.5, from maintainer Martin Ziemer
Re: replace security/stegcracker with security/stegseek
On 2021/02/01 07:48, Sebastian Reitenbach wrote: > Hi, > > Am Freitag, Januar 29, 2021 19:22 CET, schrieb Klemens Nanni > : > > > On Thu, Jan 28, 2021 at 11:28:10PM +0100, Sebastian Reitenbach wrote: > > > for the quirks, just use reason 3: "no longer maintained upstream" > > > or add a new one: "no longer maintained upstream, suggest stegseek" ? > > Just add new ones if need be, no need to be less specific. > > > > Will do thanks, > > > But if one replaces the other, why not merge the old into the new one > > and keep users on track? > > you mean to place the stegseek port into the stegcracker directory? > Or is there an easy way with @conflict etc. markers in PLIST ? To do this, you will need: - EPOCH=0 on stegseek because the version number is "higher" than that of stegcracker - quirks $stem_extensions entry to rename the package - @pkgpath security/stegcracker in stegseek/pkg/PLIST > > cheers, > Sebastian >
[MAINTAINER UPDATE] www/qutebrowser -> 2.0.1
Update www/qutebrowser to 2.0.1
Changelog:https://github.com/qutebrowser/qutebrowser/releases/tag/v2.0.0
*attrs, pypeg2 dependencies are removed.
*pygments is used by default only with
qtwebkit backend.
py-importlib_resources needs to be imported
along with the py-setuptools_scm update.
Build & Run tested with amd64
Index: Makefile
===
RCS file: /cvs/ports/www/qutebrowser/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile12 Dec 2020 09:11:26 - 1.23
+++ Makefile1 Feb 2021 12:03:37 -
@@ -2,7 +2,7 @@
COMMENT = keyboard-focused browser with a minimal GUI
-MODPY_EGG_VERSION =1.14.1
+MODPY_EGG_VERSION =2.0.1
DISTNAME = qutebrowser-${MODPY_EGG_VERSION}
HOMEPAGE = https://www.qutebrowser.org/
@@ -20,9 +20,7 @@ MODPY_PI =Yes
MODPY_SETUPTOOLS = Yes
RUN_DEPENDS = devel/desktop-file-utils \
- devel/py-attrs${MODPY_FLAVOR} \
- textproc/py-PEG2${MODPY_FLAVOR} \
- textproc/py-pygments${MODPY_FLAVOR} \
+ devel/py-importlib_resources${MODPY_FLAVOR} \
textproc/py-yaml${MODPY_FLAVOR} \
x11/gtk+3,-guic \
x11/py-qt5${MODPY_FLAVOR} \
Index: distinfo
===
RCS file: /cvs/ports/www/qutebrowser/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo12 Dec 2020 09:11:26 - 1.13
+++ distinfo1 Feb 2021 12:03:37 -
@@ -1,2 +1,2 @@
-SHA256 (qutebrowser-1.14.1.tar.gz) =
VUwUX/ZLGpLU9T48Ykqq1Ruq+3y1tGm8gVri4OGVh5Y=
-SIZE (qutebrowser-1.14.1.tar.gz) = 4161759
+SHA256 (qutebrowser-2.0.1.tar.gz) =
qpiNYfGjltfnEBBUhRKRz1fnzxnn/A7v/TC2clcKskI=
+SIZE (qutebrowser-2.0.1.tar.gz) = 6183369
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/qutebrowser/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 12 Dec 2020 09:11:26 - 1.12
+++ pkg/PLIST 1 Feb 2021 12:03:38 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2020/12/12 09:11:26 rsadowski Exp $
+@comment $OpenBSD: PLIST,v$
bin/qutebrowser
lib/python${MODPY_VERSION}/site-packages/qutebrowser/
lib/python${MODPY_VERSION}/site-packages/qutebrowser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
@@ -91,6 +91,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}certificateerror.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}cookies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}darkmode.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}interceptor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}spell.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}tabhistory.${MODPY_PYC_MAGIC_TAG}pyc
@@ -103,6 +104,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/${MODPY_PYCACHE}webview.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/certificateerror.py
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/cookies.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/darkmode.py
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/interceptor.py
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/spell.py
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webengine/tabhistory.py
@@ -122,7 +124,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webkit/${MODPY_PYCACHE}cookies.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webkit/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webkit/${MODPY_PYCACHE}mhtml.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webkit/${MODPY_PYCACHE}rfc6266.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webkit/${MODPY_PYCACHE}tabhistory.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/qutebrowser/browser/webkit/${MODPY_PYCACHE}webkitelem.${MODPY_PYC_MAGIC_TAG}pyc
mips64 bulk build report
bulk build on octeon.ports.openbsd.org started on Wed Jan 27 14:26:24 UTC 2021 finished at Mon Feb 1 14:17:06 UTC 2021 lasted 05D23h50m done with kern.version=OpenBSD 6.8-current (GENERIC.MP) #20: Wed Jan 27 14:10:31 UTC 2021 built packages:8634 Jan 27:2334 Jan 28:1118 Jan 29:642 Jan 30:656 Jan 31:1024 Feb 1:2859 build failures: 29 http://build-failures.rhaalovely.net/mips64/2021-01-27/cad/netgen.log http://build-failures.rhaalovely.net/mips64/2021-01-27/chinese/libchewing.log http://build-failures.rhaalovely.net/mips64/2021-01-27/chinese/libpinyin.log http://build-failures.rhaalovely.net/mips64/2021-01-27/databases/postgresql-pllua.log http://build-failures.rhaalovely.net/mips64/2021-01-27/devel/ccache.log http://build-failures.rhaalovely.net/mips64/2021-01-27/devel/coccinelle.log http://build-failures.rhaalovely.net/mips64/2021-01-27/devel/fmt.log http://build-failures.rhaalovely.net/mips64/2021-01-27/devel/glog.log http://build-failures.rhaalovely.net/mips64/2021-01-27/devel/libexecinfo.log http://build-failures.rhaalovely.net/mips64/2021-01-27/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/mips64/2021-01-27/emulators/openmsx.log http://build-failures.rhaalovely.net/mips64/2021-01-27/emulators/spike.log http://build-failures.rhaalovely.net/mips64/2021-01-27/games/astromenace.log http://build-failures.rhaalovely.net/mips64/2021-01-27/games/hyperrogue.log http://build-failures.rhaalovely.net/mips64/2021-01-27/geo/gpstk.log http://build-failures.rhaalovely.net/mips64/2021-01-27/inputmethods/scim-fcitx.log http://build-failures.rhaalovely.net/mips64/2021-01-27/lang/STk.log http://build-failures.rhaalovely.net/mips64/2021-01-27/lang/gforth.log http://build-failures.rhaalovely.net/mips64/2021-01-27/lang/librep.log http://build-failures.rhaalovely.net/mips64/2021-01-27/lang/pfe.log http://build-failures.rhaalovely.net/mips64/2021-01-27/lang/ruby/3.0,-gdbm.log http://build-failures.rhaalovely.net/mips64/2021-01-27/math/gbc.log http://build-failures.rhaalovely.net/mips64/2021-01-27/math/lrs.log http://build-failures.rhaalovely.net/mips64/2021-01-27/math/ntl.log http://build-failures.rhaalovely.net/mips64/2021-01-27/plan9/drawterm.log http://build-failures.rhaalovely.net/mips64/2021-01-27/security/botan2.log http://build-failures.rhaalovely.net/mips64/2021-01-27/shells/ksh93.log http://build-failures.rhaalovely.net/mips64/2021-01-27/sysutils/libvirt.log http://build-failures.rhaalovely.net/mips64/2021-01-27/sysutils/u-boot,aarch64.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2021/02/01 08:59:01 Modified files: misc/screen-shm: Makefile misc/screen-shm/patches: patch-screen_h Log message: misc/screen-shm: fix for -fno-common Declare rather than define global variable in header file.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2021/02/01 08:47:16 Modified files: emulators/mame : Makefile distinfo emulators/mame/patches: patch-makefile emulators/mame/pkg: PLIST Log message: Update mame to 0.228.
HEADS-UP: pkgtools issue
While fixing another issue, I accidentally broke the pkgtools slightly
(especially pkg_info), resulting in empty output when redirected :(
so the parts of bsd.port.mk that depend on that (dependency handling)
might break in spectacular ways.
(sorry for not testing, but I definitely dit NOT expect this to break)
I'm not sure both problems made it out to a snapshot, they are now
fully fixed, but if you're experiencing really bad issues working with
the ports tree,
update from src.
checkout src/usr.sbin/{Makefile.inc,pkg_add}
do a 'make install NOMAN='
gitea rc script broken
Hi,
the last commit to the gitea port simplefied the rc script. The
following diff was used:
diff --git a/www/gitea/pkg/gitea.rc b/www/gitea/pkg/gitea.rc
index 5a71caba4fb..0b7e4d745cd 100644
--- a/www/gitea/pkg/gitea.rc
+++ b/www/gitea/pkg/gitea.rc
@@ -1,21 +1,13 @@
#!/bin/ksh
#
-# $OpenBSD: gitea.rc,v 1.5 2019/02/14 10:08:53 pvk Exp $
+# $OpenBSD: gitea.rc,v 1.6 2021/01/17 21:07:41 pvk Exp $
daemon="${TRUEPREFIX}/sbin/gitea"
daemon_user="_gitea"
-daemon_flags="web -c ${SYSCONFDIR}/gitea/app.ini"
. /etc/rc.d/rc.subr
rc_bg=YES
rc_reload=NO
-rc_start() {
- ${rcexec} "env HOME=${LOCALSTATEDIR}/gitea USER=${daemon_user} \
- GITEA_WORK_DIR=${TRUEPREFIX}/share/gitea \
- GITEA_CUSTOM=${LOCALSTATEDIR}/gitea/custom \
- ${daemon} ${daemon_flags}"
-}
-
rc_cmd $1
However, this does not seam to work. The daemon does not start anymore.
If i revert back to the old script it still works fine. Is there a need
to use this simplification? Or would it be valid to switch back to the
original version?
CC @ Pavel Korovin because he did most of the work on this amazing port!
Thanks so much and greetings
Leo
$ cat /etc/rc.conf.local
httpd_flags=
pkg_scripts=gitea
smtpd_flags=NO
$ dmesg
OpenBSD 6.8-current (GENERIC) #271: Mon Jan 18 13:58:09 MST 2021
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC
real mem = 2080227328 (1983MB)
avail mem = 2002026496 (1909MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.8 @ 0xf5b00 (9 entries)
bios0: vendor Hetzner version "2017" date 11/11/2017
bios0: Hetzner vServer
acpi0 at bios0: ACPI 1.0
acpi0: sleep states S5
acpi0: tables DSDT FACP APIC
acpi0: wakeup devices
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel Xeon Processor (Skylake, IBRS), 2100.36 MHz, 06-55-04
cpu0:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,FSGSBASE,BMI1,HLE,AVX2,SMEP,BMI2,ERMS,INVPCID,RTM,AVX512F,AVX512DQ,RDSEED,ADX,SMAP,CLWB,AVX512CD,AVX512BW,AVX512VL,PKU,MD_CLEAR,IBRS,IBPB,SSBD,ARAT,XSAVEOPT,XSAVEC,XGETBV1,MELTDOWN
cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line
16-way L2 cache
cpu0: ITLB 255 4KB entries direct-mapped, 255 4MB entries direct-mapped
cpu0: DTLB 255 4KB entries direct-mapped, 255 4MB entries direct-mapped
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 1000MHz
ioapic0 at mainbus0: apid 0 pa 0xfec0, version 11, 24 pins
acpiprt0 at acpi0: bus 0 (PCI0)
"ACPI0006" at acpi0 not configured
acpipci0 at acpi0 PCI0
acpicmos0 at acpi0
"PNP0A06" at acpi0 not configured
"PNP0A06" at acpi0 not configured
"PNP0A06" at acpi0 not configured
"QEMU0002" at acpi0 not configured
"ACPI0010" at acpi0 not configured
acpicpu0 at acpi0: C1(@1 halt!)
cpu0: using VERW MDS workaround
pvbus0 at mainbus0: KVM
pvclock0 at pvbus0
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel 82441FX" rev 0x02
pcib0 at pci0 dev 1 function 0 "Intel 82371SB ISA" rev 0x00
pciide0 at pci0 dev 1 function 1 "Intel 82371SB IDE" rev 0x00: DMA, channel 0
wired to compatibility, channel 1 wired to compatibility
pciide0: channel 0 disabled (no drives)
atapiscsi0 at pciide0 channel 1 drive 0
scsibus1 at atapiscsi0: 2 targets
cd0 at scsibus1 targ 0 lun 0: removable
cd0(pciide0:1:0): using PIO mode 4, DMA mode 2
piixpm0 at pci0 dev 1 function 3 "Intel 82371AB Power" rev 0x03: apic 0 int 9
iic0 at piixpm0
vga1 at pci0 dev 2 function 0 "Bochs VGA" rev 0x02
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
virtio0 at pci0 dev 3 function 0 "Qumranet Virtio Network" rev 0x00
vio0 at virtio0: address 96:00:00:1d:c0:5a
virtio0: msix shared
virtio1 at pci0 dev 4 function 0 "Qumranet Virtio SCSI" rev 0x00
vioscsi0 at virtio1: qsize 128
scsibus2 at vioscsi0: 255 targets
sd0 at scsibus2 targ 0 lun 0:
sd0: 19532MB, 512 bytes/sector, 40001536 sectors, thin
virtio1: msix shared
virtio2 at pci0 dev 5 function 0 "Qumranet Virtio Memory Balloon" rev 0x00
viomb0 at virtio2
virtio2: apic 0 int 10
virtio3 at pci0 dev 6 function 0 "Qumranet Virtio Console" rev 0x00
virtio3: no matching child driver; not configured
xhci0 at pci0 dev 7 function 0 vendor "Red Hat", unknown product 0x000d rev
0x01: apic 0 int 11, xHCI 0.0
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Red Hat xHCI root hub" rev 3.00/1.00
addr 1
isa0 at pcib0
isadma0 at isa0
fdc0 at isa0 port 0x3f0/6 irq 6 drq 2
com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0
Re: graphics/tumble -fno-common
On Mon, 1 Feb 2021 17:28:43 +1100 Jonathan Gray wrote: > no newer release or upstream fix I've successfully build and run tested this diff on amd64. OK cwen@ > Index: Makefile > === > RCS file: /cvs/ports/graphics/tumble/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 25 Apr 2020 14:02:14 - 1.1.1.1 > +++ Makefile 1 Feb 2021 06:03:42 - > @@ -8,6 +8,7 @@ COMMENT = convert pictures into pdf book > GH_PROJECT = tumble > GH_ACCOUNT = brouhaha > GH_TAGNAME = v0.36 > +REVISION = 0 > > CATEGORIES = graphics textproc > > Index: patches/patch-semantics_c > === > RCS file: patches/patch-semantics_c > diff -N patches/patch-semantics_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-semantics_c 1 Feb 2021 06:03:42 - > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +fix -fno-common build > + > +Index: semantics.c > +--- semantics.c.orig > semantics.c > +@@ -119,7 +119,7 @@ typedef struct output_page_t > + #endif > + > + > +-FILE *yyin; > ++extern FILE *yyin; > + int line; /* line number in spec file */ > + > + int bookmark_level; > Index: patches/patch-tumble_input_h > === > RCS file: patches/patch-tumble_input_h > diff -N patches/patch-tumble_input_h > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-tumble_input_h 1 Feb 2021 06:03:42 - > @@ -0,0 +1,13 @@ > +$OpenBSD$ > + > +fix -fno-common build > + > +Index: tumble_input.h > +--- tumble_input.h.orig > tumble_input.h > +@@ -71,4 +71,4 @@ void init_jpeg_handler (void); > + void init_pbm_handler (void); > + void init_png_handler (void); > + > +-input_handler_t blank_handler; > ++extern input_handler_t blank_handler; >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 07:56:30 Modified files: math/visidata : Makefile distinfo math/visidata/pkg: PLIST Log message: update to visidata-2.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 07:55:22 Modified files: sysutils/logtail: Makefile distinfo Log message: update logtail to 1.3.21 and update COMMENT logtail is extracted from Debian's logcheck; logtail itself was unchanged in this version so this is basically a noop update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2021/02/01 07:45:33 Modified files: graphics : Makefile Log message: Add libspiro.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2021/02/01 07:44:30 Log message: Import graphics/libspiro. Spiro is the creation of Raph Levien. It simplifies the drawing of beautiful curves. Using bezier splines an artist can easily draw curves with the same slope on either side of an on-curve point. Spiros, on the other hand, are based on clothoid splines which make it easy to maintain constant curvature as well as constant slope. Such curves will simply look nicer. Spiro splines only use on-curve points and so are easier to use and more intuitive to the artist. This library will take an array of spiro control points and convert them into a series of bezier splines which can then be used in the myriad of ways the world has come to use beziers. From Alessandro De Laurenzis, thanks! OK bentley@ Status: Vendor Tag: fcambus Release Tags: fcambus_20210201 N ports/graphics/libspiro/distinfo N ports/graphics/libspiro/Makefile N ports/graphics/libspiro/pkg/DESCR N ports/graphics/libspiro/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/01 07:07:52 Modified files: security : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: security/siphon: Makefile distinfo security/siphon/patches: patch-log_c security/siphon/pkg: DESCR PLIST Log message: Remove security/siphon Upstream still ships the tarball, that's it, as per CVS log: "primary distsite and homepage have gone away". The only TCP port I've been able to detect (after producing traffing on a variety of them) is SSH -- and that only worked after enabling IPv4. Siphon does not seem to support/detect IPv6 at all and it's OS fingerprints are extremely old; besides Gentoo we're the only ones still packaging it according to https://repology.org/project/siphon/versions . Fails with "-fno-common". OK cwen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2021/02/01 06:47:23 Modified files: devel/cvsgraph : Makefile Log message: Update HOMEPAGE.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2021/02/01 06:44:59 Modified files: net/dbip : Makefile.inc net/dbip/asn : distinfo net/dbip/city : distinfo net/dbip/country: distinfo Log message: Update dbip to 2021-02.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 05:57:26 Modified files: www/squid : Makefile www/squid/pkg : README-main Log message: squid: adjust readme for pf route-to changes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/02/01 05:41:37 Modified files: infrastructure/db: user.list Log message: Disable _hitch after security/hitch removal Reminder from Matthias Schmidt, thanks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/01 05:00:51 Modified files: devel/boost: Makefile distinfo devel/boost/patches: patch-Jamroot patch-boost_asio_detail_impl_socket_ops_ipp patch-boost_config_platform_bsd_hpp patch-boost_predef_other_endian_h patch-libs_filesystem_src_operations_cpp patch-tools_build_src_engine_jam_h patch-tools_build_src_tools_gcc_jam devel/boost/pkg: PLIST-main Added files: devel/boost/patches: patch-boost_asio_detail_config_hpp patch-boost_coroutine_asymmetric_coroutine_hpp patch-boost_predef_os_bsd_open_h patch-tools_build_src_engine_build_sh Removed files: devel/boost/patches: patch-boost_context_fixedsize_stack_hpp patch-boost_context_pooled_fixedsize_stack_hpp patch-boost_context_posix_protected_fixedsize_stack_hpp patch-boost_test_impl_execution_monitor_ipp patch-libs_context_src_asm_jump_ppc32_sysv_elf_gas_S patch-libs_context_src_asm_make_ppc32_sysv_elf_gas_S patch-libs_context_src_asm_ontop_ppc32_sysv_elf_gas_S patch-libs_context_src_asm_ontop_ppc64_sysv_elf_gas_S Log message: Update boost to 1.72.0 Changelogs are here: https://www.boost.org/users/history/version_1_71_0.html https://www.boost.org/users/history/version_1_72_0.html Update diff from Brad Smith (maintainer), OK sthen@
aarch64 bulk build report
bulk build on arm64.ports.openbsd.org started on Fri Jan 29 08:38:32 MST 2021 finished at Mon Feb 1 01:57:31 MST 2021 lasted 2D17h18m done with kern.version=OpenBSD 6.8-current (GENERIC.MP) #996: Fri Jan 29 04:43:16 MST 2021 built packages:10942 Jan 29:3323 Jan 30:1720 Jan 31:3606 Feb 1:2292 critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2021-01-29/summary.log build failures: 14 http://build-failures.rhaalovely.net/aarch64/2021-01-29/comms/gnuradio.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/converters/wv2.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/devel/ccache.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/devel/glog.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/editors/calligra.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/editors/xwpe.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/emulators/vice.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/games/shockolate.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/security/age.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/sysutils/nomad.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/sysutils/telegraf.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/sysutils/terragrunt.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/www/chromium.log http://build-failures.rhaalovely.net/aarch64/2021-01-29/www/seamonkey,-lightning.log recurrent failures failures/comms/gnuradio.log failures/converters/wv2.log failures/devel/glog.log failures/editors/calligra.log failures/editors/xwpe.log failures/emulators/vice.log failures/games/shockolate.log failures/security/age.log failures/sysutils/nomad.log failures/sysutils/telegraf.log failures/sysutils/terragrunt.log failures/www/chromium.log new failures +++ ls-failures Mon Feb 1 01:57:40 2021 +failures/devel/ccache.log +failures/www/seamonkey,-lightning.log resolved failures --- ../old/aarch64/last//ls-failuresTue Jan 26 11:46:21 2021 -failures/astro/stellarium.log -failures/devel/kf5/kimageformats.log -failures/net/samba,,-ldb.log -failures/sysutils/ruby-puppet/5.log -failures/sysutils/ruby-puppet/6.log -failures/x11/kde-applications/spectacle.log -failures/x11/qt5/qtwebengine.log
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 03:55:27 Modified files: net/mosquitto : Makefile Log message: mosquitto: xsltproc needed for build
[update patch] remind 3.3.4 -> 3.3.5
This patch updates remind from 3.3.4 to 3.3.5. Tested on three amd64 systems. (One cli only, two with tkremind) Index: Makefile === RCS file: /cvs/ports/misc/remind/Makefile,v retrieving revision 1.43 diff -u -p -r1.43 Makefile --- Makefile20 Jan 2021 13:22:45 - 1.43 +++ Makefile1 Feb 2021 10:29:35 - @@ -2,8 +2,8 @@ COMMENT= scripting language for reminders, with a Tk front end -DISTNAME= remind-03.03.04 -PKGNAME= remind-3.3.4 +DISTNAME= remind-03.03.05 +PKGNAME= remind-3.3.5 CATEGORIES=misc Index: distinfo === RCS file: /cvs/ports/misc/remind/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo20 Jan 2021 07:27:29 - 1.15 +++ distinfo1 Feb 2021 10:29:35 - @@ -1,2 +1,2 @@ -SHA256 (remind-03.03.04.tar.gz) = 1jMFjMb9RF3hCSlDgWh5pK3Rb+97PqpmjCmBnMMhcOQ= -SIZE (remind-03.03.04.tar.gz) = 400991 +SHA256 (remind-03.03.05.tar.gz) = Ye0X2Gvek/pyaNVxGKL773OWJvC4I6F5nEsRQgzWbsE= +SIZE (remind-03.03.05.tar.gz) = 402481
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/01 03:11:27 Modified files: devel/ccache : Makefile devel/ccache/patches: patch-cmake_GenerateConfigurationFile_cmake Added files: devel/ccache/patches: patch-src_third_party_blake3_CMakeLists_txt Log message: ccache: add upstream patch to fix on some arches; pointed at by jasper@
