Tuesday, January 31, 2023
Re: Iperf3 - Not allowing connections
> Hello,
>
> I have been trying to benchmark the network speed to my openbsd router using
> iperf3 (which is a common tool used on Linux) but it does not seem to work
> on openBSD,
working fine on openbsd (and many more ...and not only linux based things).
I used it ago to perform tests openbsd <-> LCOS <-> Windows <-> ??? (=all of them
no linux ;)
> I compiled it from source, and although it binds to port 5201
> (or so it says), when I try to connect I get:
>
> Unable to connect to remote host: Connection refused
You see this message on the openbsd host? I rather think you see it on
the other box from which you want to connect to the openbsd host.
So just as a shot in the dark: pf on openbsd host blocks port 5201. So
please check your /etc/pf.conf (see pf.conf(5))
> As the port is unbound, thus nothing is listening on the port.
It is unbound??? Didn't you say that iperf binds to port 5201 before???
> happening, and is there a way to fix it?
I am sure that this is something we can fix easily :-)
But please provide more info to help you out.
> There is nothing on dmesg about it, and there is nothing in the syslogs.
>
> If you have an alternative network benchmark tool which does work on openBSD
> please let me know.
There are more than one network tool. What exactly do you want to test?
Maybe you just want to see open ports?
From your other mails on this list I could imagine that maybe you just
want print the route packets take to a network host.
For this as an example you can just use traceroute(8) in base.
Re: hw.ncpuonline
> Den ons 1 feb. 2023 kl 03:08 skrev Justin Muir <ve7utm@gmail.com>:
> > I've got an AMD A10 with 4 cores and only 2 are online. I'm not sure how to
> > enable the other 2.
> >
> > hw.ncpufound=4 btw
> > Any ideas out there?
>
> OpenBSD disables hyperthreading (or symmetric multithreading, smt), so
> if your "4-core" cpu is actually 2 real cores and 2 hyperthreads, then
> this sounds perfectly reasonable.
>
> For example, this box of mine (not the same cpu, but still), it looks like this:
>
> hw.ncpufound=8
> hw.smt=0
> hw.ncpuonline=4
>
> so I get the 4 real cores running out of possibly 8.
>
> --
> May the most significant bit of your life be positive.
>
It is posible to enable symmetric multithreading, at your own risk as
it makes certain types of attack easier. Often it does not increase
performance.
sysctl hw.smt=1
See man sysctl.conf for a permanent solution.
-Otto
Re: hw.ncpuonline
> Den ons 1 feb. 2023 kl 03:08 skrev Justin Muir <ve7utm@gmail.com>:
> > I've got an AMD A10 with 4 cores and only 2 are online. I'm not sure how to
> > enable the other 2.
> >
> > hw.ncpufound=4 btw
> > Any ideas out there?
>
> OpenBSD disables hyperthreading (or symmetric multithreading, smt), so
> if your "4-core" cpu is actually 2 real cores and 2 hyperthreads, then
> this sounds perfectly reasonable.
>
> For example, this box of mine (not the same cpu, but still), it looks like this:
>
> hw.ncpufound=8
> hw.smt=0
> hw.ncpuonline=4
>
> so I get the 4 real cores running out of possibly 8.
You can read up on the micro-architectural risks of the specific cpu you
have, and your usage pattern, and make your own decision. I have machines
where I enable it, but a safe default is the right choice for us to make.
Re: hw.ncpuonline
> I've got an AMD A10 with 4 cores and only 2 are online. I'm not sure how to
> enable the other 2.
>
> hw.ncpufound=4 btw
> Any ideas out there?
OpenBSD disables hyperthreading (or symmetric multithreading, smt), so
if your "4-core" cpu is actually 2 real cores and 2 hyperthreads, then
this sounds perfectly reasonable.
For example, this box of mine (not the same cpu, but still), it looks like this:
hw.ncpufound=8
hw.smt=0
hw.ncpuonline=4
so I get the 4 real cores running out of possibly 8.
--
May the most significant bit of your life be positive.
Re: Iperf3 - Not allowing connections
[...]
> it does not seem
> to work on openBSD, I compiled it from source, and although it binds to
> port 5201 (or so it says), when I try to connect I get:
>
> Unable to connect to remote host: Connection refused
Did you add a rule to /etc/pf.conf to allow connections to that port?
The default pf.conf blocks almost all inbound connections:
https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/etc/pf.conf?annotate=1.55
--
Darren Tucker (dtucker at dtucker.net)
GPG key 11EAA6FA / A86E 3E07 5B19 5880 E860 37F4 9357 ECEF 11EA A6FA (new)
Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.
hw.ncpuonline
I've got an AMD A10 with 4 cores and only 2 are online. I'm not sure how to
enable the other 2.
hw.ncpufound=4 btw
Any ideas out there?
Tia!
hw.ncpuonline
I've got an AMD A10 with 4 cores and only 2 are online. I'm not sure how to
enable the other 2.
hw.ncpufound=4 btw
Any ideas out there?
Tia!
Re: Bwfm problems
I decided to just to symlink the raspberry pi 4 configuration for the
driver, to the filename expected by the bwfm driver, and it loads just
fine now, I have attached the dmesg below:
OpenBSD 7.2 (GENERIC.MP) #5: Wed Jan 11 01:01:10 MST 2023
root@syspatch-72-arm64.openbsd.org:/usr/src/sys/arch/arm64/compile/GENERIC.MP
real mem = 3132207104 (2987MB)
avail mem = 3001634816 (2862MB)
random: good seed from bootblocks
mainbus0 at root: ACPI
psci0 at mainbus0: PSCI 1.1, SMCCC 1.2
cpu0 at mainbus0 mpidr 0: ARM Cortex-A72 r0p3
cpu0: 48KB 64b/line 3-way L1 PIPT I-cache, 32KB 64b/line 2-way L1 D-cache
cpu0: 1024KB 64b/line 16-way L2 cache
cpu0: CRC32,ASID16
cpu1 at mainbus0 mpidr 1: ARM Cortex-A72 r0p3
cpu1: 48KB 64b/line 3-way L1 PIPT I-cache, 32KB 64b/line 2-way L1 D-cache
cpu1: 1024KB 64b/line 16-way L2 cache
cpu1: CRC32,ASID16
cpu2 at mainbus0 mpidr 2: ARM Cortex-A72 r0p3
cpu2: 48KB 64b/line 3-way L1 PIPT I-cache, 32KB 64b/line 2-way L1 D-cache
cpu2: 1024KB 64b/line 16-way L2 cache
cpu2: CRC32,ASID16
cpu3 at mainbus0 mpidr 3: ARM Cortex-A72 r0p3
cpu3: 48KB 64b/line 3-way L1 PIPT I-cache, 32KB 64b/line 2-way L1 D-cache
cpu3: 1024KB 64b/line 16-way L2 cache
cpu3: CRC32,ASID16
efi0 at mainbus0: UEFI 2.7
efi0: https://github.com/pftf/RPi4 rev 0x10000
smbios0 at efi0: SMBIOS 3.3.0
smbios0: vendor https://github.com/pftf/RPi4 version "UEFI Firmware
v1.33" date 03/07/2022
smbios0: Raspberry Pi Foundation Raspberry Pi 4 Model B
apm0 at mainbus0
ampintc0 at mainbus0 nirq 256, ncpu 4 ipi: 0, 1, 2: "interrupt-controller"
agtimer0 at mainbus0: 54000 kHz
acpi0 at mainbus0: ACPI 6.3
acpi0: sleep states
acpi0: tables DSDT FACP CSRT DBG2 GTDT APIC PPTT SPCR SSDT SSDT
acpi0: wakeup devices
"BCM2849" at acpi0 not configured
"BCM2835" at acpi0 not configured
"BCM2854" at acpi0 not configured
"ACPI0007" at acpi0 not configured
"ACPI0007" at acpi0 not configured
"ACPI0007" at acpi0 not configured
"ACPI0007" at acpi0 not configured
"ACPI0004" at acpi0 not configured
"BCM2848" at acpi0 not configured
"BCM2850" at acpi0 not configured
"BCM2856" at acpi0 not configured
"BCM2845" at acpi0 not configured
"BCM2841" at acpi0 not configured
"BCM2841" at acpi0 not configured
"BCM2838" at acpi0 not configured
"BCM2839" at acpi0 not configured
"BCM2844" at acpi0 not configured
pluart0 at acpi0 URT0 addr 0xfe201000/0x1000 irq 153
pluart0: console
"BCM2836" at acpi0 not configured
"BCM2EA6" at acpi0 not configured
"MSFT8000" at acpi0 not configured
sdhc0 at acpi0 SDC1 addr 0xfe300000/0x100 irq 158
sdhc0: SDHC 3.0, 250 MHz base clock
sdmmc0 at sdhc0: 4-bit, sd high-speed, mmc high-speed
bse0 at acpi0 ETH0 addr 0xfd580000/0x10000 irq 189: address
dc:a6:32:78:eb:b1
brgphy0 at bse0 phy 1: BCM54210E 10/100/1000baseT PHY, rev. 2
"PNP0C06" at acpi0 not configured
"ACPI0004" at acpi0 not configured
sdhc1 at acpi0 SDC3 addr 0xfe340000/0x100 irq 158
sdhc1: SDHC 3.0, 100 MHz base clock
sdmmc1 at sdhc1: 8-bit, sd high-speed, mmc high-speed
"ACPI0004" at acpi0 not configured
xhci0 at acpi0 XHC0 addr 0x600000000/0x1000 irq 175, xHCI 1.0
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "Generic xHCI root hub" rev
3.00/1.00 addr 1
acpitz0 at acpi0: critical temperature is 90 degC
scsibus0 at sdmmc1: 2 targets, initiator 0
sd0 at scsibus0 targ 1 lun 0: <SD/MMC, SB32G, 0080> removable
sd0: 30436MB, 512 bytes/sector, 62333952 sectors
bwfm0 at sdmmc0 function 1
manufacturer 0x02d0, product 0xa9a6 at sdmmc0 function 2 not configured
manufacturer 0x02d0, product 0xa9a6 at sdmmc0 function 3 not configured
uhub1 at uhub0 port 1 configuration 1 interface 0 "VIA Labs USB2.0 Hub"
rev 2.10/4.21 addr 2
umass0 at uhub1 port 4 configuration 1 interface 0 "JMicron JMS579" rev
2.10/2.04 addr 3
umass0: using SCSI over Bulk-Only
scsibus1 at umass0: 2 targets, initiator 0
sd1 at scsibus1 targ 1 lun 0: <sobetter, EXT, 0204>
serial.152d0578781113065958
sd1: 238475MB, 512 bytes/sector, 488397168 sectors
axen0 at uhub0 port 3 configuration 1 interface 0 "ASIX Elec. Corp.
AX88179" rev 3.00/1.00 addr 4
axen0: AX88179, address 7c:c2:c6:44:18:53
rgephy0 at axen0 phy 3: RTL8169S/8110S/8211 PHY, rev. 5
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
root on sd1a (92f440dc01ea6e2f.a) swap on sd1b dump on sd1b
WARNING: clock lost 330 days
WARNING: CHECK AND RESET THE DATE!
bwfm0: address dc:a6:32:78:eb:b2
pppoe0: received unexpected PADO
The issue is, the hostap still does not work, it says its active and
hostap has showed up under media, so the driver has detected that it is
supported, and there is no errors, yet when I scan for wifi connections
to connect to, it does not show up:
bwfm0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
lladdr dc:a6:32:78:eb:b2
index 4 priority 4 llprio 3
groups: wlan
media: IEEE802.11 autoselect hostap (autoselect mode 11n hostap)
status: active
ieee80211: nwid PolarianWifi chan 9 bssid dc:a6:32:78:eb:b2
wpakey wpaprotos wpa2 wpaakms psk wpaciphers ccmp wpagroupcipher ccmp
inet 192.168.3.1 netmask 0xffffff00 broadcast 192.168.3.255
I just noticed it has autoselected 11n, the chipset is meant to be ac,
so I assume this could be a possible problem...
See my hostname.bwfm0 configuration below:
inet 192.168.3.1 255.255.255.0
mediaopt hostap
nwid PolarianWifi wpakey <my password> chan 9
I have put <my password> in to hide my actual password, before anyone
comments that is the issue :P
Any suggestions would be useful :)
--
Polarian
GPG signature: 0770E5312238C760
Website: https://polarian.dev
JID/XMPP: polarian@polarian.dev
Re: Iperf3 - Not allowing connections
>
> Thanks for the suggestion, this has worked great, obviously iperf3 does not support openbsd, the reason I do not know.
„Obviously" you are wrong ;-)
pkg_add iperf3
and it works just fine. You can even start the server as a service using rccmd enable iperf3;rccmd start iperf3.
HTH
Mike
Fix for sysutils/fd v8.6.0
in the last update for sysutils/fd v8.6.0 (commit 2023/01/31 20:04:16 by
sthen@), there is an error in patches/patch-Makefile :
$(orefix) instead of $(prefix) to install man1/fd.1 file
With this error, unable to build package for fd-8.6.0. With this fix,
build and package are OK on amd64.
Laurent
Re: Titlebar in firefox and tor-browser
>
> On OpenBSD 7.2 with Fvwm2 (fvwm2-2.6.9p1), Firefox (firefox-107.0) and
> Tor-browser (tor-browser-11.5.6) both appear to not set the window
> titlebar to the current tab's text.
>
> Instead, the titlebar is always set to "Mozilla Firefox" or "Tor
> Browser".
>
> Is this expected? Is there any way to make the titlebar show the
> current Tab's text?
>
> I think OpenBSD 7.0 used to set the titlebar text as expected. I had a
> look in /usr/ports/www/mozilla-firefox/, but couldn't see anything
> obvious.
I can confirm this same functionality on amd64/7.2-stable with MLVWM
(mlvwm-0.9.3) and Firefox (firefox-107.0.1). As the MLVWM developer
(and port maintainer), I know that it, like fvwm in base, only draws
the window title from `WM_TITLE` (C_STRING, STRING, or
COMPOUND_STRING), not the newer `_NET_WM_NAME` (UTF8_STRING)
extension. Due to incompatible licensing, I haven't perused the source
for fvwm2 from ports, so it might differ. My guess is that Firefox has
stopped setting `WM_TITLE` with the tab name and only sets it in the
UTF-8 `_NET_WM_NAME`.
I ran into a related regression in SDL[0][1] a while ago, which has
since been fixed, where they stopped setting `WM_TITLE` because they
felt it was superseded by `_NET_WM_NAME`. According to the ICCCM spec,
`WM_TITLE` should always be set, and for window managers supporting
NetWM/EWMH (Extended Window Manager Hints) where `X_HAVE_UTF8_STRING`,
the window manager should use `_NET_WM_NAME` instead. Unfortunately,
many application developers have decided (incorrectly, IMHO) that this
means `_NET_WM_NAME` replaces `WM_TITLE` and doesn't need to be set
anymore (because it's harder... it's not UTF-8, so they have to check
encodings and encode the string correctly & appropriately.) I know
Thomas Adam, one of the fvwm3 developers, and I have discussed this
particular interpretation before too.
Running `xprop` on a Firefox window with the OpenBSD homepage loaded
confirms my suspicions:
WM_NAME(STRING) = "Mozilla Firefox"
_NET_WM_NAME(UTF8_STRING) = "OpenBSD — Mozilla Firefox"
So, I'd suggest submitting a bug report upstream w/Firefox. (I believe
the Firefox codebase is used for Thunderbird, as well, so I suspect
this issue affects it too.)
[0] - <https://github.com/libsdl-org/SDL/issues/4924#issuecomment-973147103>
[1] - <https://github.com/libsdl-org/SDL/issues/4924#issuecomment-981145120>
--
Morgan Aldridge
Re: Iperf3 - Not allowing connections
I tried pulling this package, but it said it did not exist, so I
attempted to compile from source, so this is a little confusing now, I
will have to check the mirror I am using to see if the mirror is at fault.
Thanks,
--
Polarian
GPG signature: 0770E5312238C760
Website: https://polarian.dev
JID/XMPP: polarian@polarian.dev
Re: Iperf3 - Not allowing connections
Thanks for the suggestion, this has worked great, obviously iperf3 does
not support openbsd, the reason I do not know.
I have identified from testing this, that openbsd does not seem to be
the issue.
For whatever reason, when my linux server tries to send a packet to a
lxc container on itself, it passes back to router, I assumed it was the
router bottlenecking the performance, but it seems it does not even go
only back to the router, but actually goes back to the exchange and then
back to the router and then back to the server and then into the lxc
container.
Something is severely messed up on my linux server, but at least I have
identified the issue.
Thanks for the help,
--
Polarian
GPG signature: 0770E5312238C760
Website: https://polarian.dev
JID/XMPP: polarian@polarian.dev
Re: Iperf3 - Not allowing connections
> If you have an alternative network benchmark tool which does work on
> openBSD please let me know.
tcpbench(1) is in base.
Titlebar in firefox and tor-browser
Tor-browser (tor-browser-11.5.6) both appear to not set the window
titlebar to the current tab's text.
Instead, the titlebar is always set to "Mozilla Firefox" or "Tor
Browser".
Is this expected? Is there any way to make the titlebar show the
current Tab's text?
I think OpenBSD 7.0 used to set the titlebar text as expected. I had a
look in /usr/ports/www/mozilla-firefox/, but couldn't see anything
obvious.
Thanks,
- Julian
--
http://op59.net/
Re: Iperf3 - Not allowing connections
Why compile from source when you have the package already done
https://cdn.openbsd.org/pub/OpenBSD/7.2/packages/amd64/iperf3-3.10.1.tgz
Just FYI.
Hope this help
Daniel
On 1/31/23 4:26 PM, Polarian wrote:
> Hello,
>
> I have been trying to benchmark the network speed to my openbsd router
> using iperf3 (which is a common tool used on Linux) but it does not seem
> to work on openBSD, I compiled it from source, and although it binds to
> port 5201 (or so it says), when I try to connect I get:
>
> Unable to connect to remote host: Connection refused
>
> As the port is unbound, thus nothing is listening on the port. Why is
> this happening, and is there a way to fix it?
>
> There is nothing on dmesg about it, and there is nothing in the syslogs.
>
> If you have an alternative network benchmark tool which does work on
> openBSD please let me know.
>
> Thanks,
Re: aarch64 bulk build report
> http://build-failures.rhaalovely.net/aarch64/2023-01-29/net/qbittorrent/qbittorrent.log
> http://build-failures.rhaalovely.net/aarch64/2023-01-29/net/qbittorrent/qbittorrent-nox.log
Already fixed by adding a missing build dependency.
Iperf3 - Not allowing connections
I have been trying to benchmark the network speed to my openbsd router
using iperf3 (which is a common tool used on Linux) but it does not seem
to work on openBSD, I compiled it from source, and although it binds to
port 5201 (or so it says), when I try to connect I get:
Unable to connect to remote host: Connection refused
As the port is unbound, thus nothing is listening on the port. Why is
this happening, and is there a way to fix it?
There is nothing on dmesg about it, and there is nothing in the syslogs.
If you have an alternative network benchmark tool which does work on
openBSD please let me know.
Thanks,
--
Polarian
GPG signature: 0770E5312238C760
Website: https://polarian.dev
JID/XMPP: polarian@polarian.dev
aarch64 bulk build report
started on Sun Jan 29 06:51:03 MST 2023
finished at Tue Jan 31 14:05:46 MST 2023
lasted 2D07h14m
done with kern.version=OpenBSD 7.2-current (GENERIC.MP) #1996: Sun Jan 29 03:26:34 MST 2023
built packages:11607
Jan 29:3620
Jan 30:1771
Jan 31:6215
critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2023-01-29/summary.log
build failures: 7
http://build-failures.rhaalovely.net/aarch64/2023-01-29/emulators/citra.log
http://build-failures.rhaalovely.net/aarch64/2023-01-29/games/choria.log
http://build-failures.rhaalovely.net/aarch64/2023-01-29/graphics/cfdg.log
http://build-failures.rhaalovely.net/aarch64/2023-01-29/graphics/drawpile.log
http://build-failures.rhaalovely.net/aarch64/2023-01-29/net/qbittorrent/qbittorrent.log
http://build-failures.rhaalovely.net/aarch64/2023-01-29/net/qbittorrent/qbittorrent-nox.log
http://build-failures.rhaalovely.net/aarch64/2023-01-29/sysutils/fd.log
recurrent failures
failures/emulators/citra.log
new failures
+++ ls-failures Tue Jan 31 14:05:57 2023
+failures/games/choria.log
+failures/graphics/cfdg.log
+failures/graphics/drawpile.log
+failures/net/qbittorrent/qbittorrent.log
+failures/net/qbittorrent/qbittorrent-nox.log
+failures/sysutils/fd.log
resolved failures
--- ../old/aarch64/last//ls-failures Fri Jan 27 05:14:14 2023
Re: [update] devel/difftastic 0.42
> ... and switch to using PATCHORIG instead of deleting .orig files from
> cargo-modules. Thanks for the hint, tb@!
Committed. Thanks!
Re: [update] devel/difftastic 0.42
===================================================================
RCS file: /cvs/ports/devel/difftastic/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 30 Jan 2023 13:28:39 -0000 1.3
+++ Makefile 31 Jan 2023 20:34:27 -0000
@@ -2,7 +2,7 @@ COMMENT = diff tool that compares files
GH_ACCOUNT = Wilfred
GH_PROJECT = difftastic
-GH_TAGNAME = 0.40.0
+GH_TAGNAME = 0.42.0
HOMEPAGE = https://difftastic.wilfred.me.uk/
@@ -21,6 +21,8 @@ WANTLIB += ${MODCARGO_WANTLIB} ${COMPI
CONFIGURE_STYLE = cargo
DOCDIR = ${PREFIX}/share/doc/difftastic
+
+PATCHORIG = .orig.port
# Prepare directory for HTML manual
post-extract:
Index: crates.inc
===================================================================
RCS file: /cvs/ports/devel/difftastic/crates.inc,v
retrieving revision 1.2
diff -u -p -r1.2 crates.inc
--- crates.inc 29 Dec 2022 15:31:32 -0000 1.2
+++ crates.inc 31 Jan 2023 20:34:27 -0000
@@ -3,9 +3,9 @@ MODCARGO_CRATES += ansi_term 0.12.1 # MI
MODCARGO_CRATES += atty 0.2.14 # MIT
MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += bitflags 1.3.2 # MIT/Apache-2.0
-MODCARGO_CRATES += bumpalo 3.9.1 # MIT/Apache-2.0
+MODCARGO_CRATES += bumpalo 3.11.1 # MIT/Apache-2.0
MODCARGO_CRATES += bytecount 0.6.2 # Apache-2.0/MIT
-MODCARGO_CRATES += cc 1.0.73 # MIT/Apache-2.0
+MODCARGO_CRATES += cc 1.0.78 # MIT OR Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
MODCARGO_CRATES += clap 3.1.18 # MIT OR Apache-2.0
MODCARGO_CRATES += clap_lex 0.2.0 # MIT OR Apache-2.0
@@ -51,8 +51,8 @@ MODCARGO_CRATES += proc-macro2 1.0.39 #
MODCARGO_CRATES += quick-error 1.2.3 # MIT/Apache-2.0
MODCARGO_CRATES += quote 1.0.18 # MIT OR Apache-2.0
MODCARGO_CRATES += radix-heap 0.4.2 # MIT
-MODCARGO_CRATES += rayon 1.5.3 # MIT OR Apache-2.0
-MODCARGO_CRATES += rayon-core 1.9.3 # MIT OR Apache-2.0
+MODCARGO_CRATES += rayon 1.6.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += rayon-core 1.10.1 # MIT OR Apache-2.0
MODCARGO_CRATES += regex 1.5.6 # MIT OR Apache-2.0
MODCARGO_CRATES += regex-syntax 0.6.26 # MIT OR Apache-2.0
MODCARGO_CRATES += rustc-hash 1.1.0 # Apache-2.0/MIT
@@ -67,7 +67,7 @@ MODCARGO_CRATES += terminal_size 0.1.17
MODCARGO_CRATES += terminal_size 0.2.1 # MIT OR Apache-2.0
MODCARGO_CRATES += textwrap 0.15.0 # MIT
MODCARGO_CRATES += tree-sitter 0.20.9 # MIT
-MODCARGO_CRATES += tree_magic_mini 3.0.3 # MIT
+MODCARGO_CRATES += tree_magic_mini 3.0.3 # MIT
MODCARGO_CRATES += typed-arena 2.0.1 # MIT
MODCARGO_CRATES += unicode-ident 1.0.0 # MIT OR Apache-2.0
MODCARGO_CRATES += unicode-width 0.1.9 # MIT/Apache-2.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/difftastic/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 29 Dec 2022 15:31:32 -0000 1.2
+++ distinfo 31 Jan 2023 20:34:27 -0000
@@ -3,9 +3,9 @@ SHA256 (cargo/ansi_term-0.12.1.tar.gz) =
SHA256 (cargo/atty-0.2.14.tar.gz) = 2bOb4Ydw0RQhzbG5lHpF3T836TCSy/N3YUgooxnV/ug=
SHA256 (cargo/autocfg-1.1.0.tar.gz) = 1GiAK6sXy8DMV16bBT9B5yqja/prf1XjUp/6QxYbl/o=
SHA256 (cargo/bitflags-1.3.2.tar.gz) = vvONRRY8Lx3eCUp9/TPM9ZXJKQXI+PT9wY0G+xA3cYo=
-SHA256 (cargo/bumpalo-3.9.1.tar.gz) = pKRaRqsfJBLlPToK3nb/rSAlgEKUVpquOHIxoM1uCJk=
+SHA256 (cargo/bumpalo-3.11.1.tar.gz) = Vy9pUTYhEYgwjxatLKXIUacSxGQGCuaXSURFjrg4gLo=
SHA256 (cargo/bytecount-0.6.2.tar.gz) = cv6zH/yGSY2s29D867VhOOcXeozFzqRRYDHRWuhadC4=
-SHA256 (cargo/cc-1.0.73.tar.gz) = L/8qaSezu4f5WV1nGWpwST9idoenHYeg1pIkLDP1jBE=
+SHA256 (cargo/cc-1.0.78.tar.gz) = ogEE4jNc6KZZ1t2SpRp2egwGJZnHOzQ/0VLLQB6CjD0=
SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0=
SHA256 (cargo/clap-3.1.18.tar.gz) = 0tvfS9rLM0ZuhUzoie7o39Vymr98zXZk0KLWDNOERAs=
SHA256 (cargo/clap_lex-0.2.0.tar.gz) = o3w18REtrV5uCxra/3mFB0l6GPzuswzOs7rn0UJ7khM=
@@ -51,8 +51,8 @@ SHA256 (cargo/proc-macro2-1.0.39.tar.gz)
SHA256 (cargo/quick-error-1.2.3.tar.gz) = odAZQdgvoqtQvh555nFCid183njrpMB0vFpDdPZQ3+A=
SHA256 (cargo/quote-1.0.18.tar.gz) = of61TtaTuTqE4UCUlDuEt8Tq4gTFErfMuVqwxm0nitE=
SHA256 (cargo/radix-heap-0.4.2.tar.gz) = Wf/snfRkATKVtJkpiBHmo94xv4EoCSE1gmUX2xLe5gE=
-SHA256 (cargo/rayon-1.5.3.tar.gz) = vZnldy6ti6pSFSeMmxW/kgh3CenBstH5fNtaGDyTOn0=
-SHA256 (cargo/rayon-core-1.9.3.tar.gz) = JYvNtaxtrUhJG7KZLba3z3SHiwOEkIrxJII9EYyZaD8=
+SHA256 (cargo/rayon-1.6.1.tar.gz) = bbOiE63wKzvP0tOEa7QcsihX0TF4ngHfQ0+357wHWbc=
+SHA256 (cargo/rayon-core-1.10.1.tar.gz) = ysQQr10Aq2iEUotKtp0ejhRujUcSAYAPobRSQSbeatM=
SHA256 (cargo/regex-1.5.6.tar.gz) = 2D8SfZS9vNpMjMLlD2+E9LYR9pyQJpnKOFo5w6dfn/E=
SHA256 (cargo/regex-syntax-0.6.26.tar.gz) = SbPensXcCjQX2jcaqxfXKZl8FQEOf9JP9wd3OjO922Q=
SHA256 (cargo/rustc-hash-1.1.0.tar.gz) = CNQ/eqawjUnzgs3mp5ggR8NCbblJsUJLxLfsmuEsbOI=
@@ -85,15 +85,15 @@ SHA256 (cargo/windows_i686_msvc-0.36.1.t
SHA256 (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = Tc0XG4d2xBuXUh5doSei2GrSgBFIB9Cyqx5GK8dk2eE=
SHA256 (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = yBHKSoyFPvQgq9hZK6U927rJBBD6tpA7PnmXKmMfdoA=
SHA256 (cargo/wu-diff-0.1.2.tar.gz) = jj5nNfzeBkMocNuNydfjqxuTcnwU6u8ymWlCYpnyiJM=
-SHA256 (difftastic-0.40.0.tar.gz) = xURXP5TY0eRkaDyd/V1jAOBQL8yb6jSdLJQiz05M70E=
+SHA256 (difftastic-0.42.0.tar.gz) = 7/xW5MAAsAM66jmvCKy7xk1QHGN1j45J5LMEm+on2TA=
SIZE (cargo/aho-corasick-0.7.18.tar.gz) = 112923
SIZE (cargo/ansi_term-0.12.1.tar.gz) = 24838
SIZE (cargo/atty-0.2.14.tar.gz) = 5470
SIZE (cargo/autocfg-1.1.0.tar.gz) = 13272
SIZE (cargo/bitflags-1.3.2.tar.gz) = 23021
-SIZE (cargo/bumpalo-3.9.1.tar.gz) = 77507
+SIZE (cargo/bumpalo-3.11.1.tar.gz) = 81207
SIZE (cargo/bytecount-0.6.2.tar.gz) = 12347
-SIZE (cargo/cc-1.0.73.tar.gz) = 57880
+SIZE (cargo/cc-1.0.78.tar.gz) = 61375
SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934
SIZE (cargo/clap-3.1.18.tar.gz) = 209664
SIZE (cargo/clap_lex-0.2.0.tar.gz) = 9581
@@ -139,8 +139,8 @@ SIZE (cargo/proc-macro2-1.0.39.tar.gz) =
SIZE (cargo/quick-error-1.2.3.tar.gz) = 15066
SIZE (cargo/quote-1.0.18.tar.gz) = 28911
SIZE (cargo/radix-heap-0.4.2.tar.gz) = 9323
-SIZE (cargo/rayon-1.5.3.tar.gz) = 167246
-SIZE (cargo/rayon-core-1.9.3.tar.gz) = 65300
+SIZE (cargo/rayon-1.6.1.tar.gz) = 166330
+SIZE (cargo/rayon-core-1.10.1.tar.gz) = 70008
SIZE (cargo/regex-1.5.6.tar.gz) = 238593
SIZE (cargo/regex-syntax-0.6.26.tar.gz) = 293912
SIZE (cargo/rustc-hash-1.1.0.tar.gz) = 9331
@@ -173,4 +173,4 @@ SIZE (cargo/windows_i686_msvc-0.36.1.tar
SIZE (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = 790934
SIZE (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = 661999
SIZE (cargo/wu-diff-0.1.2.tar.gz) = 33439
-SIZE (difftastic-0.40.0.tar.gz) = 28787155
+SIZE (difftastic-0.42.0.tar.gz) = 50324806
Index: patches/patch-Cargo_lock
===================================================================
RCS file: /cvs/ports/devel/difftastic/patches/patch-Cargo_lock,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Cargo_lock
--- patches/patch-Cargo_lock 29 Dec 2022 15:31:32 -0000 1.1
+++ patches/patch-Cargo_lock 31 Jan 2023 20:34:27 -0000
@@ -3,7 +3,7 @@ https://github.com/Wilfred/difftastic/co
Index: Cargo.lock
--- Cargo.lock.orig
+++ Cargo.lock
-@@ -637,8 +637,9 @@ dependencies = [
+@@ -635,8 +635,9 @@ dependencies = [
[[package]]
name = "tree_magic_mini"
Index: patches/patch-Cargo_toml
===================================================================
RCS file: /cvs/ports/devel/difftastic/patches/patch-Cargo_toml,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Cargo_toml
--- patches/patch-Cargo_toml 29 Dec 2022 15:31:32 -0000 1.1
+++ patches/patch-Cargo_toml 31 Jan 2023 20:34:27 -0000
@@ -6,10 +6,10 @@ Index: Cargo.toml
@@ -51,7 +51,7 @@ const_format = "0.2.22"
owo-colors = "3.3.0"
wu-diff = "0.1.2"
- rayon = "1.5.2"
+ rayon = "1.6.1"
-tree_magic_mini = "3.0.2"
+tree_magic_mini = "3.0.3"
- bumpalo = "3.9.1"
+ bumpalo = "3.11.1"
unicode-width = "0.1.9"
term_size = "0.3.2"
@@ -73,6 +73,3 @@ path = "src/main.rs"
Index: patches/patch-manual_book_toml
===================================================================
RCS file: patches/patch-manual_book_toml
diff -N patches/patch-manual_book_toml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-manual_book_toml 31 Jan 2023 20:34:27 -0000
@@ -0,0 +1,11 @@
+Index: manual/book.toml
+--- manual/book.toml.orig
++++ manual/book.toml
+@@ -7,6 +7,7 @@ description = "The official manual for difftastic, the
+
+ [output.html]
+ git-repository-url = "https://github.com/wilfred/difftastic"
++copy-fonts = false
+
+ [output.html.redirect]
+ "/getting_started.html" = "./installation.html"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/difftastic/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 8 Nov 2022 14:54:43 -0000 1.1.1.1
+++ pkg/PLIST 31 Jan 2023 20:34:27 -0000
@@ -26,21 +26,6 @@ share/doc/difftastic/diffing.html
share/doc/difftastic/elasticlunr.min.js
share/doc/difftastic/favicon.png
share/doc/difftastic/favicon.svg
-share/doc/difftastic/fonts/
-share/doc/difftastic/fonts/OPEN-SANS-LICENSE.txt
-share/doc/difftastic/fonts/SOURCE-CODE-PRO-LICENSE.txt
-share/doc/difftastic/fonts/fonts.css
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-300.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-300italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-600.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-600italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-700.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-700italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-800.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-800italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-regular.woff2
-share/doc/difftastic/fonts/source-code-pro-v11-all-charsets-500.woff2
share/doc/difftastic/getting_started.html
share/doc/difftastic/git.html
share/doc/difftastic/glossary.html
... and switch to using PATCHORIG instead of deleting .orig files from
cargo-modules. Thanks for the hint, tb@!
> Updated diff to CVS head.
>
> On 1/29/23 19:41, Volker Schlecht wrote:
>> * Update devel/difftastic to release 0.42
>> * Get rid of the Cargo.toml.orig files in extracted crates to make
>> update-patches less painful
>> * patch book.toml to not copy and install Open Sans and Source Code
>> Pro webfonts with the html documentation
Re: NEW sysutils/borgbackup-2.0.0b4
> The below diff was obtained by looking at the diff between our x86gas.pl
> and what openssl have. It is basically libcrypto/perlasm/x86gas.pl -r1.5.
>
> With this diff, borgbackup/2.0 builds and passes regress on i386,
> openssl/1.1 regress also passes (modulo known shlibload test breakage).
OK, that's much nicer, thanks.
Re: [update] devel/difftastic 0.42
===================================================================
RCS file: /cvs/ports/devel/difftastic/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 30 Jan 2023 13:28:39 -0000 1.3
+++ Makefile 31 Jan 2023 20:10:02 -0000
@@ -2,7 +2,7 @@ COMMENT = diff tool that compares files
GH_ACCOUNT = Wilfred
GH_PROJECT = difftastic
-GH_TAGNAME = 0.40.0
+GH_TAGNAME = 0.42.0
HOMEPAGE = https://difftastic.wilfred.me.uk/
@@ -27,6 +27,10 @@ post-extract:
sed -i 's/DFT_VERSION_HERE/${GH_TAGNAME}/g' \
${WRKSRC}/manual/src/introduction.md
sed -i '18,20d' ${WRKSRC}/manual/book.toml
+
+# Get rid of the Cargo.toml.orig files in extracted crates
+pre-patch:
+ find ${WRKSRC}/modcargo-crates -name '*.orig' -delete
# Build and install HTML manual with mdBook
pre-install:
Index: crates.inc
===================================================================
RCS file: /cvs/ports/devel/difftastic/crates.inc,v
retrieving revision 1.2
diff -u -p -r1.2 crates.inc
--- crates.inc 29 Dec 2022 15:31:32 -0000 1.2
+++ crates.inc 31 Jan 2023 20:10:02 -0000
@@ -3,9 +3,9 @@ MODCARGO_CRATES += ansi_term 0.12.1 # MI
MODCARGO_CRATES += atty 0.2.14 # MIT
MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += bitflags 1.3.2 # MIT/Apache-2.0
-MODCARGO_CRATES += bumpalo 3.9.1 # MIT/Apache-2.0
+MODCARGO_CRATES += bumpalo 3.11.1 # MIT/Apache-2.0
MODCARGO_CRATES += bytecount 0.6.2 # Apache-2.0/MIT
-MODCARGO_CRATES += cc 1.0.73 # MIT/Apache-2.0
+MODCARGO_CRATES += cc 1.0.78 # MIT OR Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
MODCARGO_CRATES += clap 3.1.18 # MIT OR Apache-2.0
MODCARGO_CRATES += clap_lex 0.2.0 # MIT OR Apache-2.0
@@ -51,8 +51,8 @@ MODCARGO_CRATES += proc-macro2 1.0.39 #
MODCARGO_CRATES += quick-error 1.2.3 # MIT/Apache-2.0
MODCARGO_CRATES += quote 1.0.18 # MIT OR Apache-2.0
MODCARGO_CRATES += radix-heap 0.4.2 # MIT
-MODCARGO_CRATES += rayon 1.5.3 # MIT OR Apache-2.0
-MODCARGO_CRATES += rayon-core 1.9.3 # MIT OR Apache-2.0
+MODCARGO_CRATES += rayon 1.6.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += rayon-core 1.10.1 # MIT OR Apache-2.0
MODCARGO_CRATES += regex 1.5.6 # MIT OR Apache-2.0
MODCARGO_CRATES += regex-syntax 0.6.26 # MIT OR Apache-2.0
MODCARGO_CRATES += rustc-hash 1.1.0 # Apache-2.0/MIT
@@ -67,7 +67,7 @@ MODCARGO_CRATES += terminal_size 0.1.17
MODCARGO_CRATES += terminal_size 0.2.1 # MIT OR Apache-2.0
MODCARGO_CRATES += textwrap 0.15.0 # MIT
MODCARGO_CRATES += tree-sitter 0.20.9 # MIT
-MODCARGO_CRATES += tree_magic_mini 3.0.3 # MIT
+MODCARGO_CRATES += tree_magic_mini 3.0.3 # MIT
MODCARGO_CRATES += typed-arena 2.0.1 # MIT
MODCARGO_CRATES += unicode-ident 1.0.0 # MIT OR Apache-2.0
MODCARGO_CRATES += unicode-width 0.1.9 # MIT/Apache-2.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/difftastic/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 29 Dec 2022 15:31:32 -0000 1.2
+++ distinfo 31 Jan 2023 20:10:02 -0000
@@ -3,9 +3,9 @@ SHA256 (cargo/ansi_term-0.12.1.tar.gz) =
SHA256 (cargo/atty-0.2.14.tar.gz) = 2bOb4Ydw0RQhzbG5lHpF3T836TCSy/N3YUgooxnV/ug=
SHA256 (cargo/autocfg-1.1.0.tar.gz) = 1GiAK6sXy8DMV16bBT9B5yqja/prf1XjUp/6QxYbl/o=
SHA256 (cargo/bitflags-1.3.2.tar.gz) = vvONRRY8Lx3eCUp9/TPM9ZXJKQXI+PT9wY0G+xA3cYo=
-SHA256 (cargo/bumpalo-3.9.1.tar.gz) = pKRaRqsfJBLlPToK3nb/rSAlgEKUVpquOHIxoM1uCJk=
+SHA256 (cargo/bumpalo-3.11.1.tar.gz) = Vy9pUTYhEYgwjxatLKXIUacSxGQGCuaXSURFjrg4gLo=
SHA256 (cargo/bytecount-0.6.2.tar.gz) = cv6zH/yGSY2s29D867VhOOcXeozFzqRRYDHRWuhadC4=
-SHA256 (cargo/cc-1.0.73.tar.gz) = L/8qaSezu4f5WV1nGWpwST9idoenHYeg1pIkLDP1jBE=
+SHA256 (cargo/cc-1.0.78.tar.gz) = ogEE4jNc6KZZ1t2SpRp2egwGJZnHOzQ/0VLLQB6CjD0=
SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0=
SHA256 (cargo/clap-3.1.18.tar.gz) = 0tvfS9rLM0ZuhUzoie7o39Vymr98zXZk0KLWDNOERAs=
SHA256 (cargo/clap_lex-0.2.0.tar.gz) = o3w18REtrV5uCxra/3mFB0l6GPzuswzOs7rn0UJ7khM=
@@ -51,8 +51,8 @@ SHA256 (cargo/proc-macro2-1.0.39.tar.gz)
SHA256 (cargo/quick-error-1.2.3.tar.gz) = odAZQdgvoqtQvh555nFCid183njrpMB0vFpDdPZQ3+A=
SHA256 (cargo/quote-1.0.18.tar.gz) = of61TtaTuTqE4UCUlDuEt8Tq4gTFErfMuVqwxm0nitE=
SHA256 (cargo/radix-heap-0.4.2.tar.gz) = Wf/snfRkATKVtJkpiBHmo94xv4EoCSE1gmUX2xLe5gE=
-SHA256 (cargo/rayon-1.5.3.tar.gz) = vZnldy6ti6pSFSeMmxW/kgh3CenBstH5fNtaGDyTOn0=
-SHA256 (cargo/rayon-core-1.9.3.tar.gz) = JYvNtaxtrUhJG7KZLba3z3SHiwOEkIrxJII9EYyZaD8=
+SHA256 (cargo/rayon-1.6.1.tar.gz) = bbOiE63wKzvP0tOEa7QcsihX0TF4ngHfQ0+357wHWbc=
+SHA256 (cargo/rayon-core-1.10.1.tar.gz) = ysQQr10Aq2iEUotKtp0ejhRujUcSAYAPobRSQSbeatM=
SHA256 (cargo/regex-1.5.6.tar.gz) = 2D8SfZS9vNpMjMLlD2+E9LYR9pyQJpnKOFo5w6dfn/E=
SHA256 (cargo/regex-syntax-0.6.26.tar.gz) = SbPensXcCjQX2jcaqxfXKZl8FQEOf9JP9wd3OjO922Q=
SHA256 (cargo/rustc-hash-1.1.0.tar.gz) = CNQ/eqawjUnzgs3mp5ggR8NCbblJsUJLxLfsmuEsbOI=
@@ -85,15 +85,15 @@ SHA256 (cargo/windows_i686_msvc-0.36.1.t
SHA256 (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = Tc0XG4d2xBuXUh5doSei2GrSgBFIB9Cyqx5GK8dk2eE=
SHA256 (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = yBHKSoyFPvQgq9hZK6U927rJBBD6tpA7PnmXKmMfdoA=
SHA256 (cargo/wu-diff-0.1.2.tar.gz) = jj5nNfzeBkMocNuNydfjqxuTcnwU6u8ymWlCYpnyiJM=
-SHA256 (difftastic-0.40.0.tar.gz) = xURXP5TY0eRkaDyd/V1jAOBQL8yb6jSdLJQiz05M70E=
+SHA256 (difftastic-0.42.0.tar.gz) = 7/xW5MAAsAM66jmvCKy7xk1QHGN1j45J5LMEm+on2TA=
SIZE (cargo/aho-corasick-0.7.18.tar.gz) = 112923
SIZE (cargo/ansi_term-0.12.1.tar.gz) = 24838
SIZE (cargo/atty-0.2.14.tar.gz) = 5470
SIZE (cargo/autocfg-1.1.0.tar.gz) = 13272
SIZE (cargo/bitflags-1.3.2.tar.gz) = 23021
-SIZE (cargo/bumpalo-3.9.1.tar.gz) = 77507
+SIZE (cargo/bumpalo-3.11.1.tar.gz) = 81207
SIZE (cargo/bytecount-0.6.2.tar.gz) = 12347
-SIZE (cargo/cc-1.0.73.tar.gz) = 57880
+SIZE (cargo/cc-1.0.78.tar.gz) = 61375
SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934
SIZE (cargo/clap-3.1.18.tar.gz) = 209664
SIZE (cargo/clap_lex-0.2.0.tar.gz) = 9581
@@ -139,8 +139,8 @@ SIZE (cargo/proc-macro2-1.0.39.tar.gz) =
SIZE (cargo/quick-error-1.2.3.tar.gz) = 15066
SIZE (cargo/quote-1.0.18.tar.gz) = 28911
SIZE (cargo/radix-heap-0.4.2.tar.gz) = 9323
-SIZE (cargo/rayon-1.5.3.tar.gz) = 167246
-SIZE (cargo/rayon-core-1.9.3.tar.gz) = 65300
+SIZE (cargo/rayon-1.6.1.tar.gz) = 166330
+SIZE (cargo/rayon-core-1.10.1.tar.gz) = 70008
SIZE (cargo/regex-1.5.6.tar.gz) = 238593
SIZE (cargo/regex-syntax-0.6.26.tar.gz) = 293912
SIZE (cargo/rustc-hash-1.1.0.tar.gz) = 9331
@@ -173,4 +173,4 @@ SIZE (cargo/windows_i686_msvc-0.36.1.tar
SIZE (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = 790934
SIZE (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = 661999
SIZE (cargo/wu-diff-0.1.2.tar.gz) = 33439
-SIZE (difftastic-0.40.0.tar.gz) = 28787155
+SIZE (difftastic-0.42.0.tar.gz) = 50324806
Index: patches/patch-Cargo_lock
===================================================================
RCS file: /cvs/ports/devel/difftastic/patches/patch-Cargo_lock,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Cargo_lock
--- patches/patch-Cargo_lock 29 Dec 2022 15:31:32 -0000 1.1
+++ patches/patch-Cargo_lock 31 Jan 2023 20:10:02 -0000
@@ -3,7 +3,7 @@ https://github.com/Wilfred/difftastic/co
Index: Cargo.lock
--- Cargo.lock.orig
+++ Cargo.lock
-@@ -637,8 +637,9 @@ dependencies = [
+@@ -635,8 +635,9 @@ dependencies = [
[[package]]
name = "tree_magic_mini"
Index: patches/patch-Cargo_toml
===================================================================
RCS file: /cvs/ports/devel/difftastic/patches/patch-Cargo_toml,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Cargo_toml
--- patches/patch-Cargo_toml 29 Dec 2022 15:31:32 -0000 1.1
+++ patches/patch-Cargo_toml 31 Jan 2023 20:10:02 -0000
@@ -6,10 +6,10 @@ Index: Cargo.toml
@@ -51,7 +51,7 @@ const_format = "0.2.22"
owo-colors = "3.3.0"
wu-diff = "0.1.2"
- rayon = "1.5.2"
+ rayon = "1.6.1"
-tree_magic_mini = "3.0.2"
+tree_magic_mini = "3.0.3"
- bumpalo = "3.9.1"
+ bumpalo = "3.11.1"
unicode-width = "0.1.9"
term_size = "0.3.2"
@@ -73,6 +73,3 @@ path = "src/main.rs"
Index: patches/patch-manual_book_toml
===================================================================
RCS file: patches/patch-manual_book_toml
diff -N patches/patch-manual_book_toml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-manual_book_toml 31 Jan 2023 20:10:02 -0000
@@ -0,0 +1,11 @@
+Index: manual/book.toml
+--- manual/book.toml.orig
++++ manual/book.toml
+@@ -7,6 +7,7 @@ description = "The official manual for difftastic, the
+
+ [output.html]
+ git-repository-url = "https://github.com/wilfred/difftastic"
++copy-fonts = false
+
+ [output.html.redirect]
+ "/getting_started.html" = "./installation.html"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/difftastic/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 8 Nov 2022 14:54:43 -0000 1.1.1.1
+++ pkg/PLIST 31 Jan 2023 20:10:02 -0000
@@ -26,21 +26,6 @@ share/doc/difftastic/diffing.html
share/doc/difftastic/elasticlunr.min.js
share/doc/difftastic/favicon.png
share/doc/difftastic/favicon.svg
-share/doc/difftastic/fonts/
-share/doc/difftastic/fonts/OPEN-SANS-LICENSE.txt
-share/doc/difftastic/fonts/SOURCE-CODE-PRO-LICENSE.txt
-share/doc/difftastic/fonts/fonts.css
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-300.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-300italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-600.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-600italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-700.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-700italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-800.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-800italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-italic.woff2
-share/doc/difftastic/fonts/open-sans-v17-all-charsets-regular.woff2
-share/doc/difftastic/fonts/source-code-pro-v11-all-charsets-500.woff2
share/doc/difftastic/getting_started.html
share/doc/difftastic/git.html
share/doc/difftastic/glossary.html
Updated diff to CVS head.
On 1/29/23 19:41, Volker Schlecht wrote:
> * Update devel/difftastic to release 0.42
> * Get rid of the Cargo.toml.orig files in extracted crates to make
> update-patches less painful
> * patch book.toml to not copy and install Open Sans and Source Code Pro
> webfonts with the html documentation
Re: NEW sysutils/borgbackup-2.0.0b4
> The below diff was obtained by looking at the diff between our x86gas.pl
> and what openssl have. It is basically libcrypto/perlasm/x86gas.pl -r1.5.
>
> With this diff, borgbackup/2.0 builds and passes regress on i386,
> openssl/1.1 regress also passes (modulo known shlibload test breakage).
That looks like a better diff than the one i send.
If it works for you, OK bket@
Re: NEW sysutils/borgbackup-2.0.0b4
and what openssl have. It is basically libcrypto/perlasm/x86gas.pl -r1.5.
With this diff, borgbackup/2.0 builds and passes regress on i386,
openssl/1.1 regress also passes (modulo known shlibload test breakage).
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/openssl/1.1/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile 29 Jan 2023 07:38:26 -0000 1.52
+++ Makefile 31 Jan 2023 18:24:18 -0000
@@ -8,7 +8,7 @@ PORTROACH= limit:^1\.1\.[0-9][a-z] skipb
V= 1.1.1s
PKGSPEC= openssl->=1.1.0v0,<1.2v0
EPOCH= 0
-REVISION= 6
+REVISION= 7
SHLIBVER= 11.6
SHARED_LIBS= crypto ${SHLIBVER} \
Index: patches/patch-crypto_perlasm_x86gas_pl
===================================================================
RCS file: patches/patch-crypto_perlasm_x86gas_pl
diff -N patches/patch-crypto_perlasm_x86gas_pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-crypto_perlasm_x86gas_pl 31 Jan 2023 18:54:48 -0000
@@ -0,0 +1,16 @@
+Index: crypto/perlasm/x86gas.pl
+--- crypto/perlasm/x86gas.pl.orig
++++ crypto/perlasm/x86gas.pl
+@@ -166,10 +166,8 @@ sub ::file_end
+ }
+ }
+ if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) {
+- my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,16";
+- if ($::macosx) { push (@out,"$tmp,2\n"); }
+- elsif ($::elf) { push (@out,"$tmp,4\n"); }
+- else { push (@out,"$tmp\n"); }
++ push (@out, ".extern\t${nmdecor}OPENSSL_ia32cap_P\n");
++ push (@out, ".hidden\t${nmdecor}OPENSSL_ia32cap_P\n");
+ }
+ push(@out,$initseg) if ($initseg);
+ }
cannot attach files in sogo webmail with non ascii symbols in filename
I noticed that I cannot attach files with non ascii symbols in filename using sogo webmail.
There is an entry in /var/log/sogo/sogo.log:
sogod[82818:12065535212040] EXCEPTION: <NSException: 0xaf9a8d06188> NAME:NSCharacterConversionException REASON:Can't get cString from Unicode string. INFO:(null)
After some googling I found out that sogo uses GNUstep as a dependency
and it requires the following envvar to be set for _sogo user:
$ export GNUSTEP_STRING_ENCODING=NSUTF8StringEncoding
When I launch sogo the following way:
su - _sogo -c 'GNUSTEP_STRING_ENCODING=NSUTF8StringEncoding sogod'
it works and there are no problems with adding attachments.
The question is: what is the best way to set this envvar for sogod
daemon so that I can control the sogod service using usual rcctl commands?
May be it would not harm to hardcode this setting in the package?
--
Maksim Rodin
mips64 bulk build report
started on Sun Jan 15 16:25:31 UTC 2023
finished at Sat Jan 28 17:23:22 UTC 2023
lasted 14D00h57m
done with kern.version=OpenBSD 7.2-current (GENERIC.MP) #1161: Sun Jan 15 03:30:27 MST 2023
built packages:9060
Jan 15:1493
Jan 16:1044
Jan 17:717
Jan 18:740
Jan 19:722
Jan 20:1234
Jan 21:544
Jan 23:261
Jan 24:393
Jan 25:376
Jan 27:1531
Jan 28:4
build failures: 78
http://build-failures.rhaalovely.net/mips64/2023-01-15/audio/espeak.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/chinese/libpinyin.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/databases/postgresql-pllua.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/devel/clang-tools-extra.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/devel/go-sys.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/devel/protobuf.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/devel/py-thrift,python3.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/devel/py-unicorn,python3.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/devel/sdcc.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/emulators/openmsx.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/emulators/spike.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/games/astromenace.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/games/hyperrogue.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/games/wesnoth.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/games/witchblast.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/geo/gpstk.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/graphics/enblend-enfuse.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/graphics/openvdb.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/lang/STk.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/lang/gambit.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/lang/gforth.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/lang/librep.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/lang/pfe.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/lang/php/8.1.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/lang/php/8.2.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/mail/opensmtpd-filters/rspamd.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/math/gbc.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/math/igraph.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/math/lean.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/math/lrs.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/math/mlpack,-main.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/math/ntl.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/misc/remind.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/multimedia/assimp.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/net/eduvpn/vpn-daemon.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/net/gortr.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/net/gtk-gnutella.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/net/icinga/core2.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/net/minio/client.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/net/minio/server.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/net/powerdns_recursor.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/net/syncthing.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/net/utox.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/plan9/drawterm.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/security/botan2.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/security/go-siphash.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/security/gobuster.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/security/step-cli.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/security/vault.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/shells/elvish.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/amazon-ecs-cli.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/ansible.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/beats/filebeat.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/beats/heartbeat.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/beats/metricbeat.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/beats/packetbeat.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/dep.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/direnv.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/gitlab-runner.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/kubectl.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/nomad.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/rclone.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/telegraf.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/terragrunt.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/u-boot,aarch64.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/sysutils/u-boot-asahi.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/telephony/asterisk/16.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/telephony/asterisk/18.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/telephony/asterisk/20.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/textproc/go-text.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/textproc/mupdf.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/textproc/p5-SWISH-API.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/textproc/uni.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/x11/gnome/secrets.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/x11/jgmenu.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/x11/qt5/qtbase.log
http://build-failures.rhaalovely.net/mips64/2023-01-15/x11/qt6/qtbase.log
Re: devel/abseil-cpp: update to LTS 20230125
> 30.01.2023 17:27, Klemens Nanni пишет:
> > https://github.com/abseil/abseil-cpp/releases/tag/20230125.0
> >
> > One diff got merged, the other about disabled PowerPC bits remains, but
> > moved code to a new file.
> >
> > To avoid churn in every update diff, I've folded library handling so
> > that only one line changes version and others possibly lose/gain names.
> >
> > If that seems fine, I'm inclined to do that mechanical move first and
> > then commit the update separately so this bump already benefits from it
> > as it adds new libraries.
>
> This proved useful to defer test compilation and thus reduce build time
> by more than 50%, so I just committed those bits.
>
> do-build and do-test now compile 247 and 392 files, respectively.
>
> > tg_owt and tdesktop build and run fine on amd64.
> >
> > ---
> > 98% tests passed, 4 tests failed out of 203
> >
> > Total Test time (real) = 187.86 sec
> >
> > The following tests FAILED:
> > 90 - absl_log_stripping_test (Failed)
> > 155 - absl_charconv_test (Failed)
> > 163 - absl_str_format_convert_test (Failed)
> > 191 - absl_time_test (Failed)
> > ---
> >
> > Feedback? OK?
>
> With this update,
> do-build and do-test now compile 307 and 454 files, respectively.
Rebased after more cleanup and jca's clang 15 fix for tests.
Sorry for the noise.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 31 Jan 2023 16:10:53 -0000 1.11
+++ Makefile 31 Jan 2023 16:14:08 -0000
@@ -1,9 +1,9 @@
-COMMENT = abseil common libraries (c++)
+COMMENT = abseil common libraries (C++)
CATEGORIES = devel
GH_ACCOUNT = abseil
GH_PROJECT = ${GH_ACCOUNT}-cpp
-GH_TAGNAME = 20220623.1
+GH_TAGNAME = 20230125.0
HOMEPAGE = https://abseil.io/
@@ -16,15 +16,19 @@ PERMIT_PACKAGE = Yes
ABSL_LIBS = \
bad_any_cast_impl bad_optional_access bad_variant_access base city \
civil_time cord cord_internal cordz_functions cordz_handle cordz_info \
- cordz_sample_token debugging_internal demangle_internal examine_stack \
+ cordz_sample_token crc32c crc_cord_state crc_cpu_detect crc_internal \
+ debugging_internal demangle_internal die_if_null examine_stack \
exponential_biased failure_signal_handler flags flags_commandlineflag \
flags_commandlineflag_internal flags_config flags_internal \
flags_marshalling flags_parse flags_private_handle_accessor \
flags_program_name flags_reflection flags_usage flags_usage_internal \
- graphcycles_internal hash hashtablez_sampler int128 log_severity \
- low_level_hash malloc_internal periodic_sampler random_distributions \
- random_internal_distribution_test_util random_internal_platform \
- random_internal_pool_urbg random_internal_randen \
+ graphcycles_internal hash hashtablez_sampler int128 log_entry log_flags \
+ log_globals log_initialize log_internal_check_op log_internal_conditions \
+ log_internal_format log_internal_globals log_internal_log_sink_set \
+ log_internal_message log_internal_nullguard log_internal_proto \
+ log_severity log_sink low_level_hash malloc_internal periodic_sampler \
+ random_distributions random_internal_distribution_test_util \
+ random_internal_platform random_internal_pool_urbg random_internal_randen \
random_internal_randen_hwaes random_internal_randen_hwaes_impl \
random_internal_randen_slow random_internal_seed_material \
random_seed_gen_exception random_seed_sequences raw_hash_set \
@@ -32,7 +36,7 @@ ABSL_LIBS = \
statusor str_format_internal strerror strings strings_internal symbolize \
synchronization throw_delegate time time_zone
.for _lib in ${ABSL_LIBS}
-SHARED_LIBS += absl_${_lib} 1.0 # 2206.0.0
+SHARED_LIBS += absl_${_lib} 2.0 # 2301.0.0
.endfor
# on updates, build with `ALL_TARGET=all' once to pick up new libraries
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 4 Dec 2022 17:23:22 -0000 1.2
+++ distinfo 31 Jan 2023 16:14:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (abseil-cpp-20220623.1.tar.gz) = kayH0wzG15+auXTFGHSnBN6cJkfED2kyWXMpooIhe6g=
-SIZE (abseil-cpp-20220623.1.tar.gz) = 1957483
+SHA256 (abseil-cpp-20230125.0.tar.gz) = PqSafZdCG4ioxIoN4WwWBI4Xclx+wPHT6iaDoqda3CE=
+SIZE (abseil-cpp-20230125.0.tar.gz) = 2119580
Index: patches/patch-absl_base_internal_unscaledcycleclock_config_h
===================================================================
RCS file: patches/patch-absl_base_internal_unscaledcycleclock_config_h
diff -N patches/patch-absl_base_internal_unscaledcycleclock_config_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-absl_base_internal_unscaledcycleclock_config_h 31 Jan 2023 16:14:08 -0000
@@ -0,0 +1,16 @@
+Disable the PowerPC counter, because UnscaledCycleClock::Frequency()
+is not implemented on OpenBSD. Avoids error in unscaledcycleclock.cc,
+#error Must implement UnscaledCycleClock::Frequency()
+
+Index: absl/base/internal/unscaledcycleclock_config.h
+--- absl/base/internal/unscaledcycleclock_config.h.orig
++++ absl/base/internal/unscaledcycleclock_config.h
+@@ -21,7 +21,7 @@
+
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
++ /* defined(__powerpc__) || defined(__ppc__) || */ defined(__riscv) || \
+ defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
Index: patches/patch-absl_base_internal_unscaledcycleclock_h
===================================================================
RCS file: patches/patch-absl_base_internal_unscaledcycleclock_h
diff -N patches/patch-absl_base_internal_unscaledcycleclock_h
--- patches/patch-absl_base_internal_unscaledcycleclock_h 4 Dec 2022 17:23:22 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-Disable the PowerPC counter, because UnscaledCycleClock::Frequency()
-is not implemented on OpenBSD. Avoids error in unscaledcycleclock.cc,
-#error Must implement UnscaledCycleClock::Frequency()
-
-Index: absl/base/internal/unscaledcycleclock.h
---- absl/base/internal/unscaledcycleclock.h.orig
-+++ absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
-
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
-+ /* defined(__powerpc__) || defined(__ppc__) || */ defined(__riscv) || \
- defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
Index: patches/patch-absl_debugging_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/patches/patch-absl_debugging_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-absl_debugging_CMakeLists_txt
--- patches/patch-absl_debugging_CMakeLists_txt 31 Jan 2023 15:09:48 -0000 1.5
+++ patches/patch-absl_debugging_CMakeLists_txt 31 Jan 2023 16:14:08 -0000
@@ -7,7 +7,7 @@ defaults to --exec-only.
Index: absl/debugging/CMakeLists.txt
--- absl/debugging/CMakeLists.txt.orig
+++ absl/debugging/CMakeLists.txt
-@@ -75,6 +75,7 @@ absl_cc_library(
+@@ -89,6 +89,7 @@ absl_cc_library(
PUBLIC
)
@@ -15,7 +15,7 @@ Index: absl/debugging/CMakeLists.txt
absl_cc_test(
NAME
symbolize_test
-@@ -96,6 +97,7 @@ absl_cc_test(
+@@ -110,6 +111,7 @@ absl_cc_test(
absl::strings
GTest::gmock
)
@@ -23,7 +23,7 @@ Index: absl/debugging/CMakeLists.txt
# Internal-only target, do not depend on directly.
absl_cc_library(
-@@ -206,6 +208,7 @@ absl_cc_test(
+@@ -220,6 +222,7 @@ absl_cc_test(
GTest::gmock_main
)
@@ -31,7 +31,7 @@ Index: absl/debugging/CMakeLists.txt
absl_cc_library(
NAME
leak_check
-@@ -235,6 +238,7 @@ absl_cc_test(
+@@ -249,6 +252,7 @@ absl_cc_test(
absl::base
GTest::gmock_main
)
@@ -39,7 +39,7 @@ Index: absl/debugging/CMakeLists.txt
# Internal-only target, do not depend on directly.
absl_cc_library(
-@@ -253,6 +257,7 @@ absl_cc_library(
+@@ -267,6 +271,7 @@ absl_cc_library(
TESTONLY
)
@@ -47,7 +47,7 @@ Index: absl/debugging/CMakeLists.txt
absl_cc_test(
NAME
stack_consumption_test
-@@ -278,3 +283,4 @@ absl_cc_library(
+@@ -292,3 +297,4 @@ absl_cc_library(
absl::leak_check
PUBLIC
)
Index: patches/patch-absl_time_internal_cctz_src_time_zone_format_cc
===================================================================
RCS file: patches/patch-absl_time_internal_cctz_src_time_zone_format_cc
diff -N patches/patch-absl_time_internal_cctz_src_time_zone_format_cc
--- patches/patch-absl_time_internal_cctz_src_time_zone_format_cc 11 Mar 2022 18:49:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-Avoid _XOPEN_SOURCE as it breaks build of time_zone_format.cc.
-
-Index: absl/time/internal/cctz/src/time_zone_format.cc
---- absl/time/internal/cctz/src/time_zone_format.cc.orig
-+++ absl/time/internal/cctz/src/time_zone_format.cc
-@@ -18,12 +18,6 @@
-
Re: devel/abseil-cpp: update to LTS 20230125
> https://github.com/abseil/abseil-cpp/releases/tag/20230125.0
>
> One diff got merged, the other about disabled PowerPC bits remains, but
> moved code to a new file.
>
> To avoid churn in every update diff, I've folded library handling so
> that only one line changes version and others possibly lose/gain names.
>
> If that seems fine, I'm inclined to do that mechanical move first and
> then commit the update separately so this bump already benefits from it
> as it adds new libraries.
This proved useful to defer test compilation and thus reduce build time
by more than 50%, so I just committed those bits.
do-build and do-test now compile 247 and 392 files, respectively.
> tg_owt and tdesktop build and run fine on amd64.
>
> ---
> 98% tests passed, 4 tests failed out of 203
>
> Total Test time (real) = 187.86 sec
>
> The following tests FAILED:
> 90 - absl_log_stripping_test (Failed)
> 155 - absl_charconv_test (Failed)
> 163 - absl_str_format_convert_test (Failed)
> 191 - absl_time_test (Failed)
> ---
>
> Feedback? OK?
With this update,
do-build and do-test now compile 307 and 454 files, respectively.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 31 Jan 2023 14:45:00 -0000 1.10
+++ Makefile 31 Jan 2023 14:54:42 -0000
@@ -1,9 +1,9 @@
-COMMENT = abseil common libraries (c++)
+COMMENT = abseil common libraries (C++)
CATEGORIES = devel
GH_ACCOUNT = abseil
GH_PROJECT = ${GH_ACCOUNT}-cpp
-GH_TAGNAME = 20220623.1
+GH_TAGNAME = 20230125.0
HOMEPAGE = https://abseil.io/
@@ -16,15 +16,19 @@ PERMIT_PACKAGE = Yes
ABSL_LIBS = \
bad_any_cast_impl bad_optional_access bad_variant_access base city \
civil_time cord cord_internal cordz_functions cordz_handle cordz_info \
- cordz_sample_token debugging_internal demangle_internal examine_stack \
+ cordz_sample_token crc32c crc_cord_state crc_cpu_detect crc_internal \
+ debugging_internal demangle_internal die_if_null examine_stack \
exponential_biased failure_signal_handler flags flags_commandlineflag \
flags_commandlineflag_internal flags_config flags_internal \
flags_marshalling flags_parse flags_private_handle_accessor \
flags_program_name flags_reflection flags_usage flags_usage_internal \
- graphcycles_internal hash hashtablez_sampler int128 log_severity \
- low_level_hash malloc_internal periodic_sampler random_distributions \
- random_internal_distribution_test_util random_internal_platform \
- random_internal_pool_urbg random_internal_randen \
+ graphcycles_internal hash hashtablez_sampler int128 log_entry log_flags \
+ log_globals log_initialize log_internal_check_op log_internal_conditions \
+ log_internal_format log_internal_globals log_internal_log_sink_set \
+ log_internal_message log_internal_nullguard log_internal_proto \
+ log_severity log_sink low_level_hash malloc_internal periodic_sampler \
+ random_distributions random_internal_distribution_test_util \
+ random_internal_platform random_internal_pool_urbg random_internal_randen \
random_internal_randen_hwaes random_internal_randen_hwaes_impl \
random_internal_randen_slow random_internal_seed_material \
random_seed_gen_exception random_seed_sequences raw_hash_set \
@@ -32,7 +36,7 @@ ABSL_LIBS = \
statusor str_format_internal strerror strings strings_internal symbolize \
synchronization throw_delegate time time_zone wyhash
.for _lib in ${ABSL_LIBS}
-SHARED_LIBS += absl_${_lib} 1.0 # 2206.0.0
+SHARED_LIBS += absl_${_lib} 2.0 # 2301.0.0
.endfor
# on updates, build with `ALL_TARGET=all' once to pick up new libraries
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 4 Dec 2022 17:23:22 -0000 1.2
+++ distinfo 31 Jan 2023 14:54:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (abseil-cpp-20220623.1.tar.gz) = kayH0wzG15+auXTFGHSnBN6cJkfED2kyWXMpooIhe6g=
-SIZE (abseil-cpp-20220623.1.tar.gz) = 1957483
+SHA256 (abseil-cpp-20230125.0.tar.gz) = PqSafZdCG4ioxIoN4WwWBI4Xclx+wPHT6iaDoqda3CE=
+SIZE (abseil-cpp-20230125.0.tar.gz) = 2119580
Index: patches/patch-absl_base_internal_unscaledcycleclock_config_h
===================================================================
RCS file: patches/patch-absl_base_internal_unscaledcycleclock_config_h
diff -N patches/patch-absl_base_internal_unscaledcycleclock_config_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-absl_base_internal_unscaledcycleclock_config_h 31 Jan 2023 14:54:42 -0000
@@ -0,0 +1,16 @@
+Disable the PowerPC counter, because UnscaledCycleClock::Frequency()
+is not implemented on OpenBSD. Avoids error in unscaledcycleclock.cc,
+#error Must implement UnscaledCycleClock::Frequency()
+
+Index: absl/base/internal/unscaledcycleclock_config.h
+--- absl/base/internal/unscaledcycleclock_config.h.orig
++++ absl/base/internal/unscaledcycleclock_config.h
+@@ -21,7 +21,7 @@
+
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
++ /* defined(__powerpc__) || defined(__ppc__) || */ defined(__riscv) || \
+ defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
Index: patches/patch-absl_base_internal_unscaledcycleclock_h
===================================================================
RCS file: patches/patch-absl_base_internal_unscaledcycleclock_h
diff -N patches/patch-absl_base_internal_unscaledcycleclock_h
--- patches/patch-absl_base_internal_unscaledcycleclock_h 4 Dec 2022 17:23:22 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-Disable the PowerPC counter, because UnscaledCycleClock::Frequency()
-is not implemented on OpenBSD. Avoids error in unscaledcycleclock.cc,
-#error Must implement UnscaledCycleClock::Frequency()
-
-Index: absl/base/internal/unscaledcycleclock.h
---- absl/base/internal/unscaledcycleclock.h.orig
-+++ absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
-
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
-+ /* defined(__powerpc__) || defined(__ppc__) || */ defined(__riscv) || \
- defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
Index: patches/patch-absl_debugging_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/patches/patch-absl_debugging_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-absl_debugging_CMakeLists_txt
--- patches/patch-absl_debugging_CMakeLists_txt 4 Dec 2022 17:23:22 -0000 1.3
+++ patches/patch-absl_debugging_CMakeLists_txt 31 Jan 2023 14:54:42 -0000
@@ -4,7 +4,7 @@ OpenBSD does not support it.
Index: absl/debugging/CMakeLists.txt
--- absl/debugging/CMakeLists.txt.orig
+++ absl/debugging/CMakeLists.txt
-@@ -206,6 +206,7 @@ absl_cc_test(
+@@ -220,6 +220,7 @@ absl_cc_test(
GTest::gmock_main
)
@@ -12,7 +12,7 @@ Index: absl/debugging/CMakeLists.txt
absl_cc_library(
NAME
leak_check
-@@ -235,6 +236,7 @@ absl_cc_test(
+@@ -249,6 +250,7 @@ absl_cc_test(
absl::base
GTest::gmock_main
)
@@ -20,7 +20,7 @@ Index: absl/debugging/CMakeLists.txt
# Internal-only target, do not depend on directly.
absl_cc_library(
-@@ -253,6 +255,7 @@ absl_cc_library(
+@@ -267,6 +269,7 @@ absl_cc_library(
TESTONLY
)
@@ -28,7 +28,7 @@ Index: absl/debugging/CMakeLists.txt
absl_cc_test(
NAME
stack_consumption_test
-@@ -278,3 +281,4 @@ absl_cc_library(
+@@ -292,3 +295,4 @@ absl_cc_library(
absl::leak_check
PUBLIC
)
Index: patches/patch-absl_time_internal_cctz_src_time_zone_format_cc
===================================================================
RCS file: patches/patch-absl_time_internal_cctz_src_time_zone_format_cc
diff -N patches/patch-absl_time_internal_cctz_src_time_zone_format_cc
--- patches/patch-absl_time_internal_cctz_src_time_zone_format_cc 11 Mar 2022 18:49:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-Avoid _XOPEN_SOURCE as it breaks build of time_zone_format.cc.
-
-Index: absl/time/internal/cctz/src/time_zone_format.cc
---- absl/time/internal/cctz/src/time_zone_format.cc.orig
-+++ absl/time/internal/cctz/src/time_zone_format.cc
-@@ -18,12 +18,6 @@
-
Weekly Digest Newsletter: 31 January 2023
World Cancer Day | guidance on managing health and safety for volunteers | Latest news |
|
Health and Safety Executive - 5N1 Redgrave Court, Merton Road, Bootle, Merseyside L20 7HS