Re: aarch64 bulk build report

2022-10-27 Thread Rafael Sadowski
On Thu Oct 27, 2022 at 03:15:52PM -0600, phess...@openbsd.org wrote:
> bulk build on arm64.ports.openbsd.org
> started on  Tue Oct 25 07:35:15 MDT 2022
> finished at Thu Oct 27 15:14:20 MDT 2022
> lasted 2D07h39m
> done with kern.version=OpenBSD 7.2-current (GENERIC.MP) #1870: Tue Oct 25 
> 01:33:11 MDT 2022
> 
> built packages:11403
> Oct 25:3185
> Oct 26:2016
> Oct 27:6201
> 
> 
> critical path missing pkgs:  
> http://build-failures.rhaalovely.net/aarch64/2022-10-25/summary.log
> 
> build failures: 2
> http://build-failures.rhaalovely.net/aarch64/2022-10-25/devel/quirks.log
> http://build-failures.rhaalovely.net/aarch64/2022-10-25/x11/kde-plasma/breeze-gtk.log

graphics/py-cairo${MODPY_FLAVOR} is in BUILD_DEPENDS. No idea what's
wrong here.

> 
> recurrent failures
> new failures
> +++ ls-failures   Thu Oct 27 15:15:51 2022
> +failures/devel/quirks.log
> +failures/x11/kde-plasma/breeze-gtk.log
> resolved failures
> --- ../old/aarch64/last//ls-failures  Mon Oct 24 14:39:24 2022
> -failures/x11/gnustep/base.log
> 



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Stefan Hagen
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/10/27 16:29:58

Modified files:
mail/mu: Makefile distinfo 

Log message:
Update mu to 1.8.11

Bugfix release:
* Use fake message-ids when empty
* Add explicit check for charconv header
* Fix outdated doc for mime part actions
* mu-view: be clearer when no text-body found
* Fix mu4e-header-thread-first-child-prefix copy-pasta
* Ensure mime-parts are utf8



aarch64 bulk build report

2022-10-27 Thread phessler
bulk build on arm64.ports.openbsd.org
started on  Tue Oct 25 07:35:15 MDT 2022
finished at Thu Oct 27 15:14:20 MDT 2022
lasted 2D07h39m
done with kern.version=OpenBSD 7.2-current (GENERIC.MP) #1870: Tue Oct 25 
01:33:11 MDT 2022

built packages:11403
Oct 25:3185
Oct 26:2016
Oct 27:6201


critical path missing pkgs:  
http://build-failures.rhaalovely.net/aarch64/2022-10-25/summary.log

build failures: 2
http://build-failures.rhaalovely.net/aarch64/2022-10-25/devel/quirks.log
http://build-failures.rhaalovely.net/aarch64/2022-10-25/x11/kde-plasma/breeze-gtk.log

recurrent failures
new failures
+++ ls-failures Thu Oct 27 15:15:51 2022
+failures/devel/quirks.log
+failures/x11/kde-plasma/breeze-gtk.log
resolved failures
--- ../old/aarch64/last//ls-failuresMon Oct 24 14:39:24 2022
-failures/x11/gnustep/base.log



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2022/10/27 14:43:01

Modified files:
sysutils/ggrep : Makefile distinfo 
sysutils/ggrep/pkg: PLIST 
Removed files:
sysutils/ggrep/patches: patch-lib_sigsegv_c 

Log message:
sysutils/ggrep: update to 3.8

Changes in behavior:
* The -P option is now based on PCRE2.
* The egrep and fgrep commands now warn that they are obsolescent and
should be replaced by grep -E and grep -F.
* The confusing GREP_COLOR environment variable is now obsolescent.
* Regular expressions with stray backslashes now cause warnings.
* Regular expressions or subexpressions that start with a repetition
operator now also cause warnings.
* Regular expressions like [:space:] are now errors even if
POSIXLY_CORRECT is set.



devel/kf5/solid: /etc/mtab not exist under OpenBSD

2022-10-27 Thread Rafael Sadowski
Okay to remove /etc/mtab handling in solid? This avoids the following
message solid consumers:

QKqueueFileSystemWatcherEngine::addPaths: open: No such file or directory

OK?

Index: Makefile
===
RCS file: /cvs/ports/devel/kf5/solid/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile19 Sep 2022 05:22:41 -  1.21
+++ Makefile27 Oct 2022 19:35:54 -
@@ -1,5 +1,6 @@
 COMMENT =  KDE hardware abstraction layer
 DISTNAME = solid-${VERSION}
+REVISION = 0
 
 SHARED_LIBS =  KF5Solid7.1
 
Index: patches/patch-src_solid_devices_backends_fstab_fstabwatcher_cpp
===
RCS file: patches/patch-src_solid_devices_backends_fstab_fstabwatcher_cpp
diff -N patches/patch-src_solid_devices_backends_fstab_fstabwatcher_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_solid_devices_backends_fstab_fstabwatcher_cpp 27 Oct 
2022 19:35:54 -
@@ -0,0 +1,21 @@
+/etc/mtab not exist under OpenBSD
+
+Index: src/solid/devices/backends/fstab/fstabwatcher.cpp
+--- src/solid/devices/backends/fstab/fstabwatcher.cpp.orig
 src/solid/devices/backends/fstab/fstabwatcher.cpp
+@@ -37,6 +37,7 @@ FstabWatcher::FstabWatcher()
+ connect(qApp, ::aboutToQuit, this, 
::orphanFileSystemWatcher);
+ }
+ 
++#ifndef Q_OS_OPENBSD
+ m_mtabFile = new QFile(s_mtabFile, this);
+ if (m_mtabFile && m_mtabFile->symLinkTarget().startsWith("/proc/") && 
m_mtabFile->open(QIODevice::ReadOnly)) {
+ m_mtabSocketNotifier = new QSocketNotifier(m_mtabFile->handle(), 
QSocketNotifier::Exception, this);
+@@ -44,6 +45,7 @@ FstabWatcher::FstabWatcher()
+ } else {
+ m_fileSystemWatcher->addPath(s_mtabFile);
+ }
++#endif
+ 
+ m_fileSystemWatcher->addPath(s_fstabPath);
+ connect(m_fileSystemWatcher, ::directoryChanged, this, 
[this](const QString &) {



Re: update salt to 3005.1

2022-10-27 Thread Florian Obser
+ Cc maintainer

I stopped using salt.

What we currently have in -current broke the saltmaster[sic] when I
upgraded from 7.2 to
OpenBSD 7.2-current (GENERIC) #769: Sat Oct 22 22:02:55 MDT 2022

It dies like this directly on start up, I suspect maybe a python update?
Not sure. I mean the bug is in salt, they just got lucky...

  2022-10-23 15:03:33,042 [tornado.application  :353 
][ERROR   ][32155] Future  exception was never retrieved: Traceback (most recent call last):
  File "/usr/local/lib/python3.9/site-packages/salt/ext/tornado/gen.py", line 
309, in wrapper
yielded = next(result)
  File "/usr/local/lib/python3.9/site-packages/salt/utils/process.py", line 
664, in run
self.check_children()
  File "/usr/local/lib/python3.9/site-packages/salt/utils/process.py", line 
689, in check_children
for pid, mapping in self._process_map.items():
RuntimeError: dictionary keys changed during iteration

I then tried your 3005.1 which does not show this problem, but there is
an exciting new problem: The minions just hang after some time, maybe
about 1 hour. They no longer accept commands and rcctl stop salt_minion
times out and does a kill.

At that point I gave up and converted everything (back) to ansible.

-- 
I'm not entirely sure you are real.



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/10/27 13:21:15

Modified files:
security/rust-openssl-tests: Makefile crates.inc distinfo 
security/rust-openssl-tests/pkg: PLIST 

Log message:
Update rust-openssl-tests to 20221027



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Caspar Schutijser
CVSROOT:/cvs
Module name:ports
Changes by: cas...@cvs.openbsd.org  2022/10/27 11:37:14

Modified files:
meta/tor-browser: Makefile 
www/tor-browser: Makefile.inc 
www/tor-browser/browser: Makefile distinfo 
www/tor-browser/browser/files: pledge.content unveil.content 
   unveil.main 
www/tor-browser/browser/patches: 
 
patch-browser_extensions_tor-launcher_src_components_tl-process_js 
 patch-config_makefiles_rust_mk 
 
patch-gfx_webrender_bindings_webrender_ffi_h 
 
patch-js_src_jit_ProcessExecutableMemory_h 
 
patch-toolkit_components_downloads_DownloadIntegration_jsm 
 patch-toolkit_moz_configure 
 
patch-toolkit_system_gnome_nsGIOService_cpp 
 
patch-tor-browser_en-US_Browser_TorBrowser_Data_fontconfig_fonts_conf 
www/tor-browser/browser/pkg: PLIST 
www/tor-browser/noscript: Makefile distinfo 
Added files:
www/tor-browser/browser/files: pledge.utility 
   pledge.utility-audioDecoder 
   unveil.utility 
   unveil.utility-audioDecoder 
www/tor-browser/browser/patches: 
 
patch-toolkit_components_processtools_ProcInfo_linux_cpp 
 patch-toolkit_xre_glxtest_cpp 
 patch-xpcom_build_BinaryPath_h 

Log message:
Tor Browser: update to 12.0a3

Yes, that's an alpha release, which is not ideal. Unfortunately however,
Tor Browser's last stable release is based on an unsupported version of
Firefox ESR which does not build with the newest version of Rust (which
we already have).

If you don't want to use an alpha release of Tor Browser, it's probably
best to run OpenBSD 7.2 for another month until Tor Browser 12.0
is released.

Encouraged by landry@ tb@ george@
OK landry@



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2022/10/27 10:56:13

Modified files:
audio/flac : Makefile 

Log message:
audio/flac: drop useless master site

downloads.xiph.org already redirects to ftp.osuosl.org, so the
latter does not add redundancy.



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/27 10:43:13

Modified files:
geo/traccar: Makefile distinfo 
geo/traccar/pkg: PLIST 

Log message:
update to traccar-5.4, similar diff from maintainer Renaud Allard



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2022/10/27 10:37:37

Modified files:
www/chromium   : Makefile 

Log message:
add build dependency on qt5 base which was missing from the previous commit



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Todd C . Miller
CVSROOT:/cvs
Module name:ports
Changes by: mill...@cvs.openbsd.org 2022/10/27 10:34:07

Modified files:
security/sudo  : Makefile distinfo 
security/sudo/pkg: PLIST-main 

Log message:
Update to 1.9.12



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/10/27 10:06:04

Modified files:
misc/p5-OPCUA-Open62541: Makefile distinfo 

Log message:
update p5-OPCUA-Open62541 to 1.05



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/27 09:31:26

Modified files:
security/py-keyring: Makefile 
security/py-keyring/pkg: PLIST 

Log message:
use MODPY_PYBUILD



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2022/10/27 09:07:33

Modified files:
audio/flac : Makefile distinfo 
audio/flac/patches: patch-configure 
Removed files:
audio/flac/patches: patch-src_libFLAC_include_private_cpu_h 

Log message:
audio/flac: update to 1.4.2



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/10/27 09:05:05

Modified files:
sysutils/moreutils: Makefile 
Removed files:
sysutils/moreutils/patches: patch-parallel_c 

Log message:
sysutils/moreutils: fix build after addition of waitid(2) to base.

ok sthen (maintainer)



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2022/10/27 08:43:29

Modified files:
audio/libao: Makefile 
audio/libao/patches: patch-src_plugins_sndio_ao_sndio_c 
Added files:
audio/libao/patches: patch-src_audio_out_c 

Log message:
audio/libao: check memory allocations for success

>From upstream, via Brad



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/27 08:04:51

Modified files:
net/icbirc : Makefile 
Added files:
net/icbirc/pkg : MESSAGE 

Log message:
add a MESSAGE with a quick note about disabling "CAP LS" in
newer irssi versions; use https HOMEPAGE/MASTER_SITES while there



Re: security update www/nginx to 1.22.1

2022-10-27 Thread Sergey A. Osokin
On Thu, Oct 20, 2022 at 04:43:56PM +, Sergey A. Osokin wrote:
> On Thu, Oct 20, 2022 at 08:47:13AM +0200, Robert Nagy wrote:
> > On 19/10/22 18:23 +0100, Stuart Henderson wrote:
> > > On 2022/10/19 16:30, Sergey A. Osokin wrote:
> > > > Hi,
> > > > 
> > > > could you please review the following changes for the security
> > > > update www/nginx to the recent stable version, 1.22.1.
> > > 
> > > adding maintainer to CC, it's usually helpful ..
> > 
> > that release and cve only affects the ngx_http_mp4_module which
> > we do not enable
> 
> Not a problem, here's another patch to add njs module I posted earlier
> and to update other third-party modules.

[...]

Could you please provide an update.
Thank you.

-- 
Sergey A. Osokin


signature.asc
Description: PGP signature


CVS: cvs.openbsd.org: ports

2022-10-27 Thread Omar Polo
CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2022/10/27 06:24:52

Modified files:
math/cglm  : Makefile distinfo 
math/cglm/pkg  : PLIST 

Log message:
update math/cglm to 0.8.7

previous release didn't ship some headers for the new functions; no
changes to existing APIs.



Re: [patch] install gitea web files into /var/www/gitea

2022-10-27 Thread A Tammy


On 10/27/22 02:53, Pavel Korovin wrote:
> On 10/26, A Tammy wrote:
>> Wanted to revisit this.
>>
>> I'm for the split, as it is going to give a seamless upgrade.
>> I've got multiple ansible controlled boxes, I'd prefer not having to
>> manually handle stuff.
> Hi Aisha,
>
> I'm against the split because I don't see real deal having the bare gitea
> package and gitea-web part. I don't like Linux approach with *-libs
> *-devel *-includes *-docs *-whatever packages, for me it looks like making
> complexity out of nothing. The only reason I see for the split could be
> seamless upgrade, if it's really possible with the package split,
> but I'm not sure about the seamlessness of the upgrade.
>
> I tried building gitea with PREFIX="/" trick, and it worked almost fine,
> but then figured out that it breaks sysutils/sysclean (sysclean just hangs
> when gitea is installed).
> Currently I use @cwd approach recommended by Stuart, but it requires manual
> intervention during the port upgrade (the diff for latest gitea-1.17.3 is
> attached).
>
> I'd vote for upgrade with manual intervention accompanied by an entry in
> current.html. My Gitea upgrade process includes at least 1 manual step
> (DB backup), so from my experience it doesn't hurt to pkg_delete port
> and pkg_add port instead of doing pkg_add -u.
>
I guess I can agree with this reasoning, so might as well rip off the
bandaid :D

Aisha



Re: [new] mail/meli: a new terminal email client

2022-10-27 Thread Landry Breuil
Le Thu, Oct 27, 2022 at 03:22:05AM +, James Cook a écrit :
> On Wed Oct 26, 2022 at 5:58 AM UTC, Theo Buehler wrote:
> > > Thanks for porting. I just tried to use meli with notmuch, and get:
> > > 
> > >   $ meli
> > >   Could not load libnotmuch!
> > >   If notmuch is installed but the library isn't found, consult your 
> > > system's documentation on how to make dynamic libraries discoverable.
> > >   Caused by: File not found
> > > 
> > > I do have notmuch installed, and libnotmuch is at
> > > /usr/local/lib/libnotmuch.so.1.2 . I installed meli with pkg_add
> > > (meli-0.7.2pl20221017).
> > > 
> > > I can try to debug but don't currently know much about rust and dynamic
> > > libraries.
> >
> > Does this work?
> 
> Thanks, it seems to work. Some things are broken, but some of those
> things aren't notmuch-specific and seem to be broken in the package
> (installed with pkg_add) too.
> 
> Broken things I noticed, for the record:

Thanks for the test report and the extensive testing, but ... you do
realize all those things you're reporting arent probably related to the
OpenBSD port itself, and would be better reported upstream at
https://git.meli.delivery/meli/meli/issues ? After all meli is not even
published as 'beta', only alpha.. :)

Landry



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/10/27 04:31:32

Modified files:
mail/mozilla-thunderbird: Tag: OPENBSD_7_2 Makefile distinfo 

Log message:
mail/mozilla-thunderbird: MFC update to 102.4.1.

see https://www.thunderbird.net/en-US/thunderbird/102.4.1/releasenotes/



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/10/27 04:31:05

Modified files:
mail/mozilla-thunderbird: Makefile distinfo 
mail/thunderbird-i18n: Makefile.inc distinfo 

Log message:
mail/mozilla-thunderbird: update to 102.4.1.

see https://www.thunderbird.net/en-US/thunderbird/102.4.1/releasenotes/



Re: tor-browser Segmentation fault after upgrade to 7.2 release

2022-10-27 Thread Caspar Schutijser
(Moving the conversation to ports@, that's usually a better place
for questions regarding ports and packages.)

Hi,

Currently, installing Tor Browser on OpenBSD 7.2 is broken
because I committed 11.5.4 to 7.2-stable but it probably didn't build
completely because of reasons explained here:
https://marc.info/?l=openbsd-ports-cvs=13719317560=2

I committed a fix already but we'll have to wait for new -stable
packages to be built to fix it. I assume that will happen in the
next few days so run "pkg_add -u" every now and then.

Apologies for the inconvenience.

I assume you're getting a segfault because you still have
Tor Browser 11.5.4 from 7.1-stable, which doesn't run on OpenBSD 7.2.
If you want to be sure this is it, you can run
  $ pkg_info -C tb-browser
If it says something like "reportedly signed by openbsd-71-pkg",
it's indeed the package for OpenBSD 7.1.

Caspar


On Thu, Oct 27, 2022 at 04:22:34AM +, noizeless.v...@tutanota.com wrote:
> >Synopsis:tor-browser Segmentation fault after upgrade to 7.2 release
> >Category:
> >Environment:
>   System  : OpenBSD 7.2
>   Details : OpenBSD 7.2 (GENERIC.MP) #758: Tue Sep 27 11:57:54 MDT 
> 2022
>
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> 
>   Architecture: OpenBSD.amd64
>   Machine : amd64
> 
>   tor-browser: 11.5.4
> 
> >Description:
>   I gets the core dump file, but don't know how attach it.
> >How-To-Repeat:
>   Run tor-browser.
> >Fix:
>   Unknown.
> 



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Omar Polo
CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2022/10/27 04:08:19

Modified files:
devel/poedit   : Makefile distinfo 

Log message:
update devel/poedit to 3.2.1

changelog: https://github.com/vslavik/poedit/releases/tag/v3.2.1-oss

Previous version checked wrongly the return value of chmod(2) and
chown(2) that resulted in an error message shown when saving files,
although the operation was successfully.



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Gonzalo L . Rodriguez
CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2022/10/27 03:55:42

Modified files:
sysutils   : Makefile 

Log message:
add stripe-cli



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Gonzalo L . Rodriguez
CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2022/10/27 03:54:27

Log message:
build, test, and manage your Stripe integration OK sthen@

Status:

Vendor Tag: gonzalo
Release Tags:   gonzalo_20222710

N ports/sysutils/stripe-cli/Makefile
N ports/sysutils/stripe-cli/distinfo
N ports/sysutils/stripe-cli/modules.inc
N ports/sysutils/stripe-cli/pkg/DESCR
N ports/sysutils/stripe-cli/pkg/PLIST
N ports/sysutils/stripe-cli/pkg/MESSAGE

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/27 03:10:29

Modified files:
x11/i3 : Makefile distinfo 
x11/i3/patches : patch-etc_config patch-etc_config_keycodes 
 patch-i3-dmenu-desktop 
 patch-man_i3-config-wizard_man 
Removed files:
x11/i3/patches : patch-include_con_h patch-include_data_h 
 patch-src_commands_c patch-src_con_c 
 patch-src_floating_c 

Log message:
update to i3-4.21.1



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/10/27 02:41:08

Modified files:
sysutils/polkit: Makefile distinfo 
sysutils/polkit/patches: patch-meson_build 
sysutils/polkit/pkg: PLIST 
Removed files:
sysutils/polkit/patches: patch-src_polkitbackend_meson_build 
 
patch-src_polkitbackend_polkitbackendduktapeauthority_c 

Log message:
Update to polkit-122.



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/27 02:12:23

Modified files:
net/wireshark  : Tag: OPENBSD_7_2 Makefile distinfo 

Log message:
update to wireshark-3.6.9



CVS: cvs.openbsd.org: ports

2022-10-27 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/27 02:11:19

Modified files:
net/wireshark  : Makefile distinfo 

Log message:
update to wireshark-4.0.1



Re: [patch] install gitea web files into /var/www/gitea

2022-10-27 Thread Pavel Korovin
On 10/26, A Tammy wrote:
> Wanted to revisit this.
> 
> I'm for the split, as it is going to give a seamless upgrade.
> I've got multiple ansible controlled boxes, I'd prefer not having to
> manually handle stuff.

Hi Aisha,

I'm against the split because I don't see real deal having the bare gitea
package and gitea-web part. I don't like Linux approach with *-libs
*-devel *-includes *-docs *-whatever packages, for me it looks like making
complexity out of nothing. The only reason I see for the split could be
seamless upgrade, if it's really possible with the package split,
but I'm not sure about the seamlessness of the upgrade.

I tried building gitea with PREFIX="/" trick, and it worked almost fine,
but then figured out that it breaks sysutils/sysclean (sysclean just hangs
when gitea is installed).
Currently I use @cwd approach recommended by Stuart, but it requires manual
intervention during the port upgrade (the diff for latest gitea-1.17.3 is
attached).

I'd vote for upgrade with manual intervention accompanied by an entry in
current.html. My Gitea upgrade process includes at least 1 manual step
(DB backup), so from my experience it doesn't hurt to pkg_delete port
and pkg_add port instead of doing pkg_add -u.

-- 
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile
--- Makefile12 Sep 2022 12:19:07 -  1.83
+++ Makefile26 Oct 2022 23:53:56 -
@@ -1,6 +1,6 @@
 COMMENT =  compact self-hosted Git service
 
-VERSION =  1.17.2
+VERSION =  1.17.3
 DISTNAME = gitea-src-${VERSION}
 PKGNAME =  gitea-${VERSION}
 
@@ -20,10 +20,10 @@ MODULES =   lang/go
 
 GO_TAGS =  sqlite sqlite_unlock_notify
 MODGO_FLAGS += -tags "${GO_TAGS}"
-MODGO_LDFLAGS += -X 
code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/gitea
+MODGO_LDFLAGS += -X 
code.gitea.io/gitea/modules/setting.AppWorkPath=${LOCALBASE}/share/gitea
 MODGO_LDFLAGS += -X 
code.gitea.io/gitea/modules/setting.CustomConf=${SYSCONFDIR}/gitea/app.ini
 MODGO_LDFLAGS += -X 
code.gitea.io/gitea/modules/setting.CustomPath=${LOCALSTATEDIR}/gitea/custom
-MODGO_LDFLAGS += -X 
code.gitea.io/gitea/modules/setting.StaticRootPath=${PREFIX}/share/gitea
+MODGO_LDFLAGS += -X 
code.gitea.io/gitea/modules/setting.StaticRootPath=${LOCALBASE}/share/gitea
 MODGO_LDFLAGS += -X main.Version=${VERSION}
 MODGO_LDFLAGS += -X 'main.Tags=${GO_TAGS}'
 
@@ -38,12 +38,15 @@ pre-configure:
 do-install:
${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/gitea ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/gitea
-.for _d in custom/conf options public templates
+.for _d in custom/conf options templates
cp -Rp ${WRKSRC}/${_d} ${PREFIX}/share/gitea
 .endfor
+   ${INSTALL_DATA_DIR} ${WRKINST}${VARBASE}/www/gitea
+   cp -Rp ${WRKSRC}/public ${WRKINST}${VARBASE}/www/gitea
+   ln -s ${VARBASE}/www/gitea/public ${PREFIX}/share/gitea/public
 
 post-install:
-   @find ${WRKINST} -type f \
-   \( -name '*.beforesubst' -o -name '*.orig' \) -delete
+   @find ${WRKINST}/ -type f \
+   \( -name '*.beforesubst' -o -name '*${PATCHORIG}' \) -delete
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/www/gitea/distinfo,v
retrieving revision 1.69
diff -u -p -r1.69 distinfo
--- distinfo12 Sep 2022 12:19:07 -  1.69
+++ distinfo26 Oct 2022 23:53:56 -
@@ -1,2 +1,2 @@
-SHA256 (gitea-src-1.17.2.tar.gz) = pDg+HC3dbWf0RxoLvBtIOaFauP1pUYBOG+Q9cinh3lg=
-SIZE (gitea-src-1.17.2.tar.gz) = 52668293
+SHA256 (gitea-src-1.17.3.tar.gz) = NUkEgKt5OETo751UHcocPH7lEIgyBf6Rl/Nz0nbNH3g=
+SIZE (gitea-src-1.17.3.tar.gz) = 52711597
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/gitea/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST
--- pkg/PLIST   12 Sep 2022 12:19:07 -  1.26
+++ pkg/PLIST   26 Oct 2022 23:53:56 -
@@ -800,998 +800,7 @@ share/gitea/options/locale/locale_zh-HK.
 share/gitea/options/locale/locale_zh-TW.ini
 share/gitea/options/readme/
 share/gitea/options/readme/Default
-share/gitea/public/
-share/gitea/public/css/
-share/gitea/public/css/dropzone.0142b04d.css
-share/gitea/public/css/index.css
-share/gitea/public/css/minicolors.6d617d3d.css
-share/gitea/public/css/monaco.6c9803a7.css
-share/gitea/public/css/swagger.css
-share/gitea/public/css/theme-arc-green.css
-share/gitea/public/css/theme-auto.css
-share/gitea/public/fonts/
-share/gitea/public/fonts/codicon.ade70576.ttf
-share/gitea/public/fonts/fontawesome-webfont.20fd1704.woff2
-share/gitea/public/fonts/icons.9451d5fe.woff2
-share/gitea/public/fonts/outline-icons.c5240512.woff2
-share/gitea/public/img/
-share/gitea/public/img/404.png
-share/gitea/public/img/500.png

Re: UPDATE: iperf3 3.12

2022-10-27 Thread Brad Smith
On Fri, Oct 07, 2022 at 05:50:22PM -0400, Brad Smith wrote:
> Here is an update to iperf3.
> 
> 
> https://raw.githubusercontent.com/esnet/iperf/master/RELNOTES.md

An updated diff. My diff was tested and commited upstream.


Index: Makefile
===
RCS file: /home/cvs/ports/net/iperf3/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile11 Mar 2022 19:46:08 -  1.9
+++ Makefile7 Oct 2022 21:39:50 -
@@ -1,6 +1,6 @@
 COMMENT=   tool to measure maximum achievable bandwidth on IP networks
 
-V= 3.10.1
+V= 3.12
 PKGNAME=   iperf3-${V}
 DISTNAME=  iperf-${V}
 
@@ -19,7 +19,9 @@ WANTLIB += c m
 
 MASTER_SITES=  https://downloads.es.net/pub/iperf/
 
-CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION=  2.71
+
+CONFIGURE_STYLE= autoconf
 CONFIGURE_ARGS= --with-openssl=no
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/net/iperf3/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo13 Jul 2021 02:02:09 -  1.6
+++ distinfo3 Oct 2022 05:54:03 -
@@ -1,2 +1,2 @@
-SHA256 (iperf-3.10.1.tar.gz) = A7yXYMxUokUZHUa/yO2vikdQ8Oh6vKZ2RIaXIETWcVo=
-SIZE (iperf-3.10.1.tar.gz) = 633304
+SHA256 (iperf-3.12.tar.gz) = cgNOz7an1tZ+OE4Z+27/8yNspPftTFGNfbZJxEfh/9Y=
+SIZE (iperf-3.12.tar.gz) = 644807
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac  26 Oct 2022 06:32:27 -
@@ -0,0 +1,14 @@
+Add support for OpenBSD systems which have TCP_INFO implemented.
+463571f25e8bcb49ae37fec77d63c3fe65dd0638
+
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -305,6 +305,7 @@ AC_CHECK_MEMBER([struct tcp_info.tcpi_snd_wnd],
+ [#ifdef HAVE_LINUX_TCP_H
+ #include 
+ #else
++#include 
+ #include 
+ #endif
+ ])
Index: patches/patch-src_iperf_api_c
===
RCS file: /home/cvs/ports/net/iperf3/patches/patch-src_iperf_api_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_iperf_api_c
--- patches/patch-src_iperf_api_c   11 Mar 2022 19:46:08 -  1.5
+++ patches/patch-src_iperf_api_c   26 Oct 2022 06:32:35 -
@@ -3,7 +3,7 @@ Default to IPv4.
 Index: src/iperf_api.c
 --- src/iperf_api.c.orig
 +++ src/iperf_api.c
-@@ -2314,7 +2314,7 @@ iperf_defaults(struct iperf_test *testp)
+@@ -2787,7 +2787,7 @@ iperf_defaults(struct iperf_test *testp)
  testp->stats_interval = testp->reporter_interval = 1;
  testp->num_streams = 1;
  
Index: patches/patch-src_iperf_h
===
RCS file: patches/patch-src_iperf_h
diff -N patches/patch-src_iperf_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_iperf_h   26 Oct 2022 06:32:45 -
@@ -0,0 +1,18 @@
+Add support for OpenBSD systems which have TCP_INFO implemented.
+463571f25e8bcb49ae37fec77d63c3fe65dd0638
+
+Index: src/iperf.h
+--- src/iperf.h.orig
 src/iperf.h
+@@ -94,9 +94,9 @@ struct iperf_interval_results
+ int   cnt_error;
+ 
+ int omitted;
+-#if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)) && \
++#if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || 
defined(__OpenBSD__)) && \
+   defined(TCP_INFO)
+-struct tcp_info tcpInfo; /* getsockopt(TCP_INFO) for Linux, {Free,Net}BSD 
*/
++struct tcp_info tcpInfo; /* getsockopt(TCP_INFO) for Linux, 
{Free,Net,Open}BSD */
+ #else
+ /* Just placeholders, never accessed. */
+ char *tcpInfo;
Index: patches/patch-src_iperf_locale_c
===
RCS file: patches/patch-src_iperf_locale_c
diff -N patches/patch-src_iperf_locale_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_iperf_locale_c26 Oct 2022 06:32:53 -
@@ -0,0 +1,19 @@
+Add support for OpenBSD systems which have TCP_INFO implemented.
+463571f25e8bcb49ae37fec77d63c3fe65dd0638
+
+Index: src/iperf_locale.c
+--- src/iperf_locale.c.orig
 src/iperf_locale.c
+@@ -450,11 +450,7 @@ const char report_receiver_not_available_summary_forma
+ const char report_tcpInfo[] =
+ "event=TCP_Info CWND=%u SND_SSTHRESH=%u RCV_SSTHRESH=%u UNACKED=%u SACK=%u 
LOST=%u RETRANS=%u FACK=%u RTT=%u REORDERING=%u\n";
+ #endif
+-#if defined(__FreeBSD__)
+-const char report_tcpInfo[] =
+-"event=TCP_Info CWND=%u RCV_WIND=%u SND_SSTHRESH=%u RTT=%u\n";
+-#endif
+-#if defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ const char report_tcpInfo[] =
+ "event=TCP_Info CWND=%u RCV_WIND=%u SND_SSTHRESH=%u RTT=%u\n";
+ #endif
Index: patches/patch-src_tcp_info_c
===
RCS file: