CVS: cvs.openbsd.org: ports

2024-04-22 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/22 00:47:57

Modified files:
x11/gnustep/libobjc2: Makefile distinfo 
x11/gnustep/libobjc2/patches: patch-block_trampolines_S 
Removed files:
x11/gnustep/libobjc2/patches: patch-CMakeLists_txt 

Log message:
update 2.2 -> 2.2.1

CVS: cvs.openbsd.org: ports

2024-04-21 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/21 12:33:23

Modified files:
sysutils/ruby-puppet/7: Makefile distinfo 
sysutils/ruby-puppet/7/patches: patch-lib_puppet_defaults_rb 

Log message:
update 7.29.1 -> 7.30.0

CVS: cvs.openbsd.org: ports

2024-04-21 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/21 12:31:55

Modified files:
sysutils/ruby-puppet-syntax: Makefile distinfo 

Log message:
update 4.1.0 -> 4.1.1

CVS: cvs.openbsd.org: ports

2024-04-21 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/21 12:29:40

Modified files:
net/ruby-public_suffix: Makefile distinfo 

Log message:
update 5.0.4 -> 5.0.5

CVS: cvs.openbsd.org: ports

2024-04-21 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/21 12:24:04

Modified files:
audio/qsynth   : Makefile distinfo 

Log message:
update 0.9.12 -> 0.9.13

Re: Overhaul package handling in puppet 8

2024-04-20 Thread Sebastian Reitenbach 
Hi,
On Wednesday, April 10, 2024 11:05 CEST, "Sebastian Reitenbach" 
 wrote:

> On Wednesday, April 10, 2024 08:26 CEST, Giovanni Bechis  
> wrote:
> 
> > On 4/10/24 07:10, Sebastian Reitenbach wrote:
> > > Hi,
> > > On Tuesday, April 09, 2024 22:43 CEST, Giovanni Bechis 
> > >  wrote:
> > > 
> > >> On Tue, Apr 09, 2024 at 10:17:30PM +0200, Sebastian Reitenbach wrote:
> > >>> Since we now have a recent Puppet in ports, I started looking at how 
> > >>> packages are handled with Puppet.
> > >>> My current trouble is that it wasn't really possible to install banches 
> > >>> properly: i.e. can't properly install gimp,
> > >>> or auto* based on branch. Or esp, when want to install multiple of 
> > >>> them, it was just not possible.
> > >>> For ports where branches conflict, i.e. postfix, this was working, but 
> > >>> had to specify exact version, and on every
> > >>> upgrade bump the version  _very_ annoying.
> > >>>
> > >>> Currently Puppet allows to install packages of a given version (ensure 
> > >>> => "X.Y.Z"), or to follow updates (ensure => "latest").
> > >>>
> > >> [...]
> > >>> This is just for Puppet 8. Anyone still on Puppet 7? It should be 
> > >>> easily ported to Puppet 7 as well.
> > >>>
> > >> I am on Puppet 7 and I do not have time to upgrade to Puppet 8 soon; I
> > > 
> > > My upgrade from Puppet 7 to 8 took quite a long time. They removed a lot 
> > > of backward compat
> > > shim, and if you have many old and partially hand made or patched modules 
> > > like I do, it took
> > > quite a while to update all of them
> > > 
> > upgrading is on my queue and I have lot of hand made modules, other then 
> > that, can a Puppet 7 client connect to a Puppet 8 server ?
> 
> Yes, it worked for me, it's also recommended to upgrade master (and db) 
> first, then update the clients.
> Depending on your modules, you may already see some fallout when just 
> upgrading the server, 
> and then even more, when upgrading the agents ;)
> 

This is now in, but just for Puppet8, I left Puppet 7 alone for now.
For anyone using Puppet8, for Puppet managed packages that have branches, you 
now have to use the package name including the branch, 
i.e. puppet%8, openldap-server%openldap, gimp%stable, jdk%1.8 etc. as you would 
using pkg_add 

cheers,
Sebastian

CVS: cvs.openbsd.org: ports

2024-04-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/20 14:41:33

Modified files:
sysutils/ruby-puppet: Makefile.inc 
sysutils/ruby-puppet/8: Makefile distinfo 
sysutils/ruby-puppet/8/patches: patch-lib_puppet_defaults_rb 

patch-lib_puppet_provider_package_openbsd_rb 

patch-lib_puppet_provider_package_pip_rb 
sysutils/ruby-puppet/8/pkg: PLIST 
Added files:
sysutils/ruby-puppet/7/pkg: DESCR puppet.rc 
sysutils/ruby-puppet/8/pkg: DESCR README puppet.rc 
Removed files:
sysutils/ruby-puppet/pkg: DESCR puppet.rc 

Log message:
Update Puppet 8 8.5.0 -> 8.6.1
While there, overhaul package handling, drop versionable, latest but
handle package branches properly.

CVS: cvs.openbsd.org: ports

2024-04-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/20 14:23:05

Modified files:
sysutils/puppetserver/7: Makefile distinfo 
sysutils/puppetserver/7/pkg: README 

Log message:
update 7.16.0 -> 7.17.0

CVS: cvs.openbsd.org: ports

2024-04-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/20 14:17:56

Modified files:
databases/puppetdb/7: Makefile distinfo 

Log message:
update 7.17.1 -> 7.18.0

CVS: cvs.openbsd.org: ports

2024-04-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/20 12:52:31

Modified files:
sysutils/ruby-facter: Makefile distinfo 
sysutils/ruby-facter/pkg: PLIST 
Removed files:
sysutils/ruby-facter/files/facts: ec2_metadata.rb 
  ec2_userdata.rb 
  facterversion.rb is_virtual.rb 
  kernel.rb kernelrelease.rb 
  mountpoints.rb path.rb ssh.rb 
  sshalgorithmkey.rb 
  sshfp_algorithm.rb timezone.rb 
  virtual.rb 
sysutils/ruby-facter/files/facts/augeas: version.rb 
sysutils/ruby-facter/files/facts/dmi: manufacturer.rb 
sysutils/ruby-facter/files/facts/dmi/bios: vendor.rb version.rb 
sysutils/ruby-facter/files/facts/dmi/product: name.rb 
  serial_number.rb 
  uuid.rb 
sysutils/ruby-facter/files/facts/identity: gid.rb group.rb 
   privileged.rb uid.rb 
   user.rb 
sysutils/ruby-facter/files/facts/networking: dhcp.rb domain.rb 
 fqdn.rb hostname.rb 
 interfaces.rb ip.rb 
 ip6.rb mac.rb 
 mtu.rb netmask.rb 
 netmask6.rb 
 network.rb 
 network6.rb 
 primary.rb 
 scope6.rb 
sysutils/ruby-facter/files/facts/os: architecture.rb hardware.rb 
 name.rb release.rb 
sysutils/ruby-facter/files/facts/processors: isa.rb 
sysutils/ruby-facter/files/facts/ruby: platform.rb sitedir.rb 
   version.rb 
sysutils/ruby-facter/files/facts/system_uptime: days.rb hours.rb 
seconds.rb 
uptime.rb 
sysutils/ruby-facter/files/resolvers: dhcp.rb dmi.rb 
  mountpoints.rb virtual.rb 
sysutils/ruby-facter/patches: patch-lib_facter_config_rb 
  
patch-lib_facter_framework_core_file_loader_rb 
  
patch-lib_facter_framework_detector_os_detector_rb 
  
patch-lib_facter_util_facts_posix_virtual_detector_rb 

Log message:
update 4.6.1 -> 4.7.0
finally OpenBSD support added upstream

CVS: cvs.openbsd.org: ports

2024-04-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/20 12:51:03

Modified files:
sysutils/puppetserver/8: Makefile distinfo 
sysutils/puppetserver/8/pkg: README 

Log message:
update 8.5.1 -> 8.6.0

CVS: cvs.openbsd.org: ports

2024-04-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/20 12:31:17

Modified files:
databases/puppetdb/8: Makefile distinfo 
databases/puppetdb/8/patches: patch-Makefile 
  patch-ext_cli_delete-reports 

Log message:
update 8.4.1 -> 8.5.0

CVS: cvs.openbsd.org: ports

2024-04-19 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/19 13:18:37

Modified files:
www/ruby-jwt   : Makefile distinfo 
www/ruby-jwt/pkg: PLIST 

Log message:
update 2.7.1->2.8.1

CVS: cvs.openbsd.org: ports

2024-04-19 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/19 13:12:19

Modified files:
sysutils/ruby-r10k: Makefile distinfo 
sysutils/ruby-r10k/patches: patch-_metadata 

Log message:
update 4.0.1 -> 4.1.0

CVS: cvs.openbsd.org: ports

2024-04-19 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/19 12:55:52

Modified files:
security/exploitdb: Makefile distinfo 
security/exploitdb/pkg: PLIST 

Log message:
update to 2024-04-16

CVS: cvs.openbsd.org: ports

2024-04-19 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/19 12:40:29

Modified files:
security/py-fickling: Makefile distinfo 

Log message:
update 0.1.2 -> 0.1.3

Re: cad/xtrcad: fix hidden dep on mxml

2024-04-16 Thread Sebastian Reitenbach 
On Tuesday, April 16, 2024 21:29 CEST, Theo Buehler  
wrote:

> xtrcad has a hidden dep on mxml. Below is a possible fix.
> 
> -- Found MiniXML: /usr/local/lib/libmxml.so.0.2
> [...]
> /tmp/pobj/xtrkcad-5.2.2/xtrkcad-source-5.2.2GA/app/bin/svgformat.c:34:10:
> fatal error: 'mxml.h' file not found
> #include "mxml.h"
>  ^~~~
>1 error generated.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/cad/xtrkcad/Makefile,v
> diff -u -p -r1.29 Makefile
> --- Makefile  7 Nov 2023 14:19:21 -   1.29
> +++ Makefile  16 Apr 2024 19:28:15 -
> @@ -4,7 +4,7 @@ VERSION=  5.2.2
>  DISTNAME=xtrkcad-source-${VERSION}GA
>  PKGNAME= xtrkcad-${VERSION}
>  CATEGORIES=  cad
> -REVISION=2
> +REVISION=3
>  
>  HOMEPAGE=https://xtrkcad-fork.sourceforge.net/Wikka/HomePage
>  
> @@ -21,10 +21,13 @@ COMPILER= base-clang ports-gcc
>  COMPILER_LANGS=  c
>  
>  WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB += Xrandr Xrender c fontconfig freetype m pthread z
> -WANTLIB += cairo gio-2.0 glib-2.0 gobject-2.0 iconv intl zip
> -WANTLIB += harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0
> -WANTLIB += gdk_pixbuf-2.0 atk-1.0 gdk-x11-2.0 gtk-x11-2.0
> +WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
> +WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
> +WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
> +WANTLIB += pangoft2-1.0 pthread z zip
> +
> +# force update if the statically linked mxml is updated.
> +WANTLIB += mxml
>  
>  BUILD_DEPENDS =  devel/gettext,-tools
>  
> @@ -32,6 +35,7 @@ LIB_DEPENDS=archivers/libzip \
>   devel/pango \
>   graphics/cairo \
>   graphics/gdk-pixbuf2 \
> + textproc/mxml \
>   x11/gnome/at-spi2-core \
>   x11/gtk+2
>  

Haven't tested it, my desktop is a couple of weeks behind. 
But if it runs and starts, OK sebastia@

Re: Overhaul package handling in puppet 8

2024-04-10 Thread Sebastian Reitenbach 
On Wednesday, April 10, 2024 08:26 CEST, Giovanni Bechis  
wrote:

> On 4/10/24 07:10, Sebastian Reitenbach wrote:
> > Hi,
> > On Tuesday, April 09, 2024 22:43 CEST, Giovanni Bechis  
> > wrote:
> > 
> >> On Tue, Apr 09, 2024 at 10:17:30PM +0200, Sebastian Reitenbach wrote:
> >>> Since we now have a recent Puppet in ports, I started looking at how 
> >>> packages are handled with Puppet.
> >>> My current trouble is that it wasn't really possible to install banches 
> >>> properly: i.e. can't properly install gimp,
> >>> or auto* based on branch. Or esp, when want to install multiple of them, 
> >>> it was just not possible.
> >>> For ports where branches conflict, i.e. postfix, this was working, but 
> >>> had to specify exact version, and on every
> >>> upgrade bump the version  _very_ annoying.
> >>>
> >>> Currently Puppet allows to install packages of a given version (ensure => 
> >>> "X.Y.Z"), or to follow updates (ensure => "latest").
> >>>
> >> [...]
> >>> This is just for Puppet 8. Anyone still on Puppet 7? It should be easily 
> >>> ported to Puppet 7 as well.
> >>>
> >> I am on Puppet 7 and I do not have time to upgrade to Puppet 8 soon; I
> > 
> > My upgrade from Puppet 7 to 8 took quite a long time. They removed a lot of 
> > backward compat
> > shim, and if you have many old and partially hand made or patched modules 
> > like I do, it took
> > quite a while to update all of them
> > 
> upgrading is on my queue and I have lot of hand made modules, other then 
> that, can a Puppet 7 client connect to a Puppet 8 server ?

Yes, it worked for me, it's also recommended to upgrade master (and db) first, 
then update the clients.
Depending on your modules, you may already see some fallout when just upgrading 
the server, 
and then even more, when upgrading the agents ;)

> 
> > Attached an untested version of the same changes for the Puppet 7 port.
> > 
> >> am also using "ensure => latest" syntax but I can change my code to get
> >> rid of it OpenBSD will no more support it.
> > 
> > What's your use-case to using "ensure => latest"? If there's really a "good 
> > one",
> > I can look into re-adding the feature.
> > My use-case up to now for sparingly using "latest" was to force using 
> > "snapshot"
> > branch of some packages.
> > 
> my OpenBSD Puppet server manages Linux and Windows servers as well, on those 
> OS I want to update automatically only some trusted packages, not all the 
> packages the distro wants to update.
> Anyway I can change that part of my code without big issues.

Ah, OK, I only use it to run my home network, and that's purely OpenBSD 
machines that are managed (:


>   Cheers
> Giovanni
> 
> >>
> >>   Cheers
> >>Giovanni
> >>
> >>
> >>> cheers,
> >>> Sebastian
> >>>
> >>>
> >>> Index: Makefile
> >>> ===
> >>> RCS file: /cvs/ports/sysutils/ruby-puppet/8/Makefile,v
> >>> diff -u -r1.2 Makefile
> >>> --- Makefile  20 Mar 2024 21:21:14 -  1.2
> >>> +++ Makefile  9 Apr 2024 19:51:40 -
> >>> @@ -1,6 +1,7 @@
> >>>   PORTROACH=  limit:^7
> >>>   
> >>>   VERSION=8.5.1
> >>> +REVISION=0
> >>>   
> >>>   RUN_DEPENDS+=   
> >>> converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
> >>>   
> >>> devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
> >>> Index: patches/patch-lib_puppet_provider_package_openbsd_rb
> >>> ===
> >>> RCS file: 
> >>> /cvs/ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_provider_package_openbsd_rb,v
> >>> diff -u -r1.2 patch-lib_puppet_provider_package_openbsd_rb
> >>> --- patches/patch-lib_puppet_provider_package_openbsd_rb  20 Mar 2024 
> >>> 21:21:14 -  1.2
> >>> +++ patches/patch-lib_puppet_provider_package_openbsd_rb  9 Apr 2024 
> >>> 19:51:40 -
> >>> @@ -1,42 +1,89 @@
> >>> -- Handle errors from pkg_add
> >>> -- Handle uninstall_options being 'nil' by default
> >>> -- If no flavor sp

Re: Overhaul package handling in puppet 8

2024-04-09 Thread Sebastian Reitenbach 
Hi,
On Tuesday, April 09, 2024 22:43 CEST, Giovanni Bechis  
wrote:

> On Tue, Apr 09, 2024 at 10:17:30PM +0200, Sebastian Reitenbach wrote:
> > Since we now have a recent Puppet in ports, I started looking at how 
> > packages are handled with Puppet.
> > My current trouble is that it wasn't really possible to install banches 
> > properly: i.e. can't properly install gimp, 
> > or auto* based on branch. Or esp, when want to install multiple of them, it 
> > was just not possible.
> > For ports where branches conflict, i.e. postfix, this was working, but had 
> > to specify exact version, and on every
> > upgrade bump the version  _very_ annoying.
> > 
> > Currently Puppet allows to install packages of a given version (ensure => 
> > "X.Y.Z"), or to follow updates (ensure => "latest").
> > 
> [...]
> > This is just for Puppet 8. Anyone still on Puppet 7? It should be easily 
> > ported to Puppet 7 as well. 
> > 
> I am on Puppet 7 and I do not have time to upgrade to Puppet 8 soon; I

My upgrade from Puppet 7 to 8 took quite a long time. They removed a lot of 
backward compat
shim, and if you have many old and partially hand made or patched modules like 
I do, it took
quite a while to update all of them

Attached an untested version of the same changes for the Puppet 7 port.

> am also using "ensure => latest" syntax but I can change my code to get
> rid of it OpenBSD will no more support it.

What's your use-case to using "ensure => latest"? If there's really a "good 
one",
I can look into re-adding the feature. 
My use-case up to now for sparingly using "latest" was to force using 
"snapshot" 
branch of some packages.

> 
>  Cheers
>   Giovanni
> 
> 
> > cheers,
> > Sebastian
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/ruby-puppet/8/Makefile,v
> > diff -u -r1.2 Makefile
> > --- Makefile20 Mar 2024 21:21:14 -  1.2
> > +++ Makefile9 Apr 2024 19:51:40 -
> > @@ -1,6 +1,7 @@
> >  PORTROACH= limit:^7
> >  
> >  VERSION=   8.5.1
> > +REVISION=  0
> >  
> >  RUN_DEPENDS+=  
> > converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
> > devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
> > Index: patches/patch-lib_puppet_provider_package_openbsd_rb
> > ===
> > RCS file: 
> > /cvs/ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_provider_package_openbsd_rb,v
> > diff -u -r1.2 patch-lib_puppet_provider_package_openbsd_rb
> > --- patches/patch-lib_puppet_provider_package_openbsd_rb20 Mar 2024 
> > 21:21:14 -  1.2
> > +++ patches/patch-lib_puppet_provider_package_openbsd_rb9 Apr 2024 
> > 19:51:40 -
> > @@ -1,42 +1,89 @@
> > -- Handle errors from pkg_add
> > -- Handle uninstall_options being 'nil' by default
> > -- If no flavor speficied, force the empty flavor with '--'
> > -  but skipping the % un-ambiguity pkg names
> > -- Bail out on shortform PKG_PATH (i.e. 'ftp.openbsd.org')
> > -- pkg.conf is gone
> > -- properly handle packages with multiple versions and flavors,
> > -  i.e. postfix-XXX-flavor
> > -
> > +- get rid of versionable (no ensure => "version X.X.X")
> > +- get rid of upgradeable (ensure => latest)
> > +- properly support branches
> >  
> >  Index: lib/puppet/provider/package/openbsd.rb
> >  --- lib/puppet/provider/package/openbsd.rb.orig
> >  +++ lib/puppet/provider/package/openbsd.rb
> > -@@ -24,6 +24,8 @@ Puppet::Type.type(:package).provide :openbsd, :parent 
> > -   has_feature :upgradeable
> > +@@ -6,10 +6,14 @@ require_relative '../../../puppet/provider/package'
> > + Puppet::Type.type(:package).provide :openbsd, :parent => 
> > Puppet::Provider::Package do
> > +   desc "OpenBSD's form of `pkg_add` support.
> > + 
> > ++OpenBSD has the concept of package branches, providing multiple 
> > versions of the
> > ++same package, i.e. `stable` vs. `snapshot`. To select a specific 
> > branch,
> > ++suffix the package name with % sign follwed by the branch name, i.e. 
> > `gimp%stable`.
> > ++
> > + This provider supports the `install_options` and `uninstall_options`
> > + attributes, which allow command-line flags to be passed to pkg_add 
> > and pkg_delete.
> > + These options should

Overhaul package handling in puppet 8

2024-04-09 Thread Sebastian Reitenbach 
Since we now have a recent Puppet in ports, I started looking at how packages 
are handled with Puppet.
My current trouble is that it wasn't really possible to install banches 
properly: i.e. can't properly install gimp, 
or auto* based on branch. Or esp, when want to install multiple of them, it was 
just not possible.
For ports where branches conflict, i.e. postfix, this was working, but had to 
specify exact version, and on every
upgrade bump the version  _very_ annoying.

Currently Puppet allows to install packages of a given version (ensure => 
"X.Y.Z"), or to follow updates (ensure => "latest").
I think for both option, they don't make much sense on OpenBSD. On stable or 
snapshots, forcing a given version is usually
useless, as there is only one. Following latest, is half-baked, as not every 
package is maintained via Puppet, so for example,
it would miss, if just a dependecncy of an installed package gets an update. 
After an update, it's probably more sensical 
to run a general pkg_add -u and being done with it.

However, the missing support for branches caused me lots of trouble. With 
specifying branches, Puppet can take care to 
either "follow" a given branch, i.e. postfix stable, or stable35. Also with the 
branch support, it now allows to install multiple
packages of same name, i.e. two versions of gimp, or all the auto* tools, if 
you will.

In contrast to a new parameter "branch", the branch to choose has to be 
suffixed to the package name, i.e.:

package { "gimp%stable": ensure => "present"}
package { "postfix%stable": flavor => "ldap", ensure => "present"}
package { "puppetserver%8": ensure => "present"}

Now, that we have to be explicit when installing, we also have to be explicit 
when uninstalling, i.e. in the past, for example, when a given flavor of a 
package was installed, it was enough to:
package { "postfix": ensure => "absent"}

Now, you have to be explicit: 
package { "postfix%stable": flavor => "ldap", ensure => "absent"}

actually, the old behaviour, I think was a bit sloppy, and just worked "by 
accident".


I don't know about any, but, with the proper support of branches, and keeping 
also the support of flavors, would anyone have a use case for providing 
versions on packages ensure, or following updates with ensure => "latest"? If 
anyone really has a use-case for it, it could be re-added if necessary, but 
that would make the package handling in the provider way more complicated, than 
it should be ;)

Any feedback welcome, otherwise, I'd really like to go ahead with it in a 
couple of days, and try to get it upstreamed.

This is just for Puppet 8. Anyone still on Puppet 7? It should be easily ported 
to Puppet 7 as well. 

cheers,
Sebastian


Index: Makefile
===
RCS file: /cvs/ports/sysutils/ruby-puppet/8/Makefile,v
diff -u -r1.2 Makefile
--- Makefile20 Mar 2024 21:21:14 -  1.2
+++ Makefile9 Apr 2024 19:51:40 -
@@ -1,6 +1,7 @@
 PORTROACH= limit:^7
 
 VERSION=   8.5.1
+REVISION=  0
 
 RUN_DEPENDS+=  converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
Index: patches/patch-lib_puppet_provider_package_openbsd_rb
===
RCS file: 
/cvs/ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_provider_package_openbsd_rb,v
diff -u -r1.2 patch-lib_puppet_provider_package_openbsd_rb
--- patches/patch-lib_puppet_provider_package_openbsd_rb20 Mar 2024 
21:21:14 -  1.2
+++ patches/patch-lib_puppet_provider_package_openbsd_rb9 Apr 2024 
19:51:40 -
@@ -1,42 +1,89 @@
-- Handle errors from pkg_add
-- Handle uninstall_options being 'nil' by default
-- If no flavor speficied, force the empty flavor with '--'
-  but skipping the % un-ambiguity pkg names
-- Bail out on shortform PKG_PATH (i.e. 'ftp.openbsd.org')
-- pkg.conf is gone
-- properly handle packages with multiple versions and flavors,
-  i.e. postfix-XXX-flavor
-
+- get rid of versionable (no ensure => "version X.X.X")
+- get rid of upgradeable (ensure => latest)
+- properly support branches
 
 Index: lib/puppet/provider/package/openbsd.rb
 --- lib/puppet/provider/package/openbsd.rb.orig
 +++ lib/puppet/provider/package/openbsd.rb
-@@ -24,6 +24,8 @@ Puppet::Type.type(:package).provide :openbsd, :parent 
-   has_feature :upgradeable
+@@ -6,10 +6,14 @@ require_relative '../../../puppet/provider/package'
+ Puppet::Type.type(:package).provide :openbsd, :parent => 
Puppet::Provider::Package do
+   desc "OpenBSD's form of `pkg_add` support.
+ 
++OpenBSD has the concept of package branches, providing multiple versions 
of the
++same package, i.e. `stable` vs. `snapshot`. To select a specific branch,
++suffix the package name with % sign follwed by the branch name, i.e. 
`gimp%stable`.
++
+ This provider supports the

CVS: cvs.openbsd.org: ports

2024-04-09 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/04/09 13:56:55

Modified files:
sysutils/puppetserver/7: Makefile 
sysutils/puppetserver/8: Makefile 

Log message:
I'm the maintainer, so note it in the package

Re: pkg_info -I/-Q using %branch with flavors and pkg_add with branch and flavor

2024-03-22 Thread Sebastian Reitenbach 
On Friday, March 22, 2024 08:40 CET, Stuart Henderson  
wrote:

> On 2024/03/21 23:11, Sebastian Reitenbach wrote:
> > Hi,
> > 
> > found that pkg_info -I supports %branch notation, in contrast to -Q:
> > root@galen:/tmp# pkg_info -Q postfix%stable35 
> > Can't locate object method "match" via package 
> > "OpenBSD::Search::FilterLocation" at /usr/libdata/perl5/OpenBSD/Search.pm 
> > line 25.
> > root@galen:/tmp# pkg_info -Q postfix%snapshot 
> > Can't locate object method "match" via package 
> > "OpenBSD::Search::FilterLocation" at /usr/libdata/perl5/OpenBSD/Search.pm 
> > line 25.
> > root@galen:/tmp# pkg_info -I postfix%snapshot 
> > postfix-3.8.6v0-ldap fast, secure sendmail replacement
> 
> The snapshot dir of Postfix was removed, there's now just stable35
> (the last version that can be built with libressl) and stable.
> 
> > root@galen:/tmp# pkg_info -I postfix%stable35 
> > postfix-3.5.25  fast, secure sendmail replacement
> > postfix-3.5.25-ldap fast, secure sendmail replacement
> > postfix-3.5.25-mysql fast, secure sendmail replacement
> > postfix-3.5.25-pgsql fast, secure sendmail replacement
> > postfix-3.5.25-sasl2 fast, secure sendmail replacement
> > postfix-3.5.25-sasl2-ldap fast, secure sendmail replacement
> > postfix-3.5.25-sasl2-mysql fast, secure sendmail replacement
> > postfix-3.5.25-sasl2-pgsql fast, secure sendmail replacement
> > root@galen:/tmp# pkg_info -I postfix  
> > postfix-3.8.6v0-ldap fast, secure sendmail replacement
> > root@galen:/tmp# pkg_info -Q postfix 
> > postfix-3.5.25
> > postfix-3.5.25-ldap
> > postfix-3.5.25-mysql
> > postfix-3.5.25-pgsql
> > postfix-3.5.25-sasl2
> > postfix-3.5.25-sasl2-ldap
> > postfix-3.5.25-sasl2-mysql
> > postfix-3.5.25-sasl2-pgsql
> > postfix-3.8.6v0
> > postfix-3.8.6v0-ldap (installed)
> > postfix-3.8.6v0-mysql
> > postfix-3.8.6v0-pgsql
> > postfix-3.8.6v0-sasl2
> > postfix-3.8.6v0-sasl2-ldap
> > postfix-3.8.6v0-sasl2-mysql
> > postfix-3.8.6v0-sasl2-pgsql
> > postfix-policyd-spf-perl-2.011
> > 
> > however, as the example shows, when a package of a branch supporting 
> > flavors is installed, using -I pkgname%branch only the installed package is 
> > returned, as compared checking for a branch that is not installed, then all 
> > flavors are listed.
> > My expectation rather for the installed branch would be to also list all 
> > available packages, no?
> 
> There are probably valid use cases for both. Note, you can do this:
> 
> $ pkg_info -I postfix%stable
> postfix-3.8.6v0 fast, secure sendmail replacement
> $ PKG_DBDIR=/var/empty pkg_info -I postfix%stable
> postfix-3.8.6v0 fast, secure sendmail replacement
> postfix-3.8.6v0-ldap fast, secure sendmail replacement
> postfix-3.8.6v0-mysql fast, secure sendmail replacement
> postfix-3.8.6v0-pgsql fast, secure sendmail replacement
> postfix-3.8.6v0-sasl2 fast, secure sendmail replacement
> postfix-3.8.6v0-sasl2-ldap fast, secure sendmail replacement
> postfix-3.8.6v0-sasl2-mysql fast, secure sendmail replacement
> postfix-3.8.6v0-sasl2-pgsql fast, secure sendmail replacement
> 
> > Or would it rather make sense to have pkg_add -Q support %branch notation?
> 
> That would probably be handy.
> 
> > Second topic: pkg_add postfix%snapshot works well, but can't this way to 
> > force to install a given flavor:
> 
> You're hitting some default-case handling by using %snapshot because
> that ports subdir no longer exists.
> 
> > pkg_add postfix%snapshot--ldap 
> > So can't easily install a flavor of a given branch in one command, or am I 
> > missing something?
> 
> postfix--ldap%stable
> 

This is all helpful, have to check that out.

thank you,
Sebastian

pkg_info -I/-Q using %branch with flavors and pkg_add with branch and flavor

2024-03-21 Thread Sebastian Reitenbach 
Hi,

found that pkg_info -I supports %branch notation, in contrast to -Q:
root@galen:/tmp# pkg_info -Q postfix%stable35 
Can't locate object method "match" via package 
"OpenBSD::Search::FilterLocation" at /usr/libdata/perl5/OpenBSD/Search.pm line 
25.
root@galen:/tmp# pkg_info -Q postfix%snapshot 
Can't locate object method "match" via package 
"OpenBSD::Search::FilterLocation" at /usr/libdata/perl5/OpenBSD/Search.pm line 
25.
root@galen:/tmp# pkg_info -I postfix%snapshot 
postfix-3.8.6v0-ldap fast, secure sendmail replacement
root@galen:/tmp# pkg_info -I postfix%stable35 
postfix-3.5.25  fast, secure sendmail replacement
postfix-3.5.25-ldap fast, secure sendmail replacement
postfix-3.5.25-mysql fast, secure sendmail replacement
postfix-3.5.25-pgsql fast, secure sendmail replacement
postfix-3.5.25-sasl2 fast, secure sendmail replacement
postfix-3.5.25-sasl2-ldap fast, secure sendmail replacement
postfix-3.5.25-sasl2-mysql fast, secure sendmail replacement
postfix-3.5.25-sasl2-pgsql fast, secure sendmail replacement
root@galen:/tmp# pkg_info -I postfix  
postfix-3.8.6v0-ldap fast, secure sendmail replacement
root@galen:/tmp# pkg_info -Q postfix 
postfix-3.5.25
postfix-3.5.25-ldap
postfix-3.5.25-mysql
postfix-3.5.25-pgsql
postfix-3.5.25-sasl2
postfix-3.5.25-sasl2-ldap
postfix-3.5.25-sasl2-mysql
postfix-3.5.25-sasl2-pgsql
postfix-3.8.6v0
postfix-3.8.6v0-ldap (installed)
postfix-3.8.6v0-mysql
postfix-3.8.6v0-pgsql
postfix-3.8.6v0-sasl2
postfix-3.8.6v0-sasl2-ldap
postfix-3.8.6v0-sasl2-mysql
postfix-3.8.6v0-sasl2-pgsql
postfix-policyd-spf-perl-2.011

however, as the example shows, when a package of a branch supporting flavors is 
installed, using -I pkgname%branch only the installed package is returned, as 
compared checking for a branch that is not installed, then all flavors are 
listed.
My expectation rather for the installed branch would be to also list all 
available packages, no?
Or would it rather make sense to have pkg_add -Q support %branch notation?

Second topic: pkg_add postfix%snapshot works well, but can't this way to force 
to install a given flavor:
pkg_add postfix%snapshot--ldap 
So can't easily install a flavor of a given branch in one command, or am I 
missing something?

Sebastian

CVS: cvs.openbsd.org: ports

2024-03-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/20 15:35:42

Modified files:
net/udns   : Makefile distinfo 
net/udns/patches: patch-configure 
net/udns/pkg   : PLIST 

Log message:
update 0.4 -> 0.5

CVS: cvs.openbsd.org: ports

2024-03-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/20 15:24:21

Modified files:
sysutils/ruby-puppet-syntax: Makefile distinfo 

Log message:
update 4.0.0 -> 4.1.0

CVS: cvs.openbsd.org: ports

2024-03-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/20 15:21:14

Modified files:
sysutils/ruby-puppet/8: Makefile distinfo 
sysutils/ruby-puppet/8/patches: 

patch-lib_puppet_provider_package_openbsd_rb 

patch-lib_puppet_reference_configuration_rb 
sysutils/ruby-puppet/8/pkg: PLIST 

Log message:
update 8.4.0 -> 8.5.1

CVS: cvs.openbsd.org: ports

2024-03-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/20 15:18:23

Modified files:
sysutils/puppetserver/8: Makefile distinfo 
sysutils/puppetserver/8/pkg: README 

Log message:
update 8.4.0 -> 8.5.0
while there, mention to install hiera within puppetserver as well

CVS: cvs.openbsd.org: ports

2024-03-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/20 15:17:21

Modified files:
databases/puppetdb/8: Makefile distinfo 
databases/puppetdb/8/patches: patch-Makefile 

Log message:
Update 8.3.0 -> 8.4.1

Re: gnustep/libobjc2 and BTI (was: Re: x11/gnustep/libobjc2 failed to build)

2024-03-09 Thread Sebastian Reitenbach 
Sure, fine with me, OK, sebastia@


Missing signature 

> On 8. Mar 2024, at 17:05, Stuart Henderson  wrote:
> 
> Something more than the libffi fix is indeed needed for gnustep on
> arm64, building x11/gnustep/back trips SIGILL when running plmerge (from
> gnustep-base) as part of the build.
> 
> I propose using USE_NOBTCFI-aarch64 (to link with -z nobtcfi on aarch64)
> for now on this set of ports, I think that's good enough for release.
> With this, oolite runs (kind-of important for an Acorn-derived system
> for historical reasons ;) and I can crash into things as well as I can
> on amd64.
> 
> $ doas egdb 
> /usr/local/bin/plmerge plmerge.core
> GNU gdb (GDB) 9.2
> Copyright (C) 2020 Free Software Foundation, Inc.
> License GPLv3+: GNU GPL version 3 or later 
> This is free software: you are free to change and redistribute it.
> There is NO WARRANTY, to the extent permitted by law.
> Type "show copying" and "show warranty" for details.
> This GDB was configured as "aarch64-unknown-openbsd7.5".
> Type "show configuration" for configuration details.
> For bug reporting instructions, please see:
> .
> Find the GDB manual and other documentation resources online at:
>.
> 
> For help, type "help".
> Type "apropos word" to search for commands related to "word"...
> Reading symbols from /usr/local/bin/plmerge...
> Reading symbols from /usr/local/bin/.debug/plmerge.dbg...
> [New process 288319]
> btCore was generated by `plmerge'.
> Program terminated with signal SIGILL, Illegal instruction.
> #0  -[NSBundle release] (self=0xad1ea1f58, _cmd=) at 
> NSBundle.m:2057
> 2057- (oneway void) release
> (gdb) bt
> #0  -[NSBundle release] (self=0xad1ea1f58, _cmd=) at 
> NSBundle.m:2057
> #1  0x000af6786cbc in release(objc_object*) () from 
> /usr/local/lib/libobjc2.so.3.0
> #2  0x000af6786b7c [PAC] in emptyPool(arc_tls*, void*) () from 
> /usr/local/lib/libobjc2.so.3.0
> #3  0x000af6786938 [PAC] in objc_autoreleasePoolPop () from 
> /usr/local/lib/libobjc2.so.3.0
> #4  0x000a975aa4fc [PAC] in -[NSAutoreleasePool dealloc] 
> (self=0xabd627908, _cmd=0xa978b0778 ) at 
> NSAutoreleasePool.m:571
> #5  0x000601345908 [PAC] in gnustep_base_user_main (argc=, 
> argv=, env=) at plmerge.m:139
> #6  0x000601344eb8 [PAC] in _start ()
> 
> 
> Index: games/oolite/Makefile
> ===
> RCS file: /cvs/ports/games/oolite/Makefile,v
> diff -u -p -r1.28 Makefile
> --- games/oolite/Makefile26 Sep 2023 09:41:39 -1.28
> +++ games/oolite/Makefile8 Mar 2024 15:54:40 -
> @@ -1,7 +1,7 @@
> COMMENT=space combat and trading game in the style of Elite
> 
> VERSION=1.73.4
> -REVISION =18
> +REVISION =19
> DISTNAME=oolite-dev-source-${VERSION}
> PKGNAME=oolite-${VERSION}
> CATEGORIES=games
> Index: www/sogo/Makefile
> ===
> RCS file: /cvs/ports/www/sogo/Makefile,v
> diff -u -p -r1.111 Makefile
> --- www/sogo/Makefile14 Jan 2024 20:49:18 -1.111
> +++ www/sogo/Makefile8 Mar 2024 15:54:40 -
> @@ -3,6 +3,7 @@ COMMENT =web based groupware server
> VERSION =5.9.1
> DISTNAME =SOGo-${VERSION}
> PKGNAME =sogo-${VERSION}
> +REVISION =0
> 
> SHARED_LIBS +=GDLContentStore 3.0
> SHARED_LIBS +=NGCards3.1
> Index: www/sope/Makefile
> ===
> RCS file: /cvs/ports/www/sope/Makefile,v
> diff -u -p -r1.99 Makefile
> --- www/sope/Makefile14 Jan 2024 20:40:45 -1.99
> +++ www/sope/Makefile8 Mar 2024 15:54:40 -
> @@ -7,6 +7,9 @@ DISTNAME =SOPE-${VERSION}
> PKGNAME-main =sope-${VERSION}
> PKGNAME-mysql =sope-mysql-${VERSION}
> PKGNAME-postgres =sope-postgres-${VERSION}
> +REVISION-main =0
> +REVISION-mysql =0
> +REVISION-postgres =0
> 
> SO_MAJOR=6
> SO_MINOR=0
> Index: x11/gnustep/gnustep.port.mk
> ===
> RCS file: /cvs/ports/x11/gnustep/gnustep.port.mk,v
> diff -u -p -r1.41 gnustep.port.mk
> --- x11/gnustep/gnustep.port.mk27 Sep 2023 20:37:07 -1.41
> +++ x11/gnustep/gnustep.port.mk8 Mar 2024 15:54:40 -
> @@ -1,6 +1,18 @@
> # until tested on others
> ONLY_FOR_ARCHS ?=${LLD_ARCHS}
> 
> +USE_NOBTCFI-aarch64= Yes
> +# Program terminated with signal SIGILL, Illegal instruction.
> +# #0  -[NSBundle release] (self=0x14704af2d8, _cmd=) at 
> NSBundle.m:2057
> +# #1  0x001565473cbc in release(objc_object*) () from 
> /usr/local/lib/libobjc2.so.3.0
> +# #2  0x001565473ac8 [PAC] in emptyPool(arc_tls*, void*) () from 
> /usr/local/lib/libobjc2.so.3.0
> +# #3  0x001565473938 [PAC] in objc_autoreleasePoolPop () from 
> /usr/local/lib/libobjc2.so.3.0
> +# #4  0x001496a7553c

CVS: cvs.openbsd.org: ports

2024-03-08 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/08 03:05:34

Modified files:
sysutils/ruby-puppetserver-ca: Makefile distinfo 
sysutils/ruby-puppetserver-ca/pkg: PLIST 

Log message:
update 2.6.0 -> 2.7.0

CVS: cvs.openbsd.org: ports

2024-03-07 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/07 15:07:14

Modified files:
www/sogo   : Makefile distinfo 
www/sogo/pkg   : PLIST 
Added files:
www/sogo/patches: patch-Tools_SOGoToolUpdateSecret_m 

Log message:
update 5.9.1 -> 5.10.0

CVS: cvs.openbsd.org: ports

2024-03-07 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/07 15:05:45

Modified files:
www/sope   : Makefile distinfo 
Removed files:
www/sope/patches: patch-sope-mime_NGMime_NGMimeType_m 

Log message:
update 5.9.1 -> 5.10.0

CVS: cvs.openbsd.org: ports

2024-03-07 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/07 13:59:30

Modified files:
www/puppetboard: Makefile distinfo 

Log message:
update 5.3.0 -> 5.4.0

Re: gnustep/libobjc2 and BTI (was: Re: x11/gnustep/libobjc2 failed to build)

2024-03-07 Thread Sebastian Reitenbach 
On Thursday, March 07, 2024 12:36 CET, Stuart Henderson  
wrote:

> > > > How do I get a BTI enabled machine?
> > 
> > Apparently most Intel Gen11+ CPUs have IBT.  For arm64 you need an
> > Apple M2.
> 
> Look for "Control-Flow Enforcement Technology" in the Intel cpu details
> page on ark.intel.com. Yes it needs to be gen11 or newer.
> 
> AMD does not have it yet.
> 
> Cheapest way is probably the N100-based mini PCs (not speed demons but
> fairly acceptable and they're really cheap).
> 
> For laptops, Thinkpad T14 are fairly common amongst developers.
> (T14 g2 has gen11 CPUs, all cores the same - T14 g3 has gen12, mix
> of performance + efficiency cores).
> 

I don't own such modern hardware ;)
But such N100 based mini PC looks like a viable option to add to my stack.

Sebastian

Re: gnustep/libobjc2 and BTI (was: Re: x11/gnustep/libobjc2 failed to build)

2024-03-07 Thread Sebastian Reitenbach 
On Thursday, March 07, 2024 10:28 CET, Mark Kettenis  
wrote:

> > From: "Sebastian Reitenbach" 
> > Date: Thu, 07 Mar 2024 09:01:13 +0100
> > 
> > Hi,
> > 
> > On Wednesday, March 06, 2024 23:42 CET, Mark Kettenis 
> >  wrote:
> > 
> > > > Date: Wed, 06 Mar 2024 23:32:51 +0100
> > > > From: Mark Kettenis 
> > > > 
> > > > > Date: Wed, 6 Mar 2024 19:02:35 +0100
> > > > > From: Jeremie Courreges-Anglas 
> > > > > 
> > > > > Le Wed, Mar 06, 2024 at 10:17:32AM +0100, Theo Buehler a écrit :
> > > > > > Could you please resend the endbr64 patches with Cc kettenis? They
> > > > > > should make release.
> > > > > 
> > > > > Since I now have a laptop with BTI I figured I was going to give this
> > > > > a try.  -current x11/gnustep/zipper was crashing with SIGILL on amd64.
> > > > > For the amd64 diff I'm deliberately not caring about the assembly for
> > > > > Windows.  I can't test the arm64 part but it looks simple.
> > > > > 
> > > > > ok?
> > > > > 
> > > > > Sebastian, feel free to commit this if it matches your previous diff.
> > > > 
> > > > Looks right to me.
> > > 
> > > Actually, the arm64 bit is probably incomplete.  And tb@ has a point
> > > that endbr64 should be after the .cfi_startproc.
> > > 
> > 
> > I already created a lot of mess rushing getting the update in, I'm 
> > a bit confused with this back and fourth. Before messing up even more, 
> > which of these should be the correct version, the one from tb@ or jca@ ?
> > And that one would also be complete in aarch64?
> > If I got all those threats right, the tb@ version would be the correct one?
> > Both attached below.
> > 
> > 
> > How do I get a BTI enabled machine?
> > 
> > Sebastian
> > 
> > tb@ version:
> 
> This version looks best to me.  But I suspect arm64 needs more work in
> this version too.
> 
> ok kettenis@
> 
Thank you all, this version is now in, I'll see to upstream it.

Sebastian

CVS: cvs.openbsd.org: ports

2024-03-07 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/07 05:22:50

Modified files:
x11/gnustep/libobjc2: Makefile 
Added files:
x11/gnustep/libobjc2/patches: patch-block_trampolines_S 
  patch-objc_msgSend_aarch64_S 
  patch-objc_msgSend_x86-64_S 

Log message:
BTI/endbr64 fixes, patches prodded by tb@
aarch64 might still be incomplete
OK jca@, kettenis@

CVS: cvs.openbsd.org: ports

2024-03-07 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/07 03:04:01

Modified files:
sysutils/ruby-facter: Makefile distinfo 
sysutils/ruby-facter/files/resolvers: virtual.rb 
sysutils/ruby-facter/patches: 
  
patch-lib_facter_framework_core_file_loader_rb 
  
patch-lib_facter_util_facts_posix_virtual_detector_rb 
sysutils/ruby-facter/pkg: PLIST 

Log message:
update 4.5.2 -> 4.6.1
while there, fix the virtual and is_virtual fact on physical hardware

Re: gnustep/libobjc2 and BTI (was: Re: x11/gnustep/libobjc2 failed to build)

2024-03-07 Thread Sebastian Reitenbach 
Hi,


On Wednesday, March 06, 2024 23:42 CET, Mark Kettenis  
wrote:

> > Date: Wed, 06 Mar 2024 23:32:51 +0100
> > From: Mark Kettenis 
> > 
> > > Date: Wed, 6 Mar 2024 19:02:35 +0100
> > > From: Jeremie Courreges-Anglas 
> > > 
> > > Le Wed, Mar 06, 2024 at 10:17:32AM +0100, Theo Buehler a écrit :
> > > > Could you please resend the endbr64 patches with Cc kettenis? They
> > > > should make release.
> > > 
> > > Since I now have a laptop with BTI I figured I was going to give this
> > > a try.  -current x11/gnustep/zipper was crashing with SIGILL on amd64.
> > > For the amd64 diff I'm deliberately not caring about the assembly for
> > > Windows.  I can't test the arm64 part but it looks simple.
> > > 
> > > ok?
> > > 
> > > Sebastian, feel free to commit this if it matches your previous diff.
> > 
> > Looks right to me.
> 
> Actually, the arm64 bit is probably incomplete.  And tb@ has a point
> that endbr64 should be after the .cfi_startproc.
> 

I already created a lot of mess rushing getting the update in, I'm 
a bit confused with this back and fourth. Before messing up even more, 
which of these should be the correct version, the one from tb@ or jca@ ?
And that one would also be complete in aarch64?
If I got all those threats right, the tb@ version would be the correct one?
Both attached below.


How do I get a BTI enabled machine?

Sebastian

tb@ version:

Index: patches/patch-block_trampolines_S
===
RCS file: patches/patch-block_trampolines_S
diff -N patches/patch-block_trampolines_S
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-block_trampolines_S   28 Feb 2024 20:08:24 -
@@ -0,0 +1,19 @@
+Index: block_trampolines.S
+--- block_trampolines.S.orig
 block_trampolines.S
+@@ -22,6 +22,7 @@
+ // x86-64 trampoline
+ 

+ .macro trampoline arg0, arg1
++  endbr64
+   mov   -0x1007(%rip), \arg1   # Load the block pointer into the second 
argument
+   xchg  \arg1, \arg0   # Swap the first and second arguments
+   jmp   *-0x1008(%rip) # Call the block function
+@@ -121,6 +122,7 @@
+ // AArch64 (ARM64) trampoline
+ 

+ .macro trampoline arg0, arg1
++  bti c
+   adr x17, #-4096
+   mov \arg1, \arg0
+   ldp \arg0, x17, [x17]
Index: patches/patch-objc_msgSend_aarch64_S
===
RCS file: patches/patch-objc_msgSend_aarch64_S
diff -N patches/patch-objc_msgSend_aarch64_S
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-objc_msgSend_aarch64_S28 Feb 2024 20:08:24 -
@@ -0,0 +1,12 @@
+Index: objc_msgSend.aarch64.S
+--- objc_msgSend.aarch64.S.orig
 objc_msgSend.aarch64.S
+@@ -47,7 +47,7 @@
+ #   define EH_NOP .seh_nop
+ #else
+ // Marks the real start and end of the function
+-#   define EH_START .cfi_startproc
++#   define EH_START .cfi_startproc; bti c
+ #   define EH_END .cfi_endproc
+ 
+ // The following directives are either not
Index: patches/patch-objc_msgSend_x86-64_S
===
RCS file: patches/patch-objc_msgSend_x86-64_S
diff -N patches/patch-objc_msgSend_x86-64_S
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-objc_msgSend_x86-64_S 28 Feb 2024 20:08:24 -
@@ -0,0 +1,12 @@
+Index: objc_msgSend.x86-64.S
+--- objc_msgSend.x86-64.S.orig
 objc_msgSend.x86-64.S
+@@ -8,7 +8,7 @@
+ # define SECOND_ARGUMENT %rdx
+ # define THIRD_ARGUMENT %r8
+ #else
+-# define START_PROC(x) .cfi_startproc
++# define START_PROC(x) .cfi_startproc; endbr64
+ # define END_PROC(x) .cfi_endproc
+ # define FRAME_OFFSET(x) .cfi_adjust_cfa_offset x
+ # define FIRST_ARGUMENT_STR "%rdi"



@jca version:



Index: Makefile
===
RCS file: /home/cvs/ports/x11/gnustep/libobjc2/Makefile,v
diff -u -p -r1.37 Makefile
--- Makefile5 Mar 2024 16:11:15 -   1.37
+++ Makefile6 Mar 2024 17:26:11 -
@@ -4,7 +4,7 @@ COMMENT =   GNUstep libobjc2 objective-c r
 
 # note: this port does not use the gnustep module
 VERSION =  2.2
-REVISION = 3
+REVISION = 4
 GH_ACCOUNT =   gnustep
 GH_PROJECT =   libobjc2
 GH_TAGNAME =   v${VERSION}
Index: patches/patch-objc_msgSend_aarch64_S
===
RCS file: patches/patch-objc_msgSend_aarch64_S
diff -N patches/patch-objc_msgSend_aarch64_S
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-objc_msgSend_aarch64_S6 Mar 2024 17:19:04 -
@@ -0,0 +1,11 @@
+Index: objc_msgSend.aarch64.S
+--- objc_msgSend.aarch64.S.orig
 objc_msgSend.aarch64.S
+@@ -73,6 +73,7 @@ CDECL(objc_msgSend):
+ CDECL(objc_msgSend_fpret):
+ CDECL(objc_msgSend_stret):
+   EH_START
++  btic
+ 
+

CVS: cvs.openbsd.org: ports

2024-03-06 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/06 09:51:33

Modified files:
sysutils/ruby-puppet/7: Makefile distinfo 
sysutils/ruby-puppet/7/pkg: PLIST 

Log message:
update 7.28.0 -> 7.29.1

CVS: cvs.openbsd.org: ports

2024-03-06 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/06 04:06:20

Modified files:
sysutils/puppetserver/7: Makefile distinfo 

Log message:
update 7.14.0 -> 7.16.0

CVS: cvs.openbsd.org: ports

2024-03-06 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/06 02:36:51

Modified files:
databases/puppetdb/7: Makefile distinfo 
databases/puppetdb/7/patches: patch-Makefile 

Log message:
update 7.16.0 -> 7.17.1

CVS: cvs.openbsd.org: ports

2024-03-05 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/05 09:11:15

Modified files:
x11/gnustep/libobjc2: Makefile 
Added files:
x11/gnustep/libobjc2/patches: patch-CMakeLists_txt 

Log message:
fix typo in CMakeLists to let it properly find robin-map

Re: x11/gnustep/libobjc2 failed to build

2024-03-05 Thread Sebastian Reitenbach 
On Tuesday, March 05, 2024 08:01 CET, Jeremie Courreges-Anglas 
 wrote:

> Le Mon, Mar 04, 2024 at 10:48:46PM +0100, Jeremie Courreges-Anglas a écrit :
> > Le Mon, Mar 04, 2024 at 10:26:02PM +0100, Sebastian Reitenbach a écrit :
> > > On Sunday, March 03, 2024 21:56 CET, Stuart Henderson 
> > >  wrote:
> > > 
> > > > On 2024/03/03 20:52, Stuart Henderson wrote:
> > > > > On 2024/03/03 20:31, Sebastian Reitenbach wrote:
> > > > > > If I understand removing the @pkgpath fixed the bigger part of the 
> > > > > > issue?
> > > > 
> > > > PS "bigger part of the issue" = "bulk builds were breaking because the
> > > > dependency loop resulted in too much disk space being eatern" but the
> > > > remaining problem is still fairly important.
> > > > 
> > > 
> > > 
> > > The conflicting file is the include/Block.h
> > > 
> > > Nothing that depends on libobjc2, really needs it. gnustep-base is 
> > > configured to
> > > not search for Blocks runtime.
> > 
> > I'm testing something similar, slightly more conservative: move
> > Block.h and Block_private.h to /usr/local/include/gnustep/; the idea
> > is that directory is prepended to C(PP)FLAGS during the build of the
> > gnustep ports/consumers, thus ports that really need to include
> > Block.h can find it out of the box.  This partial build is still
> > ongoing:
> > 
> >   I=515 B=21 Q=2 T=25 F=0 !=0
> 
> No error.
> 
> > and so far ''stat /usr/local/include/gnustep/Block.h'' says no port
> > has tried to include the file.
> 
> No port has tried to include that file, as you expected.
> 
> > So you're definitely on the right
> > track.  The build should complete later this night.
> > 
> > > This, with another bump of libdispatch, and removed @conflict in PLIST
> > > should do the trick.
> > > 
> > > OK?
> > 
> > You're just moving a header, so why the shared lib major bump?
> > (You've already bumped the major in the last update.)
> > 
> > Depending on my ongoing build it could be better to move both Block*.h
> > headers to /usr/local/include/gnustep where they can be used, or to
> > just zap both of them if they're really not useful.
> 
> I think moving both files under /usr/local/include/gnustep makes most
> sense but you get the last word.
> 
> ok jca@

thank you, followed your suggestion to move to /usr/local/include/gnustep.
as well as removed the conflict from devel/libdispatch

Sebastian

> 
> > > Sebastian
> > > 
> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
> > > diff -u -r1.35 Makefile
> > > --- Makefile  3 Mar 2024 12:28:24 -   1.35
> > > +++ Makefile  4 Mar 2024 20:02:11 -
> > > @@ -4,15 +4,15 @@
> > >  
> > >  # note: this port does not use the gnustep module
> > >  VERSION =2.2
> > > -REVISION =   1
> > > +REVISION =   2
> > >  GH_ACCOUNT = gnustep
> > >  GH_PROJECT = libobjc2
> > >  GH_TAGNAME = v${VERSION}
> > >  DISTNAME =   libobjc2-${VERSION:S/_//}
> > >  PKGNAME =gnustep-${DISTNAME}
> > >  
> > > -SHARED_LIBS +=   objc2   2.0
> > > -SHARED_LIBS +=  objcxx   1.0
> > > +SHARED_LIBS +=   objc2   3.0
> > > +SHARED_LIBS +=  objcxx   2.0
> > >  
> > >  CATEGORIES = x11/gnustep devel
> > >  
> > > @@ -45,5 +45,8 @@
> > >  
> > >  MAKE_FLAGS +=   LIBOBJCLIBNAME=objc2 \
> > >  LIBOBJC=libobjc2
> > > +
> > > +post-install:
> > > + mv ${PREFIX}/include/Block.h ${PREFIX}/include/Block-libobjc2.h
> > >  
> > >  .include 
> > > Index: pkg/PLIST
> > > ===
> > > RCS file: /cvs/ports/x11/gnustep/libobjc2/pkg/PLIST,v
> > > diff -u -r1.6 PLIST
> > > --- pkg/PLIST 3 Mar 2024 12:28:24 -   1.6
> > > +++ pkg/PLIST 4 Mar 2024 20:02:11 -
> > > @@ -1,5 +1,4 @@
> > > -@conflict libdispatch-*
> > > -include/Block.h
> > > +include/Block-libobjc2.h
> > >  include/Block_private.h
> > >  include/gnustep/
> > >  include/gnustep/objc/
> > > 
> > 
> > -- 
> > jca
> > 
> 
> -- 
> jca

CVS: cvs.openbsd.org: ports

2024-03-05 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/05 06:29:45

Modified files:
devel/libdispatch: Makefile 
devel/libdispatch/pkg: PLIST 

Log message:
deconflict with x11/gnustep/libobjc2

CVS: cvs.openbsd.org: ports

2024-03-05 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/03/05 06:28:56

Modified files:
x11/gnustep/libobjc2: Makefile 
x11/gnustep/libobjc2/pkg: PLIST 

Log message:
deconflict with devel/libdispatch

review and OK jca@

Re: x11/gnustep/libobjc2 failed to build

2024-03-04 Thread Sebastian Reitenbach 
On Sunday, March 03, 2024 21:56 CET, Stuart Henderson  
wrote:

> On 2024/03/03 20:52, Stuart Henderson wrote:
> > On 2024/03/03 20:31, Sebastian Reitenbach wrote:
> > > If I understand removing the @pkgpath fixed the bigger part of the issue?
> 
> PS "bigger part of the issue" = "bulk builds were breaking because the
> dependency loop resulted in too much disk space being eatern" but the
> remaining problem is still fairly important.
> 


The conflicting file is the include/Block.h

Nothing that depends on libobjc2, really needs it. gnustep-base is configured to
not search for Blocks runtime.

This, with another bump of libdispatch, and removed @conflict in PLIST
should do the trick.

OK?
Sebastian

Index: Makefile
===
RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
diff -u -r1.35 Makefile
--- Makefile3 Mar 2024 12:28:24 -   1.35
+++ Makefile4 Mar 2024 20:02:11 -
@@ -4,15 +4,15 @@
 
 # note: this port does not use the gnustep module
 VERSION =  2.2
-REVISION = 1
+REVISION = 2
 GH_ACCOUNT =   gnustep
 GH_PROJECT =   libobjc2
 GH_TAGNAME =   v${VERSION}
 DISTNAME = libobjc2-${VERSION:S/_//}
 PKGNAME =  gnustep-${DISTNAME}
 
-SHARED_LIBS += objc2   2.0
-SHARED_LIBS +=  objcxx 1.0
+SHARED_LIBS += objc2   3.0
+SHARED_LIBS +=  objcxx 2.0
 
 CATEGORIES =   x11/gnustep devel
 
@@ -45,5 +45,8 @@
 
 MAKE_FLAGS +=   LIBOBJCLIBNAME=objc2 \
 LIBOBJC=libobjc2
+
+post-install:
+   mv ${PREFIX}/include/Block.h ${PREFIX}/include/Block-libobjc2.h
 
 .include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/gnustep/libobjc2/pkg/PLIST,v
diff -u -r1.6 PLIST
--- pkg/PLIST   3 Mar 2024 12:28:24 -   1.6
+++ pkg/PLIST   4 Mar 2024 20:02:11 -
@@ -1,5 +1,4 @@
-@conflict libdispatch-*
-include/Block.h
+include/Block-libobjc2.h
 include/Block_private.h
 include/gnustep/
 include/gnustep/objc/

Re: x11/gnustep/libobjc2 failed to build

2024-03-03 Thread Sebastian Reitenbach 
On Sunday, March 03, 2024 13:32 CET, Stuart Henderson  
wrote:

> On 2024/03/03 10:38, Antoine Jacoutot wrote:
> > Probably because devel/libdispatch has:
> > @conflict gnustep-libobjc2-*
> > @pkgpath x11/gnustep/libobjc2
> > 
> > and x11/gnustep/libobjc2 has:
> > @conflict libdispatch-*
> > @pkgpath devel/libdispatch
> > 
> > That does not make much sense...
> > 
> > > > > and now my dpb got stuck in loops 
> 
> I've removed the incorrect @pkgpath markers fixing the worst of the
> issues, but there is still a problem.
> 
> We can't have two ports which are used as build dependencies of other
> ports having @conflicts between themselves.
> 
> This will need to be resolved rather than just marking the conflict.
> 

I'm sorry for the mess I created. I intended to get it in quickly, due to the
endbr64 fixes work. As the version in tree is very old, and the just recently
released 2.2 finally builds and doesn't show runtime errors in apps linked 
against it.

The only port that depends on libobjc2, that had a dependency to libdispatch
was x11/gnustep/base, but that one I "fixed", not depending on libdispatch 
anymore.
gnustep-base-1.29.0 REVISION 1 should not depend on libdispatch anymore.

If I understand removing the @pkgpath fixed the bigger part of the issue?
That there is a conflict with libdispatch, is already known for upstream.

Sebastian

Re: missing endbr64

2024-02-29 Thread Sebastian Reitenbach 
On Wednesday, February 28, 2024 22:49 CET, Theo Buehler  
wrote:

> On Wed, Feb 28, 2024 at 10:44:27PM +0100, Sebastian Reitenbach wrote:
> > Hi,
> > On Wednesday, February 28, 2024 21:13 CET, Theo Buehler 
> >  wrote:
> > 
> > > On Sun, Feb 25, 2024 at 10:13:44PM +0100, Sebastian Reitenbach wrote:
> > > > On Sunday, February 25, 2024 16:44 CET, Mark Kettenis 
> > > >  wrote:
> > > > 

Tested your patch, the warnings are gone. A couple of apps tested, seems to 
work.
I don't have a machine where it would cause aborts.

Additionally, the typo fix (which I found in upstream already fixed) also 
prevents the
Git checkout at configure stage. The revision bump might not be needed, as no 
packages
could have been built, but someone might have manually built it?

OK?

Sebastian

Index: Makefile
===
RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
diff -u -r1.34 Makefile
--- Makefile28 Feb 2024 19:52:15 -  1.34
+++ Makefile29 Feb 2024 09:54:53 -
@@ -4,7 +4,7 @@
 
 # note: this port does not use the gnustep module
 VERSION =  2.2
-REVISION = 0
+REVISION = 1
 GH_ACCOUNT =   gnustep
 GH_PROJECT =   libobjc2
 GH_TAGNAME =   v${VERSION}
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt29 Feb 2024 09:54:53 -
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -126,7 +126,7 @@ endif ()
+ 
+ find_package(tsl-robin-map)
+ 
+-if (NOT tls-robin-map_FOUND)
++if (NOT tsl-robin-map_FOUND)
+   FetchContent_Declare(
+   robinmap
+   GIT_REPOSITORY https://github.com/Tessil/robin-map/
Index: patches/patch-block_trampolines_S
===
RCS file: patches/patch-block_trampolines_S
diff -N patches/patch-block_trampolines_S
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-block_trampolines_S   29 Feb 2024 09:54:53 -
@@ -0,0 +1,19 @@
+Index: block_trampolines.S
+--- block_trampolines.S.orig
 block_trampolines.S
+@@ -22,6 +22,7 @@
+ // x86-64 trampoline
+ 

+ .macro trampoline arg0, arg1
++  endbr64
+   mov   -0x1007(%rip), \arg1   # Load the block pointer into the second 
argument
+   xchg  \arg1, \arg0   # Swap the first and second arguments
+   jmp   *-0x1008(%rip) # Call the block function
+@@ -121,6 +122,7 @@
+ // AArch64 (ARM64) trampoline
+ 

+ .macro trampoline arg0, arg1
++  bti c
+   adr x17, #-4096
+   mov \arg1, \arg0
+   ldp \arg0, x17, [x17]
Index: patches/patch-objc_msgSend_aarch64_S
===
RCS file: patches/patch-objc_msgSend_aarch64_S
diff -N patches/patch-objc_msgSend_aarch64_S
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-objc_msgSend_aarch64_S29 Feb 2024 09:54:53 -
@@ -0,0 +1,12 @@
+Index: objc_msgSend.aarch64.S
+--- objc_msgSend.aarch64.S.orig
 objc_msgSend.aarch64.S
+@@ -47,7 +47,7 @@
+ #   define EH_NOP .seh_nop
+ #else
+ // Marks the real start and end of the function
+-#   define EH_START .cfi_startproc
++#   define EH_START .cfi_startproc; bti c
+ #   define EH_END .cfi_endproc
+ 
+ // The following directives are either not
Index: patches/patch-objc_msgSend_x86-64_S
===
RCS file: patches/patch-objc_msgSend_x86-64_S
diff -N patches/patch-objc_msgSend_x86-64_S
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-objc_msgSend_x86-64_S 29 Feb 2024 09:54:53 -
@@ -0,0 +1,12 @@
+Index: objc_msgSend.x86-64.S
+--- objc_msgSend.x86-64.S.orig
 objc_msgSend.x86-64.S
+@@ -8,7 +8,7 @@
+ # define SECOND_ARGUMENT %rdx
+ # define THIRD_ARGUMENT %r8
+ #else
+-# define START_PROC(x) .cfi_startproc
++# define START_PROC(x) .cfi_startproc; endbr64
+ # define END_PROC(x) .cfi_endproc
+ # define FRAME_OFFSET(x) .cfi_adjust_cfa_offset x
+ # define FIRST_ARGUMENT_STR "%rdi"

Re: missing endbr64

2024-02-28 Thread Sebastian Reitenbach 
Hi,
On Wednesday, February 28, 2024 21:13 CET, Theo Buehler  
wrote:

> On Sun, Feb 25, 2024 at 10:13:44PM +0100, Sebastian Reitenbach wrote:
> > On Sunday, February 25, 2024 16:44 CET, Mark Kettenis 
> >  wrote:
> > 
> > > > x11/gnustep/libobjc2.log
> > > > ld: warning: __objc_block_trampoline_sret: missing endbr64
> > > > ld: warning: __objc_block_trampoline: missing endbr64
> > > > ld: warning: objc_msgSend: missing endbr64
> > > > ld: warning: objc_msgSend_fpret: missing endbr64
> > > > ld: warning: objc_msgSend_stret: missing endbr64
> > > 
> > > I guess this is very similay to devel/objfw.  Just add endbr64 to
> > > those functions like we did there.  No aarch64 support here by the
> > > looks of it.
> > 
> > Above version of libobjc2 is old, but due to build errors, and runtime 
> > errors, I was 
> > unable to upgrade. However, a new version was released just a few days ago, 
> > and that one even builds
> > and doesn't show runtime errors so far.
> > I updated one test box, to get these new ld warnings, there are only these 
> > left on amd64:
> > 
> > ld: warning: objc_msgSend: missing endbr64
> > ld: warning: objc_msgSend_fpret: missing endbr64
> > ld: warning: objc_msgSend_stret: missing endbr64
> > 
> > Which are all the platforms, that need such fix? I see objc_msgSend_fpret 
> > for aarch64, arm, 
> > amd64, i386, mips and riscv64.
> > 
> > Attached patch to update to the new 2.2 release, without any fixes for the 
> > missing endbr64.
> > 
> > Sebastian
> 
> Not sure what to do for riscv64.
> 
> The diff below on top of what you committed a few minutes ago should do
> the trick. However, the port needs fixing because of this:
> 
> [1/9] Performing download step (git clone) for 'robinmap-populate'
> Cloning into 'robinmap-src'...
> fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not 
> resolve host: github.com
> Cloning into 'robinmap-src'...
> fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not 
> resolve host: github.com
> Cloning into 'robinmap-src'...
> fatal: unable to access 'https://github.com/Tessil/robin-map/': Could not 
> resolve host: github.com
> -- Had to git clone more than once: 3 times.
> CMake Error at 
> robinmap-subbuild/robinmap-populate-prefix/tmp/robinmap-populate-gitclone.cmake:39
>  (message):
>   Failed to clone repository: 'https://github.com/Tessil/robin-map/'
> 
do you have robin-map-1.2.1 installed, or some older version?
I haven't seen that here, but can trash that downloading with a patch if 
necessary.


I was just working on it (without having any clue what I'm doing here)
It got rid of the warnings, but looks differently to what you have.
I'll try your patch below Tomorrow

cheers,
Sebastian

> 
> Index: patches/patch-block_trampolines_S
> ===
> RCS file: patches/patch-block_trampolines_S
> diff -N patches/patch-block_trampolines_S
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-block_trampolines_S 28 Feb 2024 20:08:24 -
> @@ -0,0 +1,19 @@
> +Index: block_trampolines.S
> +--- block_trampolines.S.orig
>  block_trampolines.S
> +@@ -22,6 +22,7 @@
> + // x86-64 trampoline
> + 
> 
> + .macro trampoline arg0, arg1
> ++endbr64
> + mov   -0x1007(%rip), \arg1   # Load the block pointer into the second 
> argument
> + xchg  \arg1, \arg0   # Swap the first and second arguments
> + jmp   *-0x1008(%rip) # Call the block function
> +@@ -121,6 +122,7 @@
> + // AArch64 (ARM64) trampoline
> + 
> 
> + .macro trampoline arg0, arg1
> ++bti c
> + adr x17, #-4096
> + mov \arg1, \arg0
> + ldp \arg0, x17, [x17]
> Index: patches/patch-objc_msgSend_aarch64_S
> ===
> RCS file: patches/patch-objc_msgSend_aarch64_S
> diff -N patches/patch-objc_msgSend_aarch64_S
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-objc_msgSend_aarch64_S  28 Feb 2024 20:08:24 -
> @@ -0,0 +1,12 @@
> +Index: objc_msgSend.aarch64.S
> +--- objc_msgSend.aarch64.S.orig
>  objc_msgSend.aarch64.S
> +@@ -47,7 +47,7 @@
> + #   define EH_NOP .seh_nop
> + #else
> + // Marks the real start and end of the function
> +-#   define EH_START .cfi_startproc
> ++#   define EH_START .cfi_startproc; bti c
> + #   define EH_END .cfi_endproc

WIP: update net/kismet

2024-02-28 Thread Sebastian Reitenbach 
Hi,

that old Kismet bugged me quite a long time, but their completely rewritten 
code-base has prevented an update so far. Eventually found time to implement
some simple OpenBSD WiFi support.
It just detects all WiFi devices in the "wlan" group.
Trying to use more than one WiFi device, brings my host to a grinding halt, 
don't know why. Last but not least, only tested with 2.4GHz Wifi devices, 
lacking a proper 5 GHz device.

Besides WiFi, also tested and known to work: BT LE sniffing with Adafruit LE 
Friend with Sniffer firmware, as well as ADSR plane spotting, with a RTL-SDR 
BLOG.

This is just a snapshot, more or less waiting for their next release, otherwise 
could also update to
this here.

Comments on the port, test reports etc. welcome.

cheers,
Sebastian


kismet-wip.diff
Description: Binary data

CVS: cvs.openbsd.org: ports

2024-02-28 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/28 12:52:15

Modified files:
x11/gnustep/libobjc2: Makefile 
x11/gnustep/libobjc2/pkg: PLIST 

Log message:
conflict with libdispatch

CVS: cvs.openbsd.org: ports

2024-02-28 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/28 12:49:40

Modified files:
devel/libdispatch: Makefile 
devel/libdispatch/pkg: PLIST 

Log message:
conflicts with gnustep-libocj2

CVS: cvs.openbsd.org: ports

2024-02-28 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/28 12:46:46

Modified files:
x11/gnustep/base: Makefile 

Log message:
do not pick up libdispatch

CVS: cvs.openbsd.org: ports

2024-02-28 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/28 12:44:39

Modified files:
x11/gnustep/libobjc2: Makefile distinfo 
x11/gnustep/libobjc2/pkg: PLIST 
Removed files:
x11/gnustep/libobjc2/patches: patch-CMakeLists_txt 
  patch-objc_msgSend_arm_S 
  patch-objcxx_eh_cc 

Log message:
update to 2.2

CVS: cvs.openbsd.org: ports

2024-02-26 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/26 14:21:29

Modified files:
security/hcxtools: Makefile distinfo 

Log message:
update 6.3.2 -> 6.3.4

Re: missing endbr64

2024-02-25 Thread Sebastian Reitenbach 
On Sunday, February 25, 2024 16:44 CET, Mark Kettenis  
wrote:

> > x11/gnustep/libobjc2.log
> > ld: warning: __objc_block_trampoline_sret: missing endbr64
> > ld: warning: __objc_block_trampoline: missing endbr64
> > ld: warning: objc_msgSend: missing endbr64
> > ld: warning: objc_msgSend_fpret: missing endbr64
> > ld: warning: objc_msgSend_stret: missing endbr64
> 
> I guess this is very similay to devel/objfw.  Just add endbr64 to
> those functions like we did there.  No aarch64 support here by the
> looks of it.

Above version of libobjc2 is old, but due to build errors, and runtime errors, 
I was 
unable to upgrade. However, a new version was released just a few days ago, and 
that one even builds
and doesn't show runtime errors so far.
I updated one test box, to get these new ld warnings, there are only these left 
on amd64:

ld: warning: objc_msgSend: missing endbr64
ld: warning: objc_msgSend_fpret: missing endbr64
ld: warning: objc_msgSend_stret: missing endbr64

Which are all the platforms, that need such fix? I see objc_msgSend_fpret for 
aarch64, arm, 
amd64, i386, mips and riscv64.

Attached patch to update to the new 2.2 release, without any fixes for the 
missing endbr64.

Sebastian


libobjc2-2.2.diff
Description: Binary data

fix building java when jni.h is included

2024-02-24 Thread Sebastian Reitenbach 
Hi,

in jni.h, jni_md.h is included. However, this file is installed in 
openbsd/jni_md.h
The patch below is for jdk-11, but I saw, that jdk-1.8 has the same issue.
Don't know if that patch is the most sane approach, or if there are better ways
to fix the issue.

Sebastian


Index: Makefile
===
RCS file: /cvs/ports/devel/jdk/11/Makefile,v
diff -u -r1.55 Makefile
--- Makefile22 Nov 2023 23:38:04 -  1.55
+++ Makefile24 Feb 2024 21:44:38 -
@@ -12,7 +12,7 @@
 PKGNAME=   jdk-${PACKAGE_VER}
 PKGSTEM=   jdk-11
 EPOCH= 0
-REVISION=  0
+REVISION=  1
 
 DIST_SUBDIR=   jdk
 DISTNAME=  jdk-${VERSION_STR}
Index: patches/patch-src_java_base_share_native_include_jni_h
===
RCS file: patches/patch-src_java_base_share_native_include_jni_h
diff -N patches/patch-src_java_base_share_native_include_jni_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_java_base_share_native_include_jni_h  24 Feb 2024 
21:44:38 -
@@ -0,0 +1,13 @@
+Let it properly find jni_md.h
+Index: src/java.base/share/native/include/jni.h
+--- src/java.base/share/native/include/jni.h.orig
 src/java.base/share/native/include/jni.h
+@@ -42,7 +42,7 @@
+ /* jni_md.h contains the machine-dependent typedefs for jbyte, jint
+and jlong */
+ 
+-#include "jni_md.h"
++#include "openbsd/jni_md.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {

CVS: cvs.openbsd.org: ports

2024-02-24 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/24 09:23:25

Modified files:
sysutils/puppetserver: Makefile 

Log message:
hook up Puppetserver 8

CVS: cvs.openbsd.org: ports

2024-02-24 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/24 09:19:52

Log message:
import Puppetserver 8

Puppet is configured in an agent-server architecture, in which a primary
server node manages the configuration information for a fleet of agent
nodes. Puppet Server acts as the primary server node. Puppet Server is a
Ruby and Clojure application that runs on the Java Virtual Machine
(JVM). Puppet Server runs Ruby code for compiling Puppet catalogs and
for serving files in several JRuby interpreters. It also provides a
certificate authority through Clojure.

OK kn@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20240224

N ports/sysutils/puppetserver/8/Makefile
N ports/sysutils/puppetserver/8/distinfo
N ports/sysutils/puppetserver/8/patches/patch-ext_bin_puppetserver
N ports/sysutils/puppetserver/8/patches/patch-ext_cli_foreground
N ports/sysutils/puppetserver/8/patches/patch-ext_cli_reload
N ports/sysutils/puppetserver/8/patches/patch-ext_cli_start
N 
ports/sysutils/puppetserver/8/patches/patch-ext_config_conf_d_puppetserver_conf
N ports/sysutils/puppetserver/8/patches/patch-ext_default
N ports/sysutils/puppetserver/8/patches/patch-ext_ezbake-functions_sh
N ports/sysutils/puppetserver/8/pkg/DESCR
N ports/sysutils/puppetserver/8/pkg/PLIST
N ports/sysutils/puppetserver/8/pkg/README
N ports/sysutils/puppetserver/8/pkg/puppetserver.rc

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2024-02-24 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/24 09:17:34

Modified files:
databases/puppetdb: Makefile 

Log message:
Hook up PuppetDB 8

CVS: cvs.openbsd.org: ports

2024-02-24 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/24 09:16:48

Log message:
import PuppetDB 8

PuppetDB is the fast, scalable, and reliable data warehouse for Puppet.
It caches data generated by Puppet, and gives you advanced features at
awesome speed with a powerful API.

OK kn@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20240224

N ports/databases/puppetdb/8/Makefile
N ports/databases/puppetdb/8/distinfo
N ports/databases/puppetdb/8/patches/patch-Makefile
N ports/databases/puppetdb/8/patches/patch-ext_bin_puppetdb
N ports/databases/puppetdb/8/patches/patch-ext_cli_delete-reports
N ports/databases/puppetdb/8/patches/patch-ext_cli_foreground
N ports/databases/puppetdb/8/patches/patch-ext_cli_reload
N ports/databases/puppetdb/8/patches/patch-ext_cli_ssl-setup
N ports/databases/puppetdb/8/patches/patch-ext_cli_start
N ports/databases/puppetdb/8/patches/patch-ext_cli_upgrade
N ports/databases/puppetdb/8/patches/patch-ext_config_conf_d_config_ini
N ports/databases/puppetdb/8/patches/patch-ext_config_conf_d_jetty_ini
N ports/databases/puppetdb/8/patches/patch-ext_default
N ports/databases/puppetdb/8/patches/patch-ext_ezbake-functions_sh
N ports/databases/puppetdb/8/pkg/DESCR-main
N ports/databases/puppetdb/8/pkg/DESCR-plugin
N ports/databases/puppetdb/8/pkg/PLIST-main
N ports/databases/puppetdb/8/pkg/PLIST-plugin
N ports/databases/puppetdb/8/pkg/puppetdb.rc

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2024-02-24 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/24 09:14:16

Modified files:
security   : Makefile 

Log message:
hook up volatility3

CVS: cvs.openbsd.org: ports

2024-02-24 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/24 09:13:06

Log message:
import volatility3

Volatility is the world's most widely used framework for extracting
digital artifacts from volatile memory (RAM) samples. The extraction
techniques are performed completely independent of the system being
investigated but offer visibility into the runtime state of the system.
The framework is intended to introduce people to the techniques and
complexities associated with extracting digital artifacts from volatile
memory samples and provide a platform for further work into this
exciting area of research.

Symbol files are not part of the package. They have to be installed
manually. See README for details.

valuable feedback and OK sthen@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20240224

N ports/security/volatility3/Makefile
N ports/security/volatility3/distinfo
N ports/security/volatility3/pkg/DESCR
N ports/security/volatility3/pkg/README
N ports/security/volatility3/pkg/PLIST

No conflicts created by this import

Re: PING: NEW: puppetdb 8

2024-02-23 Thread Sebastian Reitenbach 
On Wednesday, February 21, 2024 12:34 CET, Klemens Nanni  
wrote:

> On Tue, Feb 20, 2024 at 02:16:32PM +0100, Sebastian Reitenbach wrote:
> > On Friday, February 16, 2024 10:26 CET, "Sebastian Reitenbach" 
> >  wrote:
> > 
> > > Hi,
> > > 
> > > trying it again in separate mails.
> > > 
> > > Puppet 6 made room for Puppet8. Initial port for Puppet8 was sent to me 
> > > by Alex Talaran.
> > > It took me a while to test and prepare. With Puppet6 gone, and for 
> > > Puppet7 all dependencies updated,
> > > I think Puppet8 is good to go. Puppet8 agent works well for me on amd64 
> > > against puppetdb/puppetserver v8.
> > > Also puppet7 agents work fine against Puppet8 server/db combination.
> > > Also, there's a noticable speed improvement observable in puppet runs!
> > > 
> > > 
> > > to be extracted in databases/puppetdb
> > > 
> > > Any feedback, or even OK to import welcome.
> > 
> > as I wrote, works fine for me, any objections to import?
> 
> Port-wise OK kn.
> 
> Does the rc.d script start/stop/reload/restart fine?
> Asking because daemon_flags is looong and looks error prone.

indeed, that was not easy to get it right, but it properly 
starts/stops/checks...

> 
> Same goes for your puppetserver port.

thanks for looking.

> 
> Thanks for your work on Puppet.

I've also the PDK in the queue, but that requires a few new dependencies.
It works for me so far that I cleaned up/update a number of my old Puppet 
modules
already. https://github.com/buzzdeee/mystuff/tree/main/sysutils/ruby-pdk

> 
> > 
> > Sebastian

Re: NEW: security/volatility3

2024-02-23 Thread Sebastian Reitenbach 
Hi,

On Friday, February 23, 2024 15:20 CET, Stuart Henderson  
wrote:

> On 2024/02/18 21:51, Sebastian Reitenbach wrote:
> > Hi,
> > 
> > security/volatility is gone. This is volatility3, a reimplementation in 
> > Python3.
> > For some some reason, building the package it tries to create 
> > ~/.cache/volatility3
> > directory. Which later on is then missing. It has to be created before 
> > first run.
> 
> I think you should remove the patch and use "PORTHOME = ${WRKDIR}"
> instead, then I think you can get rid of the pkg-readme bit about
> creating the cache dir because if I read correctly the code should
> handle it.

indeed it works that way, much better.

> 
> MODPY_PYTEST isn't appropriate here - there is pytest infrastructure
> but something is missing so the tests don't run ("fixture 'image' not
> found") and I couldn't figure out where to get that from; fixing
> that would be preferable, but otherwise I'd do something like
> 
> # fixture 'image' not found
> NO_TEST = Yes
> 

I looked at it, and I think you have to provide an image, and then point the 
script 
test script onto the image. I tried that somehow, just to see, but it didn't 
properly
worked out, and I gave up.

> pkg-readme doessn't follow the standard format from infrastructure/templates.
> 

updated as well.


> > Additionally to make use of it, symbol files have to be downloaded and put
> > into the right place.
> 
> Would it make sense to include those, either in the main volatility
> port, or a separate port/ports (maybe with volatility having a RUN_DEPENDS
> on them)? (Pity those distfiles don't have version numbers).
> 

I don't know how often those get updated, having to mirror them would likely 
be quite painful. Additionally, they are quite big.
Could provide a helper script to ease download, but not sure, if it's all worth 
it.

updated version attached.

Sebastian


volatility3.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

2024-02-21 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/22 00:04:39

Modified files:
devel/robin-map: Makefile 

Log message:
make building tests a bit more verbous

CVS: cvs.openbsd.org: ports

2024-02-21 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/22 00:01:44

Modified files:
devel/dlib : Makefile 

Log message:
Allow tests to run, similar fix as done for devel/robin-map
however, tests don't run finish successfully

CVS: cvs.openbsd.org: ports

2024-02-20 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/20 12:24:07

Modified files:
devel/robin-map: Makefile distinfo 

Log message:
update robin-map to 1.2.1.

usual valuable feedback, esp. regarding fixing tests, sthen@

PING: NEW: Puppetserver 8

2024-02-20 Thread Sebastian Reitenbach 
On Friday, February 16, 2024 10:28 CET, "Sebastian Reitenbach" 
 wrote:

> Hi,
> 
> trying it again in separate mails.
> 
> Puppet 6 made room for Puppet8. Initial port for Puppet8 was sent to me by 
> Alex Talaran.
> It took me a while to test and prepare. With Puppet6 gone, and for Puppet7 
> all dependencies updated,
> I think Puppet8 is good to go. Puppet8 agent works well for me on amd64 
> against puppetdb/puppetserver v8.
> Also puppet7 agents work fine against Puppet8 server/db combination.
> Also, there's a noticable speed improvement observable in puppet runs!
> 
> attached tarball to be extracted in sysutils/puppetserver
> 
> Any feedback, or even OK to import welcome.

as I wrote, works fine for me. Any objections to import?

cheers,
Sebastian


puppetserver8.tar.gz
Description: application/gzip

PING: NEW: puppetdb 8

2024-02-20 Thread Sebastian Reitenbach 
On Friday, February 16, 2024 10:26 CET, "Sebastian Reitenbach" 
 wrote:

> Hi,
> 
> trying it again in separate mails.
> 
> Puppet 6 made room for Puppet8. Initial port for Puppet8 was sent to me by 
> Alex Talaran.
> It took me a while to test and prepare. With Puppet6 gone, and for Puppet7 
> all dependencies updated,
> I think Puppet8 is good to go. Puppet8 agent works well for me on amd64 
> against puppetdb/puppetserver v8.
> Also puppet7 agents work fine against Puppet8 server/db combination.
> Also, there's a noticable speed improvement observable in puppet runs!
> 
> 
> to be extracted in databases/puppetdb
> 
> Any feedback, or even OK to import welcome.

as I wrote, works fine for me, any objections to import?

Sebastian


puppetdb8.tar.gz
Description: application/gzip

PING: UPDATE: devel/robin-map

2024-02-20 Thread Sebastian Reitenbach 
On Saturday, February 17, 2024 19:23 CET, "Sebastian Reitenbach" 
 wrote:

> Hi,
> 
> found the version we have in-tree is quite old. This updates to the latest 
> release.
> It's a headers library only. The two consumers openimageio and citra still 
> build well.
> 
> It also makes the test suite working again.
> 
> OK to update?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/robin-map/Makefile,v
> diff -u -r1.3 Makefile
> --- Makefile  26 Apr 2023 08:17:16 -  1.3
> +++ Makefile  17 Feb 2024 18:20:18 -
> @@ -4,8 +4,7 @@
>  
>  GH_ACCOUNT=  Tessil
>  GH_PROJECT=  robin-map
> -GH_TAGNAME=  v0.6.3
> -REVISION =   0
> +GH_TAGNAME=  v1.2.1
>  
>  CATEGORIES=  devel
>  
> @@ -13,15 +12,15 @@
>  PERMIT_PACKAGE=  Yes
>  
>  MODULES= devel/cmake
> -
> -TEST_DEPENDS=devel/boost
> +NO_BUILD =   Yes
> +TEST_DEPENDS=devel/boost devel/ninja
>  
>  do-test:
>   cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
>   CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
>   ${LOCALBASE}/bin/cmake -G ${_MODCMAKE_GEN} ${WRKSRC}/tests
>   cd ${WRKSRC}/tests && exec ${SETENV} ${ALL_TEST_ENV} \
> - ${NINJA} ${NINJA_FLAGS}
> + ninja
>   cd ${WRKSRC}/tests && ./tsl_robin_map_tests
>  
>  post-install:
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/robin-map/distinfo,v
> diff -u -r1.1.1.1 distinfo
> --- distinfo  3 Mar 2021 05:44:11 -   1.1.1.1
> +++ distinfo  17 Feb 2024 18:20:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (robin-map-0.6.3.tar.gz) = 
> 5mVMjCWY9j6wsdUv+L3znPzJHYHdXQUnSm3KkSQc1y8=
> -SIZE (robin-map-0.6.3.tar.gz) = 64506
> +SHA256 (robin-map-1.2.1.tar.gz) = 
> K1TSwd4vc76lxR1dy9ZIE6CMrxv93P3u5Aq3TpWZ6OM=
> +SIZE (robin-map-1.2.1.tar.gz) = 69356

CVS: cvs.openbsd.org: ports

2024-02-19 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/19 08:12:42

Modified files:
security/exploitdb: Makefile distinfo 
security/exploitdb/pkg: PLIST 

Log message:
update to 2024-02-17

NEW: security/volatility3

2024-02-18 Thread Sebastian Reitenbach 
Hi,

security/volatility is gone. This is volatility3, a reimplementation in Python3.
For some some reason, building the package it tries to create 
~/.cache/volatility3
directory. Which later on is then missing. It has to be created before first 
run.

Additionally to make use of it, symbol files have to be downloaded and put
into the right place.

Both points above are mentioned in the README.

Tested with a few Windows images in amd64.

Comments, test reports, or even OK to import?

cheers,
Sebastian


volatility3.tar.gz
Description: GNU Zip compressed data

UPDATE: devel/robin-map

2024-02-17 Thread Sebastian Reitenbach 
Hi,

found the version we have in-tree is quite old. This updates to the latest 
release.
It's a headers library only. The two consumers openimageio and citra still 
build well.

It also makes the test suite working again.

OK to update?

Index: Makefile
===
RCS file: /cvs/ports/devel/robin-map/Makefile,v
diff -u -r1.3 Makefile
--- Makefile26 Apr 2023 08:17:16 -  1.3
+++ Makefile17 Feb 2024 18:20:18 -
@@ -4,8 +4,7 @@
 
 GH_ACCOUNT=Tessil
 GH_PROJECT=robin-map
-GH_TAGNAME=v0.6.3
-REVISION = 0
+GH_TAGNAME=v1.2.1
 
 CATEGORIES=devel
 
@@ -13,15 +12,15 @@
 PERMIT_PACKAGE=Yes
 
 MODULES=   devel/cmake
-
-TEST_DEPENDS=  devel/boost
+NO_BUILD = Yes
+TEST_DEPENDS=  devel/boost devel/ninja
 
 do-test:
cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
${LOCALBASE}/bin/cmake -G ${_MODCMAKE_GEN} ${WRKSRC}/tests
cd ${WRKSRC}/tests && exec ${SETENV} ${ALL_TEST_ENV} \
-   ${NINJA} ${NINJA_FLAGS}
+   ninja
cd ${WRKSRC}/tests && ./tsl_robin_map_tests
 
 post-install:
Index: distinfo
===
RCS file: /cvs/ports/devel/robin-map/distinfo,v
diff -u -r1.1.1.1 distinfo
--- distinfo3 Mar 2021 05:44:11 -   1.1.1.1
+++ distinfo17 Feb 2024 18:20:18 -
@@ -1,2 +1,2 @@
-SHA256 (robin-map-0.6.3.tar.gz) = 5mVMjCWY9j6wsdUv+L3znPzJHYHdXQUnSm3KkSQc1y8=
-SIZE (robin-map-0.6.3.tar.gz) = 64506
+SHA256 (robin-map-1.2.1.tar.gz) = K1TSwd4vc76lxR1dy9ZIE6CMrxv93P3u5Aq3TpWZ6OM=
+SIZE (robin-map-1.2.1.tar.gz) = 69356


robin-map.1.2.6.diff
Description: Binary data

Re: NEW: devel/robin-map

2024-02-16 Thread Sebastian Reitenbach 
On Friday, February 16, 2024 21:50 CET, Rafael Sadowski  
wrote:

> There is already devel/robin-map in the tree or I'm looking wrong?

Indeed, how could I missed that. Old version, might be worth updating instead ;)

thanks for the cluebat.

> 
> On Fri Feb 16, 2024 at 09:38:26PM +0100, Sebastian Reitenbach wrote:
> > Hi,
> > 
> > this is a new dependency needed to update x11/gnustep/libobjc2.
> > 
> > it's a header-only library.
> > 
> > cat pkg/DESCR
> > 
> > The robin-map library is a C++ implementation of a fast hash map and
> > hash set using open-addressing and linear robin hood hashing with
> > backward shift deletion to resolve collisions.
> >

Re: NEW: devel/robin-map

2024-02-16 Thread Sebastian Reitenbach 
On Friday, February 16, 2024 21:38 CET, "Sebastian Reitenbach" 
 wrote:

> Hi,
> 
> this is a new dependency needed to update x11/gnustep/libobjc2.
> 
> it's a simple header-only library.
> 
> cat pkg/DESCR
> 
> The robin-map library is a C++ implementation of a fast hash map and
> hash set using open-addressing and linear robin hood hashing with
> backward shift deletion to resolve collisions.
> 
Hit send button to early. 
Tarball attached now. Comments or OK to import?

Sebastian


robin-map.tar.gz
Description: application/gzip

NEW: devel/robin-map

2024-02-16 Thread Sebastian Reitenbach 
Hi,

this is a new dependency needed to update x11/gnustep/libobjc2.

it's a header-only library.

cat pkg/DESCR

The robin-map library is a C++ implementation of a fast hash map and
hash set using open-addressing and linear robin hood hashing with
backward shift deletion to resolve collisions.

CVS: cvs.openbsd.org: ports

2024-02-16 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/16 13:06:56

Modified files:
sysutils/ruby-puppet: Makefile 

Log message:
Hook up Puppet 8

CVS: cvs.openbsd.org: ports

2024-02-16 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/16 13:05:55

Log message:
import sysutils/ruby-puppet/8

alongside puppet 7.

feedback and OK kn@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20240216

N ports/sysutils/ruby-puppet/8/Makefile
N ports/sysutils/ruby-puppet/8/distinfo
N ports/sysutils/ruby-puppet/8/patches/patch-install_rb
N ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_defaults_rb
N ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_gettext_config_rb
N 
ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_provider_package_gem_rb
N 
ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_provider_package_openbsd_rb
N 
ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_provider_package_pip3_rb
N 
ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_provider_package_pip_rb
N 
ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_reference_configuration_rb
N ports/sysutils/ruby-puppet/8/patches/patch-lib_puppet_util_run_mode_rb
N ports/sysutils/ruby-puppet/8/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2024-02-16 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/16 11:15:41

Modified files:
www/puppetboard: Makefile distinfo 
www/puppetboard/pkg: PLIST 

Log message:
update puppetboard 4.2.6 -> 5.3.0

CVS: cvs.openbsd.org: ports

2024-02-16 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/16 11:12:07

Modified files:
databases/py-puppetdb: Makefile distinfo 

Log message:
update py-puppetdb 3.1.0 -> 3.2.0

CVS: cvs.openbsd.org: ports

2024-02-16 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/16 11:10:08

Modified files:
www: Makefile 

Log message:
hook up py-flask-caching and py-flask-apscheduler

CVS: cvs.openbsd.org: ports

2024-02-16 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/16 11:07:52

Log message:
import py-flask-apscheduler

Flask-APScheduler is a Flask extension which adds support for the
APScheduler.

Feedback and OK sthen@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20240216

N ports/www/py-flask-apscheduler/Makefile
N ports/www/py-flask-apscheduler/distinfo
N ports/www/py-flask-apscheduler/pkg/DESCR
N ports/www/py-flask-apscheduler/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2024-02-16 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/16 11:05:19

Log message:
import py-flask-caching

A fork of the Flask-cache extension which adds easy cache support to
Flask.

Feedback and OK sthen@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20240216

N ports/www/py-flask-caching/Makefile
N ports/www/py-flask-caching/distinfo
N ports/www/py-flask-caching/pkg/DESCR
N ports/www/py-flask-caching/pkg/PLIST

No conflicts created by this import

Re: NEW: Puppet 8

2024-02-16 Thread Sebastian Reitenbach 
Hi,

On Friday, February 16, 2024 16:52 CET, Klemens Nanni  wrote:

> On Fri, Feb 16, 2024 at 10:23:05AM +0100, Sebastian Reitenbach wrote:
> > Puppet 6 made room for Puppet8. Initial port for Puppet8 was sent to me by 
> > Alex Talaran.
> > It took me a while to test and prepare. With Puppet6 gone, and for Puppet7 
> > all dependencies updated,
> > I think Puppet8 is good to go. Puppet8 agent works well for me on amd64 
> > against puppetdb/puppetserver v8.
> > 
> > Attached tarball to be extracted in sysutils/ruby-puppet
> > 
> > Any feedback, or even OK to import welcome!
> 
> I only have serverless setups and won't roll out db/server.
> The agent port looks good and works in light testing, but I'd be easier
> for me to just pkg_add it on a bunch of machines to test more.
> 
> Why this when 7 has no @pkgpath markers?
>   @pkgpath sysutils/ruby-puppet/6
>   @pkgpath sysutils/ruby-puppet/7
> 
> I would expect it to conflict with installed puppet, this leads to

I always get these kind of wrong. Remove these lines, and put 
@conflict puppet-* into PLIST, and same for Puppet7?

attached version without MESSAGE as you pointed out privately.

Sebastian


puppet8.tar.gz
Description: application/gzip

NEW: Puppetserver 8

2024-02-16 Thread Sebastian Reitenbach 
Hi,

trying it again in separate mails.

Puppet 6 made room for Puppet8. Initial port for Puppet8 was sent to me by Alex 
Talaran.
It took me a while to test and prepare. With Puppet6 gone, and for Puppet7 all 
dependencies updated,
I think Puppet8 is good to go. Puppet8 agent works well for me on amd64 against 
puppetdb/puppetserver v8.
Also puppet7 agents work fine against Puppet8 server/db combination.
Also, there's a noticable speed improvement observable in puppet runs!

attached tarball to be extracted in sysutils/puppetserver

Any feedback, or even OK to import welcome.

cheers,
Sebastian


puppetserver8.tar.gz
Description: application/gzip

NEW: puppetdb 8

2024-02-16 Thread Sebastian Reitenbach 
Hi,

trying it again in separate mails.

Puppet 6 made room for Puppet8. Initial port for Puppet8 was sent to me by Alex 
Talaran.
It took me a while to test and prepare. With Puppet6 gone, and for Puppet7 all 
dependencies updated,
I think Puppet8 is good to go. Puppet8 agent works well for me on amd64 against 
puppetdb/puppetserver v8.
Also puppet7 agents work fine against Puppet8 server/db combination.
Also, there's a noticable speed improvement observable in puppet runs!


to be extracted in databases/puppetdb

Any feedback, or even OK to import welcome.

cheers,
Sebastian


puppetdb8.tar.gz
Description: application/gzip

NEW: Puppet 8

2024-02-16 Thread Sebastian Reitenbach 
Hi,

trying it again with separate mails.

Puppet 6 made room for Puppet8. Initial port for Puppet8 was sent to me by Alex 
Talaran.
It took me a while to test and prepare. With Puppet6 gone, and for Puppet7 all 
dependencies updated,
I think Puppet8 is good to go. Puppet8 agent works well for me on amd64 against 
puppetdb/puppetserver v8.

Attached tarball to be extracted in sysutils/ruby-puppet

Any feedback, or even OK to import welcome!

Sebastian


puppet8.tar.gz
Description: application/gzip

PING: NEW DEPENDECY: www/py-flask-caching

2024-02-16 Thread Sebastian Reitenbach 
On Friday, January 19, 2024 14:57 CET, "Sebastian Reitenbach" 
 wrote:

> Hi,
> 
> On Thursday, January 11, 2024 20:46 CET, "Sebastian Reitenbach" 
>  wrote:
> 
> > Hi,
> > 
> > py-flask-caching is a newly needed dependency for www/puppetboard.
> > 
> > cat py-flask-caching/pkg/DESCR
> > A fork of the Flask-cache extension which adds easy cache support to
> > Flask.
> > 
> > rants, comments, or even OK to import?
> 
> any objections to this one?
> 
> find it re-attached.
> 
> Sebastian


Anyone, I would really like to get this one in to be able to update 
www/puppetboard.

Sebastian


py-flask-caching.tar.gz
Description: application/gzip

PING: NEW DEPENDENCY: www/py-flask-apscheduler

2024-02-16 Thread Sebastian Reitenbach 
On Friday, January 19, 2024 14:58 CET, "Sebastian Reitenbach" 
 wrote:

> Hi,
> 
> On Thursday, January 11, 2024 20:50 CET, "Sebastian Reitenbach" 
>  wrote:
> 
> > Hi,
> > 
> > py-flask-apscheduler is a new dependency needed for www/puppetboard update.
> > 
> > cat py-flask-apscheduler/pkg/DESCR  
> >  
> > Flask-APScheduler is a Flask extension which adds support for the
> > APScheduler.
> > 
> > rants, comments or even OK to import?
> 
> any objections to this one?
> 
> find it re-attached.
> 
> Sebastian

Anyone, I would really like to get this one in to be able to update 
www/puppetboard.

Sebastian


py-flask-apscheduler.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

2024-02-16 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/16 01:51:14

Modified files:
sysutils/ruby-puppet-lint: Makefile distinfo 

Log message:
update 4.2.3 -> 4.2.4

CVS: cvs.openbsd.org: ports

2024-02-14 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/14 05:30:31

Added files:
sysutils/ruby-puppet-syntax/patches: patch-_metadata 

Log message:
Add missed patch from the update.
breakage reported by naddy@ and phessler@

CVS: cvs.openbsd.org: ports

2024-02-14 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/14 05:24:54

ports/sysutils/ruby-puppet-syntax/patches

Update of /cvs/ports/sysutils/ruby-puppet-syntax/patches
In directory cvs.openbsd.org:/tmp/cvs-serv27513/patches

Log Message:
Directory /cvs/ports/sysutils/ruby-puppet-syntax/patches added to the repository

CVS: cvs.openbsd.org: ports

2024-02-09 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/09 12:16:26

Modified files:
devel/ruby-deep_merge: Makefile distinfo 

Log message:
update 1.2.1 -> 1.2.2
take MAINTAINER

CVS: cvs.openbsd.org: ports

2024-02-08 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/08 14:38:42

Modified files:
sysutils/ruby-puppet-syntax: Makefile distinfo 
sysutils/ruby-puppet-syntax/pkg: PLIST 

Log message:
update 3.3.0 -> 4.0.0

CVS: cvs.openbsd.org: ports

2024-02-08 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/08 14:32:38

Modified files:
security/ruby-gpgme: Makefile distinfo 
security/ruby-gpgme/pkg: PLIST 

Log message:
update 2.0.23 -> 2.0.24

CVS: cvs.openbsd.org: ports

2024-02-08 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/08 14:30:40

Modified files:
www/ruby-multipart-post: Makefile distinfo 

Log message:
update 2.3.0 -> 2.4.0

CVS: cvs.openbsd.org: ports

2024-02-08 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/08 14:27:42

Modified files:
devel/ruby-zeitwerk: Makefile distinfo 
devel/ruby-zeitwerk/pkg: PLIST 

Log message:
update 2.6.12 -> 2.6.13

CVS: cvs.openbsd.org: ports

2024-02-08 Thread Sebastian Reitenbach 
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2024/02/08 14:25:55

Modified files:
security/py-fickling: Makefile distinfo 
security/py-fickling/pkg: PLIST 

Log message:
update 0.0.8 -> 0.1.2

Re: NEW: games/mightymike

2024-02-08 Thread Sebastian Reitenbach 
On Saturday, February 03, 2024 20:25 CET, izder456  wrote:

> Hey ports@
> 
> Yes again, I am back with another pangea soft port.
> 
> This concludes all of Iliyas Jorio's Pangea games.
> 
> I can't wait till 7.5. Viva la iMac :)
> 
> Port is attached.
> 
> Comments or OK?


like Nanosaur, use tabs in the Makefile. Other than that, looks good, and
works for me. with that OK sebastia@
> 
> --
> 
> -iz

  1   2   3   4   5   6   7   8   9   10   >