18.09.2025 20:20, Rafael Sadowski пишет:
> On Sat Sep 13, 2025 at 12:51:48PM +0000, Klemens Nanni wrote:
>> 06.09.2025 19:06, Klemens Nanni пишет:
>>> This is a sysutils/ruby-puppet skeleton copy with tweaks:
>>> - match Makefile.template more closely
>>> - add myself as MAINTAINER next to to Sebastian
>>> - drop the ruby version sync comment;  I thank that follows
>>>   from having all deps depends on the default ruby flavor
>>> - use new openfact over facter
>>>
>>>   $ pkg_info openvox%8
>>>   Information for inst:openvox-8.22.0
>>>   
>>>   Comment:
>>>   community implementation of Puppet
>>>   
>>>   Description:
>>>   OpenVox is a community implementation of Puppet, an automated administrative
>>>   engine for your Linux, Unix, and Windows systems, designed to perform
>>>   administrative tasks (such as adding users, installing packages, and updating
>>>   server configurations) based on a centralized specification.
>>>   
>>>   Maintainer: Klemens Nanni <kn@openbsd.org>,  Sebastian Reitenbach <sebastia@openbsd.org>
>>>   
>>>   WWW: https://voxpupuli.org/openvox
>>>
>>>
>>> Existing Puppet 8 now conflicts and warns on update:
>>>
>>>   puppet-8.10.0p1->8.10.0p2: ok
>>>   Read shared items: ok
>>>   --- -puppet-8.10.0p1 -------------------
>>>   You should also run rm -rf /etc/puppetlabs/puppet/*
>>>   --- +puppet-8.10.0p2 -------------------
>>>   Puppet no longer receives updates and will be removed soon.
>>>
>>>   See the sysutils/ruby-openvox port and switch to the openvox%8 package.
>>>
>>>
>>> Feedback? OK?
>> Ping.
> 
> OK to import openvox. The port looks good and it works (puppet
> --version) :-D. As you may know I'm in the ansible camp.

Thanks, import without Sebastian as MAINTAINER until he responds.
Happy to co-maintain with him as soon as he wants/agrees to ;)

>> Same tarball, diff rebased onto -current after user.list changes.
> 
> At first glance, it all looks good and makes sense.
> 
> After the release, we can update it with a pkgpath and delete
> puppet8. But I'm sure you have a plan.
I think it should eventually be merged into openvox, but we'll see.

> 
>>
>> Index: infrastructure/db/user.list
>> ===================================================================
>> RCS file: /cvs/ports/infrastructure/db/user.list,v
>> diff -u -p -r1.471 user.list
>> --- infrastructure/db/user.list	7 Sep 2025 22:28:35 -0000	1.471
>> +++ infrastructure/db/user.list	13 Sep 2025 12:48:59 -0000
>> @@ -88,7 +88,7 @@ id  user		group		port
>>  577 _openvpn		_openvpn	net/openvpn
>>  578 _mrtg		_mrtg		net/mrtg
>>  579 _hiawatha		_hiawatha	www/hiawatha
>> -580 _puppet		_puppet		sysutils/ruby-puppet
>> +580 _puppet		_puppet		sysutils/ruby-{puppet,openvox}
>>  581 _piknik		_piknik		sysutils/piknik
>>  582 _tabled		_tabled		sysutils/tabled
>>  #583			_kdesud		x11/kde/base3
>> @@ -227,7 +227,7 @@ id  user		group		port
>>  716 _c-icap		_c-icap		www/c-icap/c-icap
>>  717 _uptimed		_uptimed	sysutils/uptimed
>>  718 _stuntman		_stuntman	telephony/stuntman
>> -719 _puppetdb		_puppetdb	databases/puppetdb/8
>> +719 _puppetdb		_puppetdb	databases/puppetdb
>>  #720 _lldpd		_lldpd		net/lldpd
>>  721 _dkimproxy		_dkimproxy	mail/dkimproxy
>>  722 _salt		_salt		sysutils/salt

Above tweaks are not needed for openvox to package, so I'll leave out (for now).

>> Index: sysutils/ruby-puppet/8/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/ruby-puppet/8/Makefile,v
>> diff -u -p -r1.7 Makefile
>> --- sysutils/ruby-puppet/8/Makefile	29 Aug 2025 09:29:52 -0000	1.7
>> +++ sysutils/ruby-puppet/8/Makefile	6 Sep 2025 16:01:17 -0000
>> @@ -1,7 +1,7 @@
>>  PORTROACH=		limit:^8
>>  
>>  VERSION=		8.10.0
>> -REVISION=		1
>> +REVISION=		2
>>  
>>  RUN_DEPENDS+=		converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
>>  			devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
>> Index: sysutils/ruby-puppet/8/pkg/PLIST
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/ruby-puppet/8/pkg/PLIST,v
>> diff -u -p -r1.4 PLIST
>> --- sysutils/ruby-puppet/8/pkg/PLIST	21 Jan 2025 10:40:03 -0000	1.4
>> +++ sysutils/ruby-puppet/8/pkg/PLIST	6 Sep 2025 14:30:56 -0000
>> @@ -1,5 +1,6 @@
>>  @option is-branch
>>  @conflict puppet-*
>> +@conflict openvox-*
>>  @newgroup _puppet:580
>>  @newuser _puppet:580:580::Puppet user:/var/empty:/sbin/nologin
>>  @extraunexec rm -rf ${SYSCONFDIR}/puppetlabs/puppet/*I'll commit the conflict above as that's obvious and wait for sebastia@ to
comment on the note below.

>> Index: sysutils/ruby-puppet/8/pkg/MESSAGE
>> ===================================================================
>> RCS file: sysutils/ruby-puppet/8/pkg/MESSAGE
>> diff -N sysutils/ruby-puppet/8/pkg/MESSAGE
>> --- /dev/null	1 Jan 1970 00:00:00 -0000
>> +++ sysutils/ruby-puppet/8/pkg/MESSAGE	6 Sep 2025 15:40:29 -0000
>> @@ -0,0 +1,3 @@
>> +Puppet no longer receives updates and will be removed soon.
>> +
>> +See the sysutils/ruby-openvox port and switch to the openvox%8 package.
> 
>