UPDATE: mail/p5-Mail-SPF

[Giovanni Bechis]

Hi,
this is an update to latest version, ok ?
Comments ?
 Cheers
  Giovanni
? patches/patch-lib_Mail_SPF_pm
Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-SPF/Makefile,v
diff -u -p -r1.12 Makefile
--- Makefile	21 Sep 2023 16:42:14 -	1.12
+++ Makefile	1 Jul 2024 08:23:39 -
@@ -1,8 +1,6 @@
 COMMENT =		perl oop implementation of Sender Policy Framework
 
-DISTNAME =		Mail-SPF-v2.9.0
-PKGNAME =		p5-${DISTNAME:S/-v/-/}
-REVISION =		4
+DISTNAME =		Mail-SPF-3.20240617
 CATEGORIES =		mail
 
 MAINTAINER =		Giovanni Bechis 
@@ -12,7 +10,6 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		cpan
 PKG_ARCH =		*
-CONFIGURE_STYLE =	modbuild
 
 RUN_DEPENDS =		devel/p5-Error \
 			net/p5-NetAddr-IP>=4 \
@@ -26,6 +23,6 @@ MAKE_ENV =		TEST_POD=Yes
 CONFIGURE_ARGS =	install_path=sbin="${PREFIX}/sbin"
 
 post-build:
-	pod2man ${WRKSRC}/sbin/spfd > ${WRKSRC}/blib/bindoc/spfd.1
+	find ${WRKBUILD}/blib -type f -name '*.orig.port' -delete
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-Mail-SPF/distinfo,v
diff -u -p -r1.3 distinfo
--- distinfo	12 Sep 2014 17:14:12 -	1.3
+++ distinfo	1 Jul 2024 08:23:39 -
@@ -1,2 +1,2 @@
-SHA256 (Mail-SPF-v2.9.0.tar.gz) = YctZFfHHrMepMf/Bv8EpG9+sVV4qRusjkbmV6p7LYWI=
-SIZE (Mail-SPF-v2.9.0.tar.gz) = 103834
+SHA256 (Mail-SPF-3.20240617.tar.gz) = Q5MKcIuOYF8xNREgYZ7Yz6XXif5m5/lFGDk2k/nhCuk=
+SIZE (Mail-SPF-3.20240617.tar.gz) = 79806
Index: patches/patch-lib_Mail_SPF_Mod_Exp_pm
===
RCS file: patches/patch-lib_Mail_SPF_Mod_Exp_pm
diff -N patches/patch-lib_Mail_SPF_Mod_Exp_pm
--- patches/patch-lib_Mail_SPF_Mod_Exp_pm	19 Sep 2023 09:29:51 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,34 +0,0 @@
-Fix for cpan bug 149825 (https://rt.cpan.org/Ticket/Display.html?id=149825)
-Index: lib/Mail/SPF/Mod/Exp.pm
 lib/Mail/SPF/Mod/Exp.pm.orig
-+++ lib/Mail/SPF/Mod/Exp.pm
-@@ -145,12 +145,27 @@ sub process {
- @txt_rrs == 1
- or $server->throw_result('permerror', $request,
- "Redundant authority explanation strings found at domain '$exp_domain'");  # RFC 4408, 6.2/4
--my $explanation = Mail::SPF::MacroString->new(
-+
-+my $explanation;
-+# join with no intervening spaces, RFC 6376
-+if ( Net::DNS->VERSION >= 0.69 ) {
-+  # must call txtdata() in a list context
-+  $explanation = Mail::SPF::MacroString->new(
-+text=> join('', $txt_rrs[0]->txtdata),
-+server  => $server,
-+request => $request,
-+is_explanation  => TRUE
-+  );
-+} else {
-+  # char_str_list method is 'historical'
-+  $explanation = Mail::SPF::MacroString->new(
- text=> join('', $txt_rrs[0]->char_str_list),
- server  => $server,
- request => $request,
- is_explanation  => TRUE
--);
-+  );
-+}
-+
- $request->state('authority_explanation', $explanation);
- }
- # Ignore DNS and other errors:
Index: patches/patch-lib_Mail_SPF_Record_pm
===
RCS file: patches/patch-lib_Mail_SPF_Record_pm
diff -N patches/patch-lib_Mail_SPF_Record_pm
--- patches/patch-lib_Mail_SPF_Record_pm	11 Mar 2022 19:34:50 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Fix for cpan bug 130299 (https://rt.cpan.org/Public/Bug/Display.html?id=130299)
-Index: lib/Mail/SPF/Record.pm
 lib/Mail/SPF/Record.pm.orig
-+++ lib/Mail/SPF/Record.pm
-@@ -206,6 +206,7 @@ sub parse_version_tag {
- 
- sub parse_term {
- my ($self) = @_;
-+require Mail::SPF::Mech;
- if (
- $self->{parse_text} =~ s/
- ^
Index: patches/patch-lib_Mail_SPF_Server_pm
===
RCS file: patches/patch-lib_Mail_SPF_Server_pm
diff -N patches/patch-lib_Mail_SPF_Server_pm
--- patches/patch-lib_Mail_SPF_Server_pm	21 Sep 2023 16:42:14 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-Fix for cpan bug 149825 (https://rt.cpan.org/Ticket/Display.html?id=149825)
-Index: lib/Mail/SPF/Server.pm
 lib/Mail/SPF/Server.pm.orig
-+++ lib/Mail/SPF/Server.pm
-@@ -22,6 +22,7 @@ use strict;
- use base 'Mail::SPF::Base';
- 
- use Error ':try';
-+use Net::DNS;
- use Net::DNS::Resolver;
- 
- use Mail::SPF::MacroString;
-@@ -513,7 +514,15 @@ sub get_acceptable_records_from_packet {
- foreach my $rr ($packet->answer) {
- next if $rr->type ne $rr_type;  # Ignore RRs of unexpected type.
- 
--my $text = join('', $rr-&

UPDATE: mail/p5-Mail-DMARC

[Giovanni Bechis]

Update to latest version.
Most regression tests have warnings like:
t/01.Policy.t  ok
perl:/usr/local/libdata/perl5/site_perl/amd64-openbsd/auto/Net/IDN/Punycode/Punycode.so:
 undefined symbol 'uvuni_to_utf8_flags'

Maybe related to latest Perl update ?
Snapshot I am running is:
OpenBSD 7.5-current (GENERIC.MP) #77: Sun May 19 16:08:08 MDT 2024
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-DMARC/Makefile,v
diff -u -p -r1.18 Makefile
--- Makefile	3 May 2023 09:54:12 -	1.18
+++ Makefile	21 May 2024 07:41:06 -
@@ -1,6 +1,6 @@
 COMMENT=	Perl implementation of DMARC
 
-DISTNAME=	Mail-DMARC-1.20230215
+DISTNAME=	Mail-DMARC-1.20240314
 MAINTAINER=	Giovanni Bechis 
 
 CATEGORIES=	mail
@@ -44,6 +44,7 @@ TEST_DEPENDS=	${RUN_DEPENDS} \
 		devel/p5-Test-Exception \
 		devel/p5-Test-File-ShareDir \
 		devel/p5-Test-Output \
+		net/p5-Net-DNS-Resolver-Mock \
 		textproc/p5-XML-Validator-Schema
 
 CONFIGURE_STYLE= modbuild
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-Mail-DMARC/distinfo,v
diff -u -p -r1.11 distinfo
--- distinfo	3 May 2023 09:54:12 -	1.11
+++ distinfo	21 May 2024 07:41:06 -
@@ -1,2 +1,2 @@
-SHA256 (Mail-DMARC-1.20230215.tar.gz) = V9z1R1nLkkSOVukUE0D2E0QnTFjZ3WWqkKqczw5+uQM=
-SIZE (Mail-DMARC-1.20230215.tar.gz) = 799270
+SHA256 (Mail-DMARC-1.20240314.tar.gz) = LPNm+H2ih89vYS0dzLz1RBf6o8TkUpX1VHJ5vSZZPSw=
+SIZE (Mail-DMARC-1.20240314.tar.gz) = 804792


OpenPGP_signature.asc
Description: OpenPGP digital signature

Re: Overhaul package handling in puppet 8

[Giovanni Bechis]

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 ?


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.
 Cheers
   Giovanni



  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 be specified as an array where each element is 
either a
+- string or a hash."
++string or a hash."
+
+   commands :pkginfo => "pkg_info",
+:pkgadd => "pkg_add",
+@@ -18,220 +22,94 @@ Puppet::Type.type(:package).provide :openbsd, :parent
+   defaultfor

Re: Overhaul package handling in puppet 8

[Giovanni Bechis]

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
am also using "ensure => latest" syntax but I can change my code to get
rid of it OpenBSD will no more support it.

 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 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 be specified as an array where each element is 
> either a
> +- string or a hash."
> ++string or a hash."
> + 
> +   commands :pkginfo => "pkg_info",
> +:pkgadd => "pkg_add",
> +@@ -18,220 +22,94 @@ Puppet::Type.type(:package).provide :openbsd, :parent 
> +   defaultfor 'os.name' => :openbsd
> +   confine 'os.name' => :openbsd
> + 
> +-  has_feature :versionable
> +   has_feature :install_options
> +   has_feature :uninstall_options
> +-  has_feature :upgradeable
> has_feature :supports_flavors
>   
> -+  mk_resource_methods
> -+
> def self.instances
> - packages = []
> - 
> -@@ -46,12 +48,6 @@ Puppet::Type.type(:package).provide :openbsd, :parent 
> - 
> - packages << new(hash)
> - hash = {}
> +-packages = []
> +-
> ++final = []
> + begin
> +-  execpipe(listcmd) do |process|
> +-# our regex for matching pkg_info output
> +-regex = /^(.*)-(\d[^-]*)[-]?([\w-]*)(.*)$/
> +-fields = [:name, :ensure, :flavor]
> +-hash = {}
> ++  packages = listcmd
> ++  packages.each { |package, value|
> ++if !package.empty?()
> ++  value[:provider] = self.name
> ++  final << new(value)
> ++end
> ++  }
> ++  return final
> + 
> +-# now turn each returned line into a package object
> +-process.each_line { |line|
> +-  match = regex.match(line

UPDATE 7.5-stable: www/apache-httpd

[Giovanni Bechis]

Hi,
update to apache-httpd 2.4.59 which fixes CVE-2024-27316, CVE-2024-24795 and 
CVE-2023-38709
Comments ? ok ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.129
diff -u -p -r1.129 Makefile
--- Makefile30 Jan 2024 10:01:48 -  1.129
+++ Makefile9 Apr 2024 20:32:44 -
@@ -1,9 +1,8 @@
 COMMENT=   apache HTTP server
 
-V= 2.4.58
+V= 2.4.59
 DISTNAME=  httpd-${V}
 PKGNAME=   apache-httpd-${V}
-REVISION=  1
 
 CATEGORIES=www net
 
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo19 Oct 2023 10:35:27 -  1.46
+++ distinfo9 Apr 2024 20:32:44 -
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.58.tar.gz) = UDp9pKSif9SWA3mYsXB43J/gBNsyxlfJbM6DVriqLrY=
-SIZE (httpd-2.4.58.tar.gz) = 9825177
+SHA256 (httpd-2.4.59.tar.gz) = 5OxM4Sxsj1p5TcImPRJssdbvZn8DTEZ47JRdYShuiw8=
+SIZE (httpd-2.4.59.tar.gz) = 9843252
Index: patches/patch-docs_man_htpasswd_1
===
RCS file: /cvs/ports/www/apache-httpd/patches/patch-docs_man_htpasswd_1,v
retrieving revision 1.9
diff -u -p -r1.9 patch-docs_man_htpasswd_1
--- patches/patch-docs_man_htpasswd_1   11 Mar 2022 20:09:38 -  1.9
+++ patches/patch-docs_man_htpasswd_1   9 Apr 2024 20:32:44 -
@@ -5,8 +5,8 @@ Index: docs/man/htpasswd.1
  .el .ne 3
  .IP "\\$1" \\$2
  ..
--.TH "HTPASSWD" 1 "2019-08-09" "Apache HTTP Server" "htpasswd"
-+.TH "HTPASSWD2" 1 "2019-08-09" "Apache HTTP Server" "htpasswd2"
+-.TH "HTPASSWD" 1 "2024-04-02" "Apache HTTP Server" "htpasswd"
++.TH "HTPASSWD2" 1 "2024-04-02" "Apache HTTP Server" "htpasswd2"
  
  .SH NAME
 -htpasswd \- Manage user files for basic authentication
@@ -15,20 +15,20 @@ Index: docs/man/htpasswd.1
  .SH "SYNOPSIS"
   
  .PP
--\fB\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR 
| -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] 
\fIpasswdfile\fR \fIusername\fR\fR
-+\fB\fBhtpasswd2\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR 
| -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] 
\fIpasswdfile\fR \fIusername\fR\fR
+-\fB\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fB2\fR 
| -\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ 
-\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR 
\fIusername\fR\fR
++\fB\fBhtpasswd2\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fB2\fR 
| -\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ 
-\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR 
\fIusername\fR\fR
   
  .PP
--\fB\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | 
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] 
\fIpasswdfile\fR \fIusername\fR \fIpassword\fR\fR
-+\fB\fBhtpasswd2\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | 
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] 
\fIpasswdfile\fR \fIusername\fR \fIpassword\fR\fR
+-\fB\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fB2\fR | 
-\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ 
-\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR \fIusername\fR 
\fIpassword\fR\fR
++\fB\fBhtpasswd2\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fB2\fR | 
-\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ 
-\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR \fIusername\fR 
\fIpassword\fR\fR
   
  .PP
--\fB\fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | 
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR\fR
-+\fB\fBhtpasswd2\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | 
-\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR\fR
+-\fB\fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fB2\fR | 
-\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ 
-\fBC\fR \fIcost\fR ] \fIusername\fR\fR
++\fB\fBhtpasswd2\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fB2\fR | 
-\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ 
-\fBC\fR \fIcost\fR ] \fIusername\fR\fR
   
  .PP
--\fB\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | 
-\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR\fR
-+\fB\fBhtpasswd2\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | 
-\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR\fR
+-\fB\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fB2\fR | -\fB5\fR | 
-\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ -\fBC\fR 
\fIcost\fR ] \fIuse

Re: mail/opensmtpd-extras: use imsg_get_fd()

[Giovanni Bechis]

On 1/30/24 17:02, Omar Polo wrote:

This should make opensmtpd-extras work with a future imsg.fd removal.

m_forward() is not used at all in -extras, so I could have also used -1
there, it doesn't matter.

The queues are doing imsg passing, so the second hunk is actually
needed, even if I doubt anyone is using them?  anyway, the diff is
simple enough that I'm confident I'm not breaking anything.

There is still one hit of 'imsg->fd' in api/filter_api.c, but that file
is not used anymore, and so I haven't touched it.


The diff makes sense, the diff should also be committed upstream.
ok giovanni@
 Thanks
  Giovanni



Index: Makefile
===
RCS file: /home/cvs/ports/mail/opensmtpd-extras/Makefile,v
diff -u -p -r1.37 Makefile
--- Makefile26 Sep 2023 12:28:13 -  1.37
+++ Makefile30 Jan 2024 15:55:03 -
@@ -11,8 +11,11 @@ PKGNAME-mysql=   opensmtpd-extras-mysql-$
  PKGNAME-pgsql=opensmtpd-extras-pgsql-${V}
  PKGNAME-python=   opensmtpd-extras-python-${V}
  PKGNAME-redis=opensmtpd-extras-redis-${V}
-REVISION-mysql=0
-REVISION-pgsql=0
+REVISION-main= 0
+REVISION-mysql=1
+REVISION-pgsql=1
+REVISION-python=   0
+REVISION-redis=0
  EPOCH=0
  
  CATEGORIES=		mail

Index: patches/patch-api_mproc_c
===
RCS file: patches/patch-api_mproc_c
diff -N patches/patch-api_mproc_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-api_mproc_c   30 Jan 2024 15:57:35 -
@@ -0,0 +1,14 @@
+use imsg_get_fd()
+
+Index: api/mproc.c
+--- api/mproc.c.orig
 api/mproc.c
+@@ -306,7 +306,7 @@ void
+ m_forward(struct mproc *p, struct imsg *imsg)
+ {
+   imsg_compose(&p->imsgbuf, imsg->hdr.type, imsg->hdr.peerid,
+-  imsg->hdr.pid, imsg->fd, imsg->data,
++  imsg->hdr.pid, imsg_get_fd(imsg), imsg->data,
+   imsg->hdr.len - sizeof(imsg->hdr));
+
+   log_trace(TRACE_MPROC, "mproc: %s -> %s : %zu %s (forward)",
Index: patches/patch-api_queue_api_c
===
RCS file: patches/patch-api_queue_api_c
diff -N patches/patch-api_queue_api_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-api_queue_api_c   30 Jan 2024 15:57:35 -
@@ -0,0 +1,14 @@
+use imsg_get_fd
+
+Index: api/queue_api.c
+--- api/queue_api.c.orig
 api/queue_api.c
+@@ -171,7 +171,7 @@ queue_msg_dispatch(void)
+   log_warn("warn: queue-api: mkstemp");
+   }
+   else {
+-  ifile = fdopen(imsg.fd, "r");
++  ifile = fdopen(imsg_get_fd(&imsg), "r");
+   ofile = fdopen(fd, "w");
+   m = n = 0;
+   if (ifile && ofile) {

Re: Trying to install Apache 2.4 with OpenSSL 1.1 instead of LibreSSL

[Giovanni Bechis]

On Mon, Jan 29, 2024 at 07:45:27PM +, Stuart Henderson wrote:
> On 2024/01/29 09:51, giova...@paclan.it wrote:
> > On 1/26/24 23:11, Tim wrote:
> > > I'm trying to troubleshoot an issue where Chrome/Chromium browsers
> > > randomly fail to correctly use SSL against my web server.
> > > 
> > This is a known issue, see 
> > https://marc.info/?l=openbsd-ports&m=167449054903277&w=2
> > 
> > > So I am trying to compile and install an apache-http port with OpenSSL 1.1
> > > library instead of LibreSSL.
> > > 
> > > I have managed to compile and install this customer port, however, I
> > > don't know if I ultimately succeeded because when it starts it still
> > > says this in the log file:
> > > 
> > > [Fri Jan 26 14:02:57.131803 2024] [mpm_prefork:notice] [pid 67010] 
> > > AH00163: Apache/2.4.58 (Unix) LibreSSL/3.8.2 configured -- resuming 
> > > normal operations
> > > 
> > > Is this message wrong?  Or am I still ending up with an Apache2
> > > compiled against LibreSSL instead of OpenSSL?
> 
> > you can find it by running "ldd /usr/local/lib/apache2/mod_ssl.so".
> 
> That will show the libraries used but not the headers. (It is possible
> to compile with openssl libraries but libressl headers - that will cause
> problems too).
> 
> I didn't check where httpd gets this version number in the log entry
> from, but it can either be a function in one of the libraries
> (libssl/libcrypto), or from the opensslv.h header.
> 
> Even if you get apache-httpd built against the correct libraries, some
> of the other libraries which it pulls in are built using libressl
> libraries. Those will need to be rebuilt using openssl too. This
> includes apr-util and curl - but curl is used widely in the ports tree
> and you're likely to cause problems for other installed packages if you
> change that.
> 
> Basically: building against a non-default version of a widely used
> library is a hard problem and really best avoided.
> 
> If your setup is reasonably simple, you may be able to use the
> workaround of a single cert with a bunch of additional hostnames in
> subjectAltName. In that case, SNI is not needed for the site to work,
> and that will almost certainly be the easiest way...
> 
> Another possible approach (untested)...
> 
what about this one so I can commit it upstream as well ?
 Giovanni

Index: modules/ssl/ssl_private.h
===
--- modules/ssl/ssl_private.h   (revision 1915475)
+++ modules/ssl/ssl_private.h   (working copy)
@@ -249,7 +249,7 @@
 #endif
 
 /* ALPN Protocol Negotiation */
-#if defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
+#if !defined(LIBRESSL_VERSION_NUMBER) && 
defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
 #define HAVE_TLS_ALPN
 #endif
 

UPDATE: net/rbldnsd

[Giovanni Bechis]

Hi,
the attached diff updates net/rbldnsd to latest version of rspamd fork.
The fork is currently maintained and it has got rid of net/py-dns dependency.
Ok ? Comments ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/net/rbldnsd/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile8 Nov 2022 11:17:00 -   1.19
+++ Makefile11 Jan 2024 08:28:49 -
@@ -1,36 +1,27 @@
 COMMENT=   small daemon for DNSBLs
 
-DISTNAME=  rbldnsd-0.998.20180516
-GH_ACCOUNT=spamhaus
+DISTNAME=  rbldnsd-1.0.0.2024.01.11
+GH_ACCOUNT=rspamd
 GH_PROJECT=rbldnsd
-GH_COMMIT= cfb7e80ffa690861b1b79772328aa274d1d5446a
-REVISION=  0
+GH_COMMIT= ec13fa915138330ed9c734ac73250bfcb0b3c268
 
 CATEGORIES=net
 
-HOMEPAGE=  https://rbldnsd.io
 MAINTAINER=Giovanni Bechis 
 
-# GPLv2
+# Mostly GPL, with some code licensed under 3-clause BSD license
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   c z
-MODULES=   lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
-MODPY_RUNDEP=  no
+MODULES=   devel/cmake
 
-CONFIGURE_STYLE=simple
 RBLDNSD_BASE=  ${VARBASE}/rbldnsd
 SUBST_VARS=VARBASE RBLDNSD_BASE
 
 TEST_TARGET=   check
-TEST_DEPENDS=  net/py-dns
 
-pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/Makefile.in
-
-do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/rbldnsd ${PREFIX}/sbin
+post-install:
+   mv ${PREFIX}/sbin/rbldnsd-1.0.0 ${PREFIX}/sbin/rbldnsd
${INSTALL_MAN} ${WRKSRC}/rbldnsd.8 ${PREFIX}/man/man8
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/rbldnsd/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo18 Mar 2019 16:29:49 -  1.7
+++ distinfo11 Jan 2024 08:28:49 -
@@ -1,2 +1,2 @@
-SHA256 (rbldnsd-0.998.20180516-cfb7e80f.tar.gz) = 
qi+PKkQkcYU8SHIThe1jRD6woITrap7KP5tzno8FpME=
-SIZE (rbldnsd-0.998.20180516-cfb7e80f.tar.gz) = 156145
+SHA256 (rbldnsd-1.0.0.2024.01.11-ec13fa91.tar.gz) = 
V+NFScIlChierW7t/H31lMa87321w80h/8FMZ+9tmIE=
+SIZE (rbldnsd-1.0.0.2024.01.11-ec13fa91.tar.gz) = 217954
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in   11 Mar 2022 19:47:19 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: Makefile.in
 Makefile.in.orig
-+++ Makefile.in
-@@ -11,7 +11,7 @@ AR = @AR@
- ARFLAGS = @ARFLAGS@
- RANLIB = @RANLIB@
- AWK = @AWK@
--PYTHON = python
-+PYTHON = ${MODPY_BIN}
- GNUTAR = tar
- 
- # Disable statistic counters

Nextcloud upgrade path

[Giovanni Bechis]

Hi,
I have a Nextcloud 23.x instance running on OpenBSD 7.3.
pkg_add(1) suggests to upgrade to 24.x and then to 25.x before next release.

$ doas pkg_add -ui
[...]
--- +nextcloud-23.0.12p1 ---
Nextcloud 23 is EOL upstream, it is advised to update your installation
to 24 then to 25 to make sure you're on a supported branch by the time
OpenBSD 7.4 is released.
$ doas pkg_add -i nextcloud
quirks-6.121 signed on 2023-06-08T09:49:46Z
Ambiguous: choose package for nextcloud
a   0: 
1: nextcloud-23.0.12p1
2: nextcloud-24.0.12
3: nextcloud-25.0.6
Your choice: 2
Can't install nextcloud-24.0.12 because of conflicts (nextcloud-23.0.12p1)
--- nextcloud-24.0.12 ---
Can't install nextcloud-24.0.12: conflicts
Couldn't install nextcloud-24.0.12

How should a user upgrade (some info on current.html are needed imho) ?
Can't we add pkgpath entries in order to correctly upgrade between nextcloud 
versions ?

 Cheers
  Giovanni

-

OpenBSD 7.3 (GENERIC) #655: Fri Mar 17 19:16:28 MDT 2023
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC
real mem  = 536363008 (511MB)
avail mem = 509448192 (485MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: date 20/80/26, BIOS32 rev. 0 @ 0xfac40
pcibios0 at bios0: rev 2.0 @ 0xf/0x1
pcibios0: pcibios_get_intr_routing - function not supported
pcibios0: PCI IRQ Routing information unavailable.
pcibios0: PCI bus #0 is the last bus
bios0: ROM list: 0xc8000/0xa800
cpu0 at mainbus0: (uniprocessor)
cpu0: Geode(TM) Integrated Processor by AMD PCS ("AuthenticAMD" 586-class) 500 
MHz, 05-0a-02
cpu0: FPU,DE,PSE,TSC,MSR,CX8,SEP,PGE,CMOV,CFLUSH,MMX,MMXX,3DNOW2,3DNOW
mtrr: K6-family MTRR support (2 registers)
amdmsr0 at mainbus0
pci0 at mainbus0 bus 0: configuration mode 1 (bios)
0:20:0: io address conflict 0x6100/0x100
0:20:0: io address conflict 0x6200/0x200
pchb0 at pci0 dev 1 function 0 "AMD Geode LX" rev 0x31
glxsb0 at pci0 dev 1 function 2 "AMD Geode LX Crypto" rev 0x00: RNG AES
vr0 at pci0 dev 6 function 0 "VIA VT6105M RhineIII" rev 0x96: irq 11, address 
00:00:24:c8:de:80
ukphy0 at vr0 phy 1: Generic IEEE 802.3u media interface, rev. 3: OUI 0x004063, 
model 0x0034
vr1 at pci0 dev 7 function 0 "VIA VT6105M RhineIII" rev 0x96: irq 5, address 
00:00:24:c8:de:81
ukphy1 at vr1 phy 1: Generic IEEE 802.3u media interface, rev. 3: OUI 0x004063, 
model 0x0034
vr2 at pci0 dev 8 function 0 "VIA VT6105M RhineIII" rev 0x96: irq 9, address 
00:00:24:c8:de:82
ukphy2 at vr2 phy 1: Generic IEEE 802.3u media interface, rev. 3: OUI 0x004063, 
model 0x0034
vr3 at pci0 dev 9 function 0 "VIA VT6105M RhineIII" rev 0x96: irq 12, address 
00:00:24:c8:de:83
ukphy3 at vr3 phy 1: Generic IEEE 802.3u media interface, rev. 3: OUI 0x004063, 
model 0x0034
glxpcib0 at pci0 dev 20 function 0 "AMD CS5536 ISA" rev 0x03: rev 3, 32-bit 
3579545Hz timer, watchdog, gpio, i2c
gpio0 at glxpcib0: 32 pins
iic0 at glxpcib0
pciide0 at pci0 dev 20 function 2 "AMD CS5536 IDE" rev 0x01: DMA, channel 0 
wired to compatibility, channel 1 wired to compatibility
wd0 at pciide0 channel 0 drive 0: 
wd0: 16-sector PIO, LBA48, 476940MB, 976773168 sectors
wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 2
pciide0: channel 1 ignored (disabled)
ohci0 at pci0 dev 21 function 0 "AMD CS5536 USB" rev 0x02: irq 15, version 1.0, 
legacy support
ehci0 at pci0 dev 21 function 1 "AMD CS5536 USB" rev 0x02: irq 15
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "AMD EHCI root hub" rev 2.00/1.00 
addr 1
isa0 at glxpcib0
isadma0 at isa0
com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
com0: console
com1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbc0: unable to establish interrupt for irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
nsclpcsio0 at isa0 port 0x2e/2: NSC PC87366 rev 9: GPIO VLM TMS
gpio1 at nsclpcsio0: 29 pins
npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
usb1 at ohci0: USB revision 1.0
uhub1 at usb1 configuration 1 interface 0 "AMD OHCI root hub" rev 1.00/1.00 
addr 1
vscsi0 at root
scsibus1 at vscsi0: 256 targets
softraid0 at root
scsibus2 at softraid0: 256 targets
root on wd0a (5527fdd6d670763b.a) swap on wd0b dump on wd0b

Re: certbot missing module pkg_resources

[Giovanni Bechis]

On Wed, May 31, 2023 at 05:13:40PM -0400, A Tammy wrote:
> 
> On 5/31/23 16:06, Adriano Barbosa wrote:
> > Hi.
> > I'm getting the error below while trying to run certbot from ports on
> > 7.3. It runs after installing py3-setuptools. Should it be added in
> > RUN_DEPENDS?
> 
> From https://setuptools.pypa.io/en/latest/pkg_resources.html
> 
> > Use of |pkg_resources| is deprecated in favor of |importlib.resources|
> ,
> |importlib.metadata|
> 
> and their backports (importlib_resources
> , importlib_metadata
> ). Users should refrain
> from new usage of |pkg_resources| and should work to port to
> importlib-based solutions.
> 
> Someone with enough enthusiasm should tell upstream.
> 
> OK aisha@ to add RUN_DEPENDS.
> 
ok for this diff for 7.3 ?
 Cheers
  Giovanni

Index: Makefile.inc
===
RCS file: /cvs/ports/security/letsencrypt/Makefile.inc,v
retrieving revision 1.77
diff -u -p -r1.77 Makefile.inc
--- Makefile.inc9 Mar 2023 06:40:47 -   1.77
+++ Makefile.inc5 Jun 2023 07:09:11 -
@@ -4,6 +4,7 @@ MODPY_PI?=  Yes
 MODPY_PYBUILD?=setuptools
 
 MODPY_EGG_VERSION?=2.4.0
+REVISION?= 0
 
 MODULES?=  lang/python
 
Index: client/Makefile
===
RCS file: /cvs/ports/security/letsencrypt/client/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- client/Makefile 25 Nov 2022 22:11:48 -  1.37
+++ client/Makefile 5 Jun 2023 07:09:11 -
@@ -13,7 +13,8 @@ RUN_DEPENDS=  security/letsencrypt/py-acm
devel/py-parsedatetime${MODPY_FLAVOR} \
textproc/py-pyRFC3339${MODPY_FLAVOR} \
devel/py-zopecomponent${MODPY_FLAVOR} \
-   devel/py-zopeinterface${MODPY_FLAVOR}
+   devel/py-zopeinterface${MODPY_FLAVOR} \
+   devel/py-setuptools${MODPY_FLAVOR}
 MODPY_PYTEST=  Yes
 
 do-configure:

UPDATE: www/apache-httpd

[Giovanni Bechis]

Bugfix update to 2.4.57 follows, this is a bugfix release.
 Comments ?

  Cheers
   Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile7 Mar 2023 14:55:37 -   1.121
+++ Makefile7 Apr 2023 09:19:51 -
@@ -1,6 +1,6 @@
 COMMENT=   apache HTTP server
 
-V= 2.4.56
+V= 2.4.57
 DISTNAME=  httpd-${V}
 PKGNAME=   apache-httpd-${V}
 
@@ -44,8 +44,10 @@ CONFIGURE_ARGS=  --enable-authnz-fcgi \
--enable-cache \
--enable-cgi \
--enable-disk-cache \
+   --enable-socache-dc=no \
--enable-http2 \
--enable-layout=OpenBSD \
+   --enable-lua=no \
--enable-mods-shared=all \
--enable-modules=all \
--enable-mpms-shared=all \
@@ -67,7 +69,10 @@ CONFIGURE_ARGS=  --enable-authnz-fcgi \
 
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
-   AWK=awk
+   AWK=awk \
+   GREP=grep \
+   ac_cv_path_RSYNC=no \
+   ac_cv_path_SVN=no
 
 FAKE_FLAGS=rel_user=www rel_group=www \
rel_datadir=${HTTPD_DIR} \
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.44
diff -u -p -r1.44 distinfo
--- distinfo7 Mar 2023 14:55:37 -   1.44
+++ distinfo7 Apr 2023 09:19:51 -
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.56.tar.gz) = 2w1MdgB7Ix/Tq0G1gFSNx5iuOES7fD1c4eQXTKI2Rpg=
-SIZE (httpd-2.4.56.tar.gz) = 9769650
+SHA256 (httpd-2.4.57.tar.gz) = vD5+VAuD7CT5uEfGtNcUjFW3myfRAuISJ+tl9xg9a0U=
+SIZE (httpd-2.4.57.tar.gz) = 9773385

7.2 update: www/apache-httpd

[Giovanni Bechis]

Hi,
update to Apache httpd 2.4.56 for OpenBSD 7.2 follows.
Fixes CVE-2023-27522 and CVE-2023-25690.

 ok ?
  Cheers
   Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.118.2.1
diff -u -p -r1.118.2.1 Makefile
--- Makefile23 Jan 2023 14:37:17 -  1.118.2.1
+++ Makefile7 Mar 2023 15:07:14 -
@@ -1,6 +1,6 @@
 COMMENT=   apache HTTP server
 
-V= 2.4.55
+V= 2.4.56
 DISTNAME=  httpd-${V}
 PKGNAME=   apache-httpd-${V}
 
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.42.2.1
diff -u -p -r1.42.2.1 distinfo
--- distinfo23 Jan 2023 14:37:17 -  1.42.2.1
+++ distinfo7 Mar 2023 15:07:14 -
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.55.tar.gz) = Unbqi8b/8x7tXIITKuUaCy7gX55rYaAPqHf2ytqztjg=
-SIZE (httpd-2.4.55.tar.gz) = 975
+SHA256 (httpd-2.4.56.tar.gz) = 2w1MdgB7Ix/Tq0G1gFSNx5iuOES7fD1c4eQXTKI2Rpg=
+SIZE (httpd-2.4.56.tar.gz) = 9769650
Index: patches/patch-modules_http2_h2_c2_filter_c
===
RCS file: patches/patch-modules_http2_h2_c2_filter_c
diff -N patches/patch-modules_http2_h2_c2_filter_c
--- patches/patch-modules_http2_h2_c2_filter_c  23 Jan 2023 14:37:17 -  
1.1.2.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-mod_http2: client resets of HTTP/2 streams led to unwanted 500 errors
-reported in access logs and error documents. The processing of the
-reset was correct, only unneccesary reporting was caused.
-Index: modules/http2/h2_c2_filter.c
 modules/http2/h2_c2_filter.c.orig
-+++ modules/http2/h2_c2_filter.c
-@@ -615,7 +615,7 @@ apr_status_t h2_c2_filter_catch_h1_out(ap_filter_t* f,
- ap_assert(conn_ctx);
- H2_FILTER_LOG("c2_catch_h1_out", f->c, APLOG_TRACE2, 0, "check", bb);
- 
--if (!conn_ctx->has_final_response) {
-+if (!f->c->aborted && !conn_ctx->has_final_response) {
- if (!parser) {
- parser = apr_pcalloc(f->c->pool, sizeof(*parser));
- parser->id = apr_psprintf(f->c->pool, "%s-%d", conn_ctx->id, 
conn_ctx->stream_id);

Re: NEW: databases/puppetdb and sysutils/puppetserver 7.X

[Giovanni Bechis]

On 2/14/23 21:07, Sebastian Reitenbach wrote:

On Sunday, February 12, 2023 10:36 CET, Giovanni Bechis  
wrote:


On Sat, Feb 11, 2023 at 10:12:25PM +0100, Sebastian Reitenbach wrote:

On Saturday, February 11, 2023 22:00 CET, "Sebastian Reitenbach" 
 wrote:


On Saturday, February 11, 2023 21:55 CET, "Sebastian Reitenbach" 
 wrote:


On Saturday, February 11, 2023 11:35 CET, Giovanni Bechis  
wrote:


On Sat, Feb 11, 2023 at 11:03:57AM +0100, Giovanni Bechis wrote:

On Sat, Feb 11, 2023 at 12:01:27AM +0100, Sebastian Reitenbach wrote:

On Thursday, February 09, 2023 14:51 CET, Giovanni Bechis 
 wrote:


On 1/30/23 21:42, Sebastian Reitenbach wrote:

Hi,

with Puppet 5 now replaced by Puppet 7, the ability to run a Puppet master on 
OpenBSD was gone.
These two new packages replace the old PuppetDB 5, with PuppetDB 7 and 
introduces the new Puppetserver.

Similarly to systuls/ruby-puppet, they go into branches based on the major 
version, to have future room for Puppet 8.
Their paths where software gets installed is aligned to Puppet, under 
/var/puppetlabs/... /usr/local/share/puppetlabs/... etc.

Puppetserver usually comes bundled with a Ruby interpreter and Puppet agent. 
That doesn't work out
on OpenBSD. Therefore some bootstrapping has to be done manually that is 
OpenBSD specific, and noted
in the Puppetserver pkg/README.

   A couple of tweaks I had to do to my hiera files, as well as to some of the 
modules, mostly updating
them. Overall, the changes weren't that big. As everyone might have different 
(custom) modules or
hiera plugins in use, ymmv. Therefore I can't really provide a step by step 
upgrade path. Install on a test
environment before attempting to upgrade/replace your former Puppet 5 Master.
That said, Puppet 7 works for me standalone with puppet apply ... but also 
against this Puppetserver with PuppetDB backend, autosigning setup...

comments to the ports, test reports, or maybe even OKs welcome ;)

cheers,
Sebastian




thanks for testing.

Few issues:
- puppetdb is missing pkg/README file in the tarball

This is missing on purpose, forgot to remove that, as I did last-minute 
clean-ups before sending out the tarball.
Puppetdb is quite standard, so the upstream doc should more or less just work. 
Also the old puppetdb 5 README
contained quite some outdated/misleading info
If there turns to be out some OpenBSD specific issues, I'm happy to re-add.


- puppetserver doesn't create /var/log/puppetlabs/puppetserver directory

oops


- puppetserver doesn't start on my server log file attached, it seems there is 
a dependency missing (no such file to load...).

puppetserver is quite non-standard, compared to puppetdb, just to make sure, 
did you do the initial bootstrap as described in the README?


actually I did not bootstrapped it.
After bootstrap it fails with a slightly different error (no such file
to load -- facter).


this diff fixes the issue.


I don't think puppetserver picks up facter from "outside"

but it seems I forgot to add facter as a gem to install in the README:

# puppetserver gem install --no-document puppet hiera-eyaml \
 hiera-file ipaddress msgpack facter

This is not in the packages I just sent, but have it updated in my mystuff/


or wait, it actually should have pulled pulled facter in via the bootstrap step.

Do you can check
sudo  puppetserver gem list
Facter should actually be there?


forgot that facter is BAD, due to the extra copy step, until the OpenBSD patch
is merged upstream and released.
So yes, for the time being, the facter version installed via puppetserver gem 
install
and in the system should be the same version.

does this mean we have to keep facter port updated to latest version on
-stable as well until code will be committed upstream ?
Otherwise I think bootstrap might break.


I tried to address the issue with an updated README.
Hope that should be OK? now?


yes,
ok giovanni@
 Cheers
  Giovanni






Sebastian




  Giovanni


maybe commenting and bugging on the PR might help:
https://github.com/puppetlabs/facter/pull/2531


Therefore, as it seems to work for you, OK for the ruby-facter update.

Sebastian


Sebastian



Sebastian


  Thanks
   Giovanni

Index: Makefile
===
RCS file: /cvs/ports/sysutils/ruby-facter/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- Makefile22 Jan 2023 19:21:56 -  1.92
+++ Makefile11 Feb 2023 10:34:05 -
@@ -1,7 +1,6 @@
  COMMENT = Puppet module management
  
-DISTNAME =	facter-4.2.14

-REVISION = 0
+DISTNAME = facter-4.3.0
  CATEGORIES =  sysutils
  HOMEPAGE =https://github.com/puppetlabs/facter
  MAINTAINER =  Sebastian Reitenbach 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ruby-facter/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo

Re: NEW: databases/puppetdb and sysutils/puppetserver 7.X

[Giovanni Bechis]

On Sat, Feb 11, 2023 at 10:12:25PM +0100, Sebastian Reitenbach wrote:
> On Saturday, February 11, 2023 22:00 CET, "Sebastian Reitenbach" 
>  wrote:
> 
> > On Saturday, February 11, 2023 21:55 CET, "Sebastian Reitenbach" 
> >  wrote:
> > 
> > > On Saturday, February 11, 2023 11:35 CET, Giovanni Bechis 
> > >  wrote:
> > > 
> > > > On Sat, Feb 11, 2023 at 11:03:57AM +0100, Giovanni Bechis wrote:
> > > > > On Sat, Feb 11, 2023 at 12:01:27AM +0100, Sebastian Reitenbach wrote:
> > > > > > On Thursday, February 09, 2023 14:51 CET, Giovanni Bechis 
> > > > > >  wrote:
> > > > > > 
> > > > > > > On 1/30/23 21:42, Sebastian Reitenbach wrote:
> > > > > > > > Hi,
> > > > > > > >
> > > > > > > > with Puppet 5 now replaced by Puppet 7, the ability to run a 
> > > > > > > > Puppet master on OpenBSD was gone.
> > > > > > > > These two new packages replace the old PuppetDB 5, with 
> > > > > > > > PuppetDB 7 and introduces the new Puppetserver.
> > > > > > > >
> > > > > > > > Similarly to systuls/ruby-puppet, they go into branches based 
> > > > > > > > on the major version, to have future room for Puppet 8.
> > > > > > > > Their paths where software gets installed is aligned to Puppet, 
> > > > > > > > under /var/puppetlabs/... /usr/local/share/puppetlabs/... etc.
> > > > > > > >
> > > > > > > > Puppetserver usually comes bundled with a Ruby interpreter and 
> > > > > > > > Puppet agent. That doesn't work out
> > > > > > > > on OpenBSD. Therefore some bootstrapping has to be done 
> > > > > > > > manually that is OpenBSD specific, and noted
> > > > > > > > in the Puppetserver pkg/README.
> > > > > > > >
> > > > > > > >   A couple of tweaks I had to do to my hiera files, as well as 
> > > > > > > > to some of the modules, mostly updating
> > > > > > > > them. Overall, the changes weren't that big. As everyone might 
> > > > > > > > have different (custom) modules or
> > > > > > > > hiera plugins in use, ymmv. Therefore I can't really provide a 
> > > > > > > > step by step upgrade path. Install on a test
> > > > > > > > environment before attempting to upgrade/replace your former 
> > > > > > > > Puppet 5 Master.
> > > > > > > > That said, Puppet 7 works for me standalone with puppet apply 
> > > > > > > > ... but also against this Puppetserver with PuppetDB backend, 
> > > > > > > > autosigning setup...
> > > > > > > >
> > > > > > > > comments to the ports, test reports, or maybe even OKs welcome 
> > > > > > > > ;)
> > > > > > > >
> > > > > > > > cheers,
> > > > > > > > Sebastian
> > > > > > > 
> > > > > > 
> > > > > > thanks for testing.
> > > > > > > Few issues:
> > > > > > > - puppetdb is missing pkg/README file in the tarball
> > > > > > This is missing on purpose, forgot to remove that, as I did 
> > > > > > last-minute clean-ups before sending out the tarball.
> > > > > > Puppetdb is quite standard, so the upstream doc should more or less 
> > > > > > just work. Also the old puppetdb 5 README
> > > > > > contained quite some outdated/misleading info
> > > > > > If there turns to be out some OpenBSD specific issues, I'm happy to 
> > > > > > re-add.
> > > > > > 
> > > > > > > - puppetserver doesn't create /var/log/puppetlabs/puppetserver 
> > > > > > > directory
> > > > > > oops
> > > > > > 
> > > > > > > - puppetserver doesn't start on my server log file attached, it 
> > > > > > > seems there is a dependency missing (no such file to load...).
> > > > > > puppetserver is quite non-standard, compared to puppetdb, just to 
> > > > > > make sure, did you do the initial bootstrap as described 

Re: NEW: databases/puppetdb and sysutils/puppetserver 7.X

[Giovanni Bechis]

On Sat, Feb 11, 2023 at 11:03:57AM +0100, Giovanni Bechis wrote:
> On Sat, Feb 11, 2023 at 12:01:27AM +0100, Sebastian Reitenbach wrote:
> > On Thursday, February 09, 2023 14:51 CET, Giovanni Bechis 
> >  wrote:
> > 
> > > On 1/30/23 21:42, Sebastian Reitenbach wrote:
> > > > Hi,
> > > >
> > > > with Puppet 5 now replaced by Puppet 7, the ability to run a Puppet 
> > > > master on OpenBSD was gone.
> > > > These two new packages replace the old PuppetDB 5, with PuppetDB 7 and 
> > > > introduces the new Puppetserver.
> > > >
> > > > Similarly to systuls/ruby-puppet, they go into branches based on the 
> > > > major version, to have future room for Puppet 8.
> > > > Their paths where software gets installed is aligned to Puppet, under 
> > > > /var/puppetlabs/... /usr/local/share/puppetlabs/... etc.
> > > >
> > > > Puppetserver usually comes bundled with a Ruby interpreter and Puppet 
> > > > agent. That doesn't work out
> > > > on OpenBSD. Therefore some bootstrapping has to be done manually that 
> > > > is OpenBSD specific, and noted
> > > > in the Puppetserver pkg/README.
> > > >
> > > >   A couple of tweaks I had to do to my hiera files, as well as to some 
> > > > of the modules, mostly updating
> > > > them. Overall, the changes weren't that big. As everyone might have 
> > > > different (custom) modules or
> > > > hiera plugins in use, ymmv. Therefore I can't really provide a step by 
> > > > step upgrade path. Install on a test
> > > > environment before attempting to upgrade/replace your former Puppet 5 
> > > > Master.
> > > > That said, Puppet 7 works for me standalone with puppet apply ... but 
> > > > also against this Puppetserver with PuppetDB backend, autosigning 
> > > > setup...
> > > >
> > > > comments to the ports, test reports, or maybe even OKs welcome ;)
> > > >
> > > > cheers,
> > > > Sebastian
> > > 
> > 
> > thanks for testing.
> > > Few issues:
> > > - puppetdb is missing pkg/README file in the tarball
> > This is missing on purpose, forgot to remove that, as I did last-minute 
> > clean-ups before sending out the tarball.
> > Puppetdb is quite standard, so the upstream doc should more or less just 
> > work. Also the old puppetdb 5 README
> > contained quite some outdated/misleading info
> > If there turns to be out some OpenBSD specific issues, I'm happy to re-add.
> > 
> > > - puppetserver doesn't create /var/log/puppetlabs/puppetserver directory
> > oops
> > 
> > > - puppetserver doesn't start on my server log file attached, it seems 
> > > there is a dependency missing (no such file to load...).
> > puppetserver is quite non-standard, compared to puppetdb, just to make 
> > sure, did you do the initial bootstrap as described in the README?
> > 
> actually I did not bootstrapped it.
> After bootstrap it fails with a slightly different error (no such file
> to load -- facter).
> 
this diff fixes the issue.
 Thanks
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/sysutils/ruby-facter/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- Makefile22 Jan 2023 19:21:56 -  1.92
+++ Makefile11 Feb 2023 10:34:05 -
@@ -1,7 +1,6 @@
 COMMENT =  Puppet module management
 
-DISTNAME = facter-4.2.14
-REVISION = 0
+DISTNAME = facter-4.3.0
 CATEGORIES =   sysutils
 HOMEPAGE = https://github.com/puppetlabs/facter
 MAINTAINER =   Sebastian Reitenbach 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ruby-facter/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo22 Jan 2023 15:42:43 -  1.30
+++ distinfo11 Feb 2023 10:34:05 -
@@ -1,2 +1,2 @@
-SHA256 (facter-4.2.14.gem) = nee+3CaHwnSVo0YRrzc0CB6VkXYVYPQNr7s17Zvefbs=
-SIZE (facter-4.2.14.gem) = 159232
+SHA256 (facter-4.3.0.gem) = 0kWX0P3GqSGcsW9X9xUSzZchlhF3XiSGi9MJdbBsrSw=
+SIZE (facter-4.3.0.gem) = 159232

Re: NEW: databases/puppetdb and sysutils/puppetserver 7.X

[Giovanni Bechis]

On Sat, Feb 11, 2023 at 12:01:27AM +0100, Sebastian Reitenbach wrote:
> On Thursday, February 09, 2023 14:51 CET, Giovanni Bechis 
>  wrote:
> 
> > On 1/30/23 21:42, Sebastian Reitenbach wrote:
> > > Hi,
> > >
> > > with Puppet 5 now replaced by Puppet 7, the ability to run a Puppet 
> > > master on OpenBSD was gone.
> > > These two new packages replace the old PuppetDB 5, with PuppetDB 7 and 
> > > introduces the new Puppetserver.
> > >
> > > Similarly to systuls/ruby-puppet, they go into branches based on the 
> > > major version, to have future room for Puppet 8.
> > > Their paths where software gets installed is aligned to Puppet, under 
> > > /var/puppetlabs/... /usr/local/share/puppetlabs/... etc.
> > >
> > > Puppetserver usually comes bundled with a Ruby interpreter and Puppet 
> > > agent. That doesn't work out
> > > on OpenBSD. Therefore some bootstrapping has to be done manually that is 
> > > OpenBSD specific, and noted
> > > in the Puppetserver pkg/README.
> > >
> > >   A couple of tweaks I had to do to my hiera files, as well as to some of 
> > > the modules, mostly updating
> > > them. Overall, the changes weren't that big. As everyone might have 
> > > different (custom) modules or
> > > hiera plugins in use, ymmv. Therefore I can't really provide a step by 
> > > step upgrade path. Install on a test
> > > environment before attempting to upgrade/replace your former Puppet 5 
> > > Master.
> > > That said, Puppet 7 works for me standalone with puppet apply ... but 
> > > also against this Puppetserver with PuppetDB backend, autosigning setup...
> > >
> > > comments to the ports, test reports, or maybe even OKs welcome ;)
> > >
> > > cheers,
> > > Sebastian
> > 
> 
> thanks for testing.
> > Few issues:
> > - puppetdb is missing pkg/README file in the tarball
> This is missing on purpose, forgot to remove that, as I did last-minute 
> clean-ups before sending out the tarball.
> Puppetdb is quite standard, so the upstream doc should more or less just 
> work. Also the old puppetdb 5 README
> contained quite some outdated/misleading info
> If there turns to be out some OpenBSD specific issues, I'm happy to re-add.
> 
> > - puppetserver doesn't create /var/log/puppetlabs/puppetserver directory
> oops
> 
> > - puppetserver doesn't start on my server log file attached, it seems there 
> > is a dependency missing (no such file to load...).
> puppetserver is quite non-standard, compared to puppetdb, just to make sure, 
> did you do the initial bootstrap as described in the README?
> 
actually I did not bootstrapped it.
After bootstrap it fails with a slightly different error (no such file
to load -- facter).


> 
> > New package doesn't upgrade from puppet5, a pkg_path is missing I think.
> not sure if that should. as puppetserver is now "extra", and before, it was 
> just a single package conaining client and master.
> 
makes sense, we should add some info to upgrade.html then.

 Thanks
  Giovanni

> Sebastian
> 
> > 
> >   Cheers
> > 
> >   Giovanni
> 
2023-02-11T11:00:43.864+01:00 INFO  [main] [o.e.j.u.log] Logging initialized 
@7581ms to org.eclipse.jetty.util.log.Slf4jLog
2023-02-11T11:00:46.148+01:00 INFO  [async-dispatch-2] 
[p.t.s.s.scheduler-service] Initializing Scheduler Service
2023-02-11T11:00:46.191+01:00 INFO  [async-dispatch-2] 
[o.q.i.StdSchedulerFactory] Using default implementation for ThreadExecutor
2023-02-11T11:00:46.208+01:00 INFO  [async-dispatch-2] 
[o.q.c.SchedulerSignalerImpl] Initialized Scheduler Signaller of type: class 
org.quartz.core.SchedulerSignalerImpl
2023-02-11T11:00:46.208+01:00 INFO  [async-dispatch-2] [o.q.c.QuartzScheduler] 
Quartz Scheduler v.2.3.2 created.
2023-02-11T11:00:46.210+01:00 INFO  [async-dispatch-2] [o.q.s.RAMJobStore] 
RAMJobStore initialized.
2023-02-11T11:00:46.210+01:00 INFO  [async-dispatch-2] [o.q.c.QuartzScheduler] 
Scheduler meta-data: Quartz Scheduler (v2.3.2) 
'a5bac081-c72e-4658-90a6-b4afbc9df9a7' with instanceId 'NON_CLUSTERED'
  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
  NOT STARTED.
  Currently in standby mode.
  Number of jobs executed: 0
  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
  Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support 
persistence. and is not clustered.

2023-02-11T11:00:46.211+01:00 INFO  [async-dispatch-2] 
[o.q.i.StdSchedulerFactory] Quartz scheduler 
'a5bac081-c72e-4658-90a6-b4afbc9df9a7' i

Re: NEW: databases/puppetdb and sysutils/puppetserver 7.X

[Giovanni Bechis]

On 1/30/23 21:42, Sebastian Reitenbach wrote:

Hi,

with Puppet 5 now replaced by Puppet 7, the ability to run a Puppet master on 
OpenBSD was gone.
These two new packages replace the old PuppetDB 5, with PuppetDB 7 and 
introduces the new Puppetserver.

Similarly to systuls/ruby-puppet, they go into branches based on the major 
version, to have future room for Puppet 8.
Their paths where software gets installed is aligned to Puppet, under 
/var/puppetlabs/... /usr/local/share/puppetlabs/... etc.

Puppetserver usually comes bundled with a Ruby interpreter and Puppet agent. 
That doesn't work out
on OpenBSD. Therefore some bootstrapping has to be done manually that is 
OpenBSD specific, and noted
in the Puppetserver pkg/README.

  A couple of tweaks I had to do to my hiera files, as well as to some of the 
modules, mostly updating
them. Overall, the changes weren't that big. As everyone might have different 
(custom) modules or
hiera plugins in use, ymmv. Therefore I can't really provide a step by step 
upgrade path. Install on a test
environment before attempting to upgrade/replace your former Puppet 5 Master.
That said, Puppet 7 works for me standalone with puppet apply ... but also 
against this Puppetserver with PuppetDB backend, autosigning setup...

comments to the ports, test reports, or maybe even OKs welcome ;)

cheers,
Sebastian


Few issues:
- puppetdb is missing pkg/README file in the tarball
- puppetserver doesn't create /var/log/puppetlabs/puppetserver directory
- puppetserver doesn't start on my server log file attached, it seems there is 
a dependency missing (no such file to load...).
New package doesn't upgrade from puppet5, a pkg_path is missing I think.

 Cheers

 Giovanni
OpenBSD 7.2-current (GENERIC.MP) #1026: Wed Feb  8 22:50:35 MST 2023
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 2129526784 (2030MB)
avail mem = 2045648896 (1950MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xe0010 (242 entries)
bios0: vendor Phoenix Technologies LTD version "6.00" date 11/12/2020
bios0: VMware, Inc. VMware Virtual Platform
acpi0 at bios0: ACPI 4.0
acpi0: sleep states S0 S1 S4 S5
acpi0: tables DSDT FACP BOOT APIC MCFG SRAT HPET WAET
acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S8F0(S3) S16F(S3) S17F(S3) S18F(S3) S22F(S3) S23F(S3) S24F(S3) S25F(S3) PE40(S3) S1F0(S3) PE50(S3) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.72 MHz, 06-3a-00
cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,MELTDOWN
cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 8-way L2 cache, 35MB 64b/line 20-way L3 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 66MHz
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.61 MHz, 06-3a-00
cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,MELTDOWN
cpu1: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 8-way L2 cache, 35MB 64b/line 20-way L3 cache
cpu1: smt 0, core 0, package 2
ioapic0 at mainbus0: apid 1 pa 0xfec0, version 11, 24 pins
acpimcfg0 at acpi0
acpimcfg0: addr 0xf000, bus 0-127
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpipci0 at acpi0 PCI0: 0x 0x0011 0x0001
acpicmos0 at acpi0
"PNP0A05" at acpi0 not configured
acpiac0 at acpi0: AC unit online
acpicpu0 at acpi0: C1(@1 halt!)
acpicpu1 at acpi0: C1(@1 halt!)
cpu0: using VERW MDS workaround
pvbus0 at mainbus0: VMware
vmt0 at pvbus0
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel 82443BX AGP" rev 0x01
ppb0 at pci0 dev 1 function 0 "Intel 82443BX AGP" rev 0x01
pci1 at ppb0 bus 1
pcib0 at pci0 dev 7 function 0 "Intel 82371AB PIIX4 ISA" rev 0x08
pciide0 at pci0 dev 7 function 1 "Intel 82371AB IDE" rev 0x01: DMA, channel 0 configured to compatibility, channel 1 configured to compatibility
pciide0: channel 0 disabled (no drives)
atapiscsi0 at pciide0 channel 1 drive 0
scsibus1 at atapiscsi0: 2 targets
cd0 at scsibus1 targ 0 lun 0:  removable
cd0(pciide0:1:0): using PIO mode 4, Ultra-DMA mode 2
piixpm0 at pci0 dev 7 function 3 "Intel 82371AB Power" rev 0x08: SMBus disabled
"VMware VMCI" rev 0x10 at pci0 dev 7 funct

Puppet master status [was: Re: CVS: cvs.openbsd.org: ports]

[Giovanni Bechis]

On Fri, Jan 20, 2023 at 08:59:35PM +, Sebastian Reitenbach wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   sebas...@cvs.openbsd.org2023/01/20 13:59:35
> 
> Removed files:
>   sysutils/ruby-puppet/5: Makefile distinfo 
>   sysutils/ruby-puppet/5/patches: patch-ext_rack_config_ru 
>   patch-install_rb 
>   patch-lib_puppet_defaults_rb 
>   
> patch-lib_puppet_file_system_file_impl_rb 
>   patch-lib_puppet_gettext_config_rb 
>   
> patch-lib_puppet_provider_package_gem_rb 
>   
> patch-lib_puppet_provider_package_openbsd_rb 
>   
> patch-lib_puppet_provider_package_pip3_rb 
>   
> patch-lib_puppet_provider_package_pip_rb 
>   
> patch-lib_puppet_provider_service_openbsd_rb 
>   
> patch-lib_puppet_reference_configuration_rb 
>   patch-lib_puppet_util_run_mode_rb 
>   sysutils/ruby-puppet/5/pkg: PLIST 
> 
> Log message:
> bye bye puppet 5
> 
> OK jeremy@
is puppetmaster definitely gone ?
this will need an upgrade.html entry at least.
 Cheers
  Giovanni


signature.asc
Description: PGP signature

Re: UPDATE: www/apache-httpd

[Giovanni Bechis]

On Wed, Jan 18, 2023 at 09:12:41AM +0100, Giovanni Bechis wrote:
> Hi,
> update to 2.4.55, fixes CVE-2022-37436, CVE-2022-36760 and
> CVE-2006-20001.
>  ok for current and 7.2 ?
>   Cheers
>Giovanni
> 
second diff with a mod_http2 fix added.
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile15 Nov 2022 23:14:12 -  1.119
+++ Makefile19 Jan 2023 11:12:53 -
@@ -1,9 +1,8 @@
 COMMENT=   apache HTTP server
 
-V= 2.4.54
+V= 2.4.55
 DISTNAME=  httpd-${V}
 PKGNAME=   apache-httpd-${V}
-REVISION=  0
 
 CATEGORIES=www net
 
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo9 Jun 2022 07:05:50 -   1.42
+++ distinfo19 Jan 2023 11:12:53 -
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.54.tar.gz) = xoe5nERsDvNF59hsIajhX8B0t9UVLE/iKwRj4r40b/s=
-SIZE (httpd-2.4.54.tar.gz) = 9743277
+SHA256 (httpd-2.4.55.tar.gz) = Unbqi8b/8x7tXIITKuUaCy7gX55rYaAPqHf2ytqztjg=
+SIZE (httpd-2.4.55.tar.gz) = 975
Index: patches/patch-configure
===
RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
retrieving revision 1.24
diff -u -p -r1.24 patch-configure
--- patches/patch-configure 15 Nov 2022 23:14:12 -  1.24
+++ patches/patch-configure 19 Jan 2023 11:12:53 -
@@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -3472,7 +3472,7 @@ do
+@@ -3832,7 +3832,7 @@ do
ap_last="${ap_cur}"
ap_cur=`eval "echo ${ap_cur}"`
  done
@@ -10,12 +10,12 @@ Index: configure
  
  
APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
-@@ -4678,7 +4678,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
+@@ -5059,7 +5059,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
  APR_INCLUDES=`$apr_config --includes`
  APR_VERSION=`$apr_config --version`
  apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
 -APR_CONFIG="$APR_BINDIR/apr-${apr_major_version}-config"
 +APR_CONFIG="$apr_config"
  
- { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
- $as_echo "$as_me: " >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: " >&5
+ printf "%s\n" "$as_me: " >&6;}
Index: patches/patch-modules_http2_h2_c2_filter_c
===
RCS file: patches/patch-modules_http2_h2_c2_filter_c
diff -N patches/patch-modules_http2_h2_c2_filter_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-modules_http2_h2_c2_filter_c  19 Jan 2023 11:12:53 -
@@ -0,0 +1,12 @@
+Index: modules/http2/h2_c2_filter.c
+--- modules/http2/h2_c2_filter.c.orig
 modules/http2/h2_c2_filter.c
+@@ -615,7 +615,7 @@ apr_status_t h2_c2_filter_catch_h1_out(ap_filter_t* f,
+ ap_assert(conn_ctx);
+ H2_FILTER_LOG("c2_catch_h1_out", f->c, APLOG_TRACE2, 0, "check", bb);
+ 
+-if (!conn_ctx->has_final_response) {
++if (!f->c->aborted && !conn_ctx->has_final_response) {
+ if (!parser) {
+ parser = apr_pcalloc(f->c->pool, sizeof(*parser));
+ parser->id = apr_psprintf(f->c->pool, "%s-%d", conn_ctx->id, 
conn_ctx->stream_id);
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/apache-httpd/pkg/PLIST,v
retrieving revision 1.36
diff -u -p -r1.36 PLIST
--- pkg/PLIST   11 Mar 2022 20:09:38 -  1.36
+++ pkg/PLIST   19 Jan 2023 11:12:53 -
@@ -47,6 +47,7 @@ include/apache2/mod_cgi.h
 include/apache2/mod_core.h
 include/apache2/mod_dav.h
 include/apache2/mod_dbd.h
+include/apache2/mod_http2.h
 include/apache2/mod_include.h
 include/apache2/mod_log_config.h
 include/apache2/mod_proxy.h


signature.asc
Description: PGP signature

Re: NEW: mail/opensmtpd-filters/mimedefang

[Giovanni Bechis]

On Wed, Jan 18, 2023 at 09:18:18AM +0100, Giovanni Bechis wrote:
> Hi,
> attached an opensmtpd filter to be able to use MIMEDefang with smtpd(8).
>  Ok ?
>   Cheers
>Giovanni
> 
Correct diff follows:

Index: Makefile
===
RCS file: /cvs/ports/mail/opensmtpd-filters/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile11 Mar 2022 19:34:44 -  1.6
+++ Makefile18 Jan 2023 14:18:46 -
@@ -4,6 +4,7 @@ SUBDIR += dkimsign
 SUBDIR += dkimsign,ed25519
 SUBDIR += dnsbl
 SUBDIR += libopensmtpd
+SUBDIR += mimedefang
 SUBDIR += rspamd
 SUBDIR += senderscore
 SUBDIR += spamassassin
Index: mimedefang/Makefile
===
RCS file: mimedefang/Makefile
diff -N mimedefang/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mimedefang/Makefile 18 Jan 2023 14:18:46 -
@@ -0,0 +1,26 @@
+COMMENT=   MIMEDefang integration to the OpenSMTPD daemon
+
+V= 0.1
+FILTER_NAME =  mimedefang
+DISTNAME = ${FILTER_NAME}-smtpd-filter-${V}
+PKGNAME =  filter-${FILTER_NAME}-${V}
+
+CATEGORIES=mail
+HOMEPAGE=  https://mimedefang.org
+
+MAINTAINER=    Giovanni Bechis 
+
+MASTER_SITES=   ${HOMEPAGE}/releases/opensmtpd/
+INSTALL_TARGET=build install
+
+WRKDIST=   ${WRKDIR}/${PKGNAME}
+
+RUN_DEPENDS=   mail/mimedefang \
+   mail/p5-OpenSMTPd-Filter
+
+# MIT
+PERMIT_PACKAGE=Yes
+
+NO_TEST=   Yes
+
+.include 
Index: mimedefang/distinfo
===
RCS file: mimedefang/distinfo
diff -N mimedefang/distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mimedefang/distinfo 18 Jan 2023 14:18:46 -
@@ -0,0 +1,2 @@
+SHA256 (mimedefang-smtpd-filter-0.1.tar.gz) = 
UXZlyxDojrEJzZGbA9qQLnHAQTcOFENGB8Rc9GZaBxU=
+SIZE (mimedefang-smtpd-filter-0.1.tar.gz) = 6825
Index: mimedefang/pkg/DESCR
===
RCS file: mimedefang/pkg/DESCR
diff -N mimedefang/pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mimedefang/pkg/DESCR18 Jan 2023 14:18:46 -
@@ -0,0 +1 @@
+filter-mimedefang is an opensmtpd filter that integrates MIMEDefang with 
OpenSMTPD.
Index: mimedefang/pkg/PLIST
===
RCS file: mimedefang/pkg/PLIST
diff -N mimedefang/pkg/PLIST
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mimedefang/pkg/PLIST18 Jan 2023 14:18:46 -
@@ -0,0 +1,3 @@
+libexec/smtpd/
+libexec/smtpd/filter-mimedefang.pl
+@man man/man8/filter-mimedefang.8


signature.asc
Description: PGP signature

UPDATE: mail/mimedefang

[Giovanni Bechis]

Hi,
bugfix update to 3.3 version.
 Ok ?
  Cheers
   Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- Makefile24 Oct 2022 16:29:22 -  1.61
+++ Makefile18 Jan 2023 07:52:28 -
@@ -1,6 +1,6 @@
 COMMENT=   mailfilter to identify and mark spam
 
-DISTNAME=  mimedefang-3.2
+DISTNAME=  mimedefang-3.3
 
 CATEGORIES=mail
 
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo24 Oct 2022 16:29:22 -  1.24
+++ distinfo18 Jan 2023 07:52:28 -
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-3.2.tar.gz) = 7Rgn2ZCVe0EyUtUo7Q0JxjeBRt9WlTkKyD3B59vZpKY=
-SIZE (mimedefang-3.2.tar.gz) = 494702
+SHA256 (mimedefang-3.3.tar.gz) = r5CeLDt3eDG+mJ+erw05WoWvnVS0pp6Qa7x+Kqu9E00=
+SIZE (mimedefang-3.3.tar.gz) = 495544


signature.asc
Description: PGP signature

NEW: mail/opensmtpd-filters/mimedefang

[Giovanni Bechis]

Hi,
attached an opensmtpd filter to be able to use MIMEDefang with smtpd(8).
 Ok ?
  Cheers
   Giovanni

Index: mimedefang/Makefile
===
RCS file: mimedefang/Makefile
diff -N mimedefang/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mimedefang/Makefile 28 Oct 2022 17:21:48 -
@@ -0,0 +1,23 @@
+COMMENT=   MIMEDefang integration to the OpenSMTPD daemon
+
+V= 0.1
+FILTER_NAME =  mimedefang
+DISTNAME = filter-${FILTER_NAME}-${V}
+
+CATEGORIES=mail
+HOMEPAGE=  https://mimedefang.org
+
+MAINTAINER=Giovanni Bechis 
+
+MASTER_SITES=   ${HOMEPAGE}/releases/
+INSTALL_TARGET=build install
+
+RUN_DEPENDS=   mail/mimedefang \
+   mail/p5-OpenSMTPd-Filter
+
+# MIT
+PERMIT_PACKAGE=Yes
+
+NO_TEST=   Yes
+
+.include 
Index: mimedefang/distinfo
===
RCS file: mimedefang/distinfo
diff -N mimedefang/distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mimedefang/distinfo 28 Oct 2022 17:21:48 -
@@ -0,0 +1,2 @@
+SHA256 (filter-mimedefang-0.1.tar.gz) = 
Om+yQOK6pxkm8Cu/IafUiiIcoDDksvKGJCzSmFXVh4M=
+SIZE (filter-mimedefang-0.1.tar.gz) = 3348
Index: mimedefang/pkg/DESCR
===
RCS file: mimedefang/pkg/DESCR
diff -N mimedefang/pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mimedefang/pkg/DESCR28 Oct 2022 17:21:48 -
@@ -0,0 +1 @@
+filter-mimedefang is an opensmtpd filter that integrates MIMEDefang with 
OpenSMTPD.
Index: mimedefang/pkg/PLIST
===
RCS file: mimedefang/pkg/PLIST
diff -N mimedefang/pkg/PLIST
--- /dev/null   1 Jan 1970 00:00:00 -
+++ mimedefang/pkg/PLIST28 Oct 2022 17:21:48 -
@@ -0,0 +1,3 @@
+libexec/smtpd/
+libexec/smtpd/filter-mimedefang.pl
+@man man/man8/filter-mimedefang.8


signature.asc
Description: PGP signature

UPDATE: www/apache-httpd

[Giovanni Bechis]

Hi,
update to 2.4.55, fixes CVE-2022-37436, CVE-2022-36760 and
CVE-2006-20001.
 ok for current and 7.2 ?
  Cheers
   Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile15 Nov 2022 23:14:12 -  1.119
+++ Makefile18 Jan 2023 07:50:34 -
@@ -1,9 +1,8 @@
 COMMENT=   apache HTTP server
 
-V= 2.4.54
+V= 2.4.55
 DISTNAME=  httpd-${V}
 PKGNAME=   apache-httpd-${V}
-REVISION=  0
 
 CATEGORIES=www net
 
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo9 Jun 2022 07:05:50 -   1.42
+++ distinfo18 Jan 2023 07:50:34 -
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.54.tar.gz) = xoe5nERsDvNF59hsIajhX8B0t9UVLE/iKwRj4r40b/s=
-SIZE (httpd-2.4.54.tar.gz) = 9743277
+SHA256 (httpd-2.4.55.tar.gz) = Unbqi8b/8x7tXIITKuUaCy7gX55rYaAPqHf2ytqztjg=
+SIZE (httpd-2.4.55.tar.gz) = 975
Index: patches/patch-configure
===
RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
retrieving revision 1.24
diff -u -p -r1.24 patch-configure
--- patches/patch-configure 15 Nov 2022 23:14:12 -  1.24
+++ patches/patch-configure 18 Jan 2023 07:50:34 -
@@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -3472,7 +3472,7 @@ do
+@@ -3832,7 +3832,7 @@ do
ap_last="${ap_cur}"
ap_cur=`eval "echo ${ap_cur}"`
  done
@@ -10,12 +10,12 @@ Index: configure
  
  
APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
-@@ -4678,7 +4678,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
+@@ -5059,7 +5059,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
  APR_INCLUDES=`$apr_config --includes`
  APR_VERSION=`$apr_config --version`
  apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
 -APR_CONFIG="$APR_BINDIR/apr-${apr_major_version}-config"
 +APR_CONFIG="$apr_config"
  
- { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
- $as_echo "$as_me: " >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: " >&5
+ printf "%s\n" "$as_me: " >&6;}
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/apache-httpd/pkg/PLIST,v
retrieving revision 1.36
diff -u -p -r1.36 PLIST
--- pkg/PLIST   11 Mar 2022 20:09:38 -  1.36
+++ pkg/PLIST   18 Jan 2023 07:50:34 -
@@ -47,6 +47,7 @@ include/apache2/mod_cgi.h
 include/apache2/mod_core.h
 include/apache2/mod_dav.h
 include/apache2/mod_dbd.h
+include/apache2/mod_http2.h
 include/apache2/mod_include.h
 include/apache2/mod_log_config.h
 include/apache2/mod_proxy.h


signature.asc
Description: PGP signature

UPDATE: mail/p5-Mail-SpamAssassin

[Giovanni Bechis]

Hi,
major update to 4.0.0.
Lot of improvements and new features, more info at
https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_4_0_0/UPGRADE.

Comments ? Ok ?

 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile8 Nov 2022 11:14:50 -   1.119
+++ Makefile20 Dec 2022 07:23:44 -
@@ -1,11 +1,10 @@
 COMMENT=   mailfilter to identify and mark spam
 
-VER=   3.4.6
+VER=   4.0.0
 DISTNAME=  Mail-SpamAssassin-${VER}
 PKGNAME=   p5-${DISTNAME}
-RULESNAME= Mail-SpamAssassin-rules-${VER}.r1888502.tgz
+RULESNAME= Mail-SpamAssassin-rules-${VER}.r1905950.tgz
 CATEGORIES=mail perl5
-REVISION=  0
 
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
 EXTRACT_SUFX=  .tar.bz2
@@ -24,6 +23,8 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=spa
 
 COMMON_DEPENDS=www/p5-HTML-Parser>=3.31 \
mail/p5-Mail-DKIM>=0.31 \
+   mail/p5-Email-Address-XS \
+   mail/p5-Mail-DMARC \
net/p5-Net-DNS>=0.34 \
net/p5-NetAddr-IP \
security/p5-IO-Socket-SSL
@@ -36,7 +37,7 @@ RUN_DEPENDS=  ${COMMON_DEPENDS} \
devel/p5-IO-String \
p5-Mail-SPF-*|p5-Mail-SPF-Query-*:mail/p5-Mail-SPF \

p5-GeoIP2-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-GeoIP2 \
-   net/p5-Net-LibIDN \
+   net/p5-Net-LibIDN2 \
net/p5-Net-Patricia \
security/gnupg \
textproc/p5-Encode-Detect \
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
retrieving revision 1.43
diff -u -p -r1.43 distinfo
--- distinfo30 Apr 2021 14:43:48 -  1.43
+++ distinfo20 Dec 2022 07:23:44 -
@@ -1,4 +1,4 @@
-SHA256 (Mail-SpamAssassin-3.4.6.tar.bz2) = 
vEh18+S7WXnwwQKDITpRLEyWRiIK4BMqeMjjr5R4lhA=
-SHA256 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 
se/NxX5rEAc1hV4k7oORsIVzJ9cOHh0sJ1fV9m6KHOY=
-SIZE (Mail-SpamAssassin-3.4.6.tar.bz2) = 6166807
-SIZE (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 369768
+SHA256 (Mail-SpamAssassin-4.0.0.tar.bz2) = 
5aoXBQowvHK6qGr9xgSMrepNHsLsxh14dxegWbgxnog=
+SHA256 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 
rk/7uRfrx/76ckD8W7UVHdpmP45AWRYa18m0Lu0brG0=
+SIZE (Mail-SpamAssassin-4.0.0.tar.bz2) = 6371055
+SIZE (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 355737
Index: patches/patch-Makefile_PL
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v
retrieving revision 1.16
diff -u -p -r1.16 patch-Makefile_PL
--- patches/patch-Makefile_PL   11 Mar 2022 19:34:50 -  1.16
+++ patches/patch-Makefile_PL   20 Dec 2022 07:23:44 -
@@ -1,7 +1,7 @@
 Index: Makefile.PL
 --- Makefile.PL.orig
 +++ Makefile.PL
-@@ -857,7 +857,7 @@ sub MY::install {
+@@ -886,7 +886,7 @@ sub MY::install {
  
foreach (@code) {
  # Add our install targets as a dependency to all top-level install targets
Index: patches/patch-t_sa_compile_t
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-t_sa_compile_t,v
retrieving revision 1.5
diff -u -p -r1.5 patch-t_sa_compile_t
--- patches/patch-t_sa_compile_t11 Mar 2022 19:34:50 -  1.5
+++ patches/patch-t_sa_compile_t20 Dec 2022 07:23:44 -
@@ -1,9 +1,9 @@
 Index: t/sa_compile.t
 --- t/sa_compile.t.orig
 +++ t/sa_compile.t
-@@ -12,8 +12,7 @@ use Config;
- use File::Basename;
- use File::Path qw/mkpath/;
+@@ -10,8 +10,7 @@ use SATest; sa_t_init("sa_compile");
+ 
+ use Config;
  
 -my $temp_binpath = $Config{sitebinexp};
 -$temp_binpath =~ s|^\Q$Config{siteprefixexp}\E/||;
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v
retrieving revision 1.41
diff -u -p -r1.41 PLIST
--- pkg/PLIST   8 Nov 2022 11:14:51 -   1.41
+++ pkg/PLIST   20 Dec 2022 07:23:44 -
@@ -21,7 +21,7 @@ ${P5SITE}/Mail/SpamAssassin.pm
 ${P5SITE}/Mail/SpamAssassin/AICache.pm
 ${P5SITE}/Mail/SpamAssassin/ArchiveIterator.pm
 ${P5SITE}/Mail/SpamAssassin/AsyncLoop.pm
-${P5SITE}/Mail/SpamAssassin/AutoWhitelist.pm
+${P5SITE}/Mail/SpamAssassin/AutoWelcomelist.pm
 ${P5SITE}/Mail/SpamAssassin/Bayes/
 ${P5SITE}/Mail/SpamAssassin/Bayes.pm
 ${P5SITE}/Mail/SpamAssassin/Bayes/CombineChi.pm
@@ -45,6 +45,7 @@ ${P5SITE}/Mail/SpamAssassin/Constants.pm
 ${P5SITE}/Mail/SpamAssassin/DBBasedAddrList.pm
 ${P5SITE}/Ma

Re: sysutils/rdiff-backup: update or remove ?

[Giovanni Bechis]

On Mon, Dec 05, 2022 at 11:25:15AM +, Stuart Henderson wrote:
> On 2022/12/05 12:01, Giovanni Bechis wrote:
> > On Sat, Dec 03, 2022 at 07:30:55PM +, Klemens Nanni wrote:
> > > Last port update is from 2010, i consider this port unmaintained despite
> > > the variable being set.
> > > 
> > > python 2, but upstream is super active (last beta is a few hours old)
> > > with python 3 support and a stable version of 2.0.5.
> > > 
> > > Does anyone use this port and cares to update it?
> > > It shouldn't rot away on py2 life support^W^W...
> > I am using it, update to 2.0.5 follows.
> 
> Joshua Megerman sent a diff back in May for this, which I tweaked and
> sent back, no response from maintainer (and I forgot it was in-flight
> and didn't get round to committing it).
> 
> It would be really helpful if people would drop maintainer on ports
> which they aren't realistically going to maintain.
> 
> > +lib/python${MODPY_VERSION}/site-packages/rdiff_backup-0.0.0.dist-info/
> 
> This should use the pypi "sdist" tarball, the version number doesn't end up
> set correctly when it's built from the GH autogenerated tar.
> 
> Here's an updated version of the earlier diffs. OK?
> 
sure, ok giovanni@, thanks.
 Giovanni


> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/rdiff-backup/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile  11 Mar 2022 19:57:55 -  1.24
> +++ Makefile  5 Dec 2022 11:20:28 -
> @@ -1,26 +1,27 @@
> -COMMENT =incremental backup
> +COMMENT =incremental backup
>  
> -MODPY_EGG_VERSION =  1.2.8
> +MODPY_EGG_VERSION =  2.0.5
>  DISTNAME =   rdiff-backup-${MODPY_EGG_VERSION}
> -REVISION =   8
> +
>  CATEGORIES = sysutils
>  
> -HOMEPAGE =   http://www.nongnu.org/rdiff-backup/
> +HOMEPAGE =   https://rdiff-backup.net/
>  
> -MAINTAINER = Pierre-Emmanuel Andre 
> +MAINTAINER = Pierre-Emmanuel Andre 
>  
>  # GPLv2+
>  PERMIT_PACKAGE = Yes
>  
>  WANTLIB +=   rsync pthread ${MODPY_WANTLIB}
>  
> -LIB_DEPENDS +=   net/librsync
> -
> -MASTER_SITES =   ${MASTER_SITE_SAVANNAH:=rdiff-backup/}
> +LIB_DEPENDS +=   net/librsync
>  
> -MODULES  =   lang/python
> -MODPY_VERSION =  ${MODPY_DEFAULT_VERSION_2}
> +MODULES  =   lang/python
> +MODPY_PI =   Yes
> +MODPY_PYBUILD =  setuptools_scm
> +CFLAGS +=-I${LOCALBASE}/include
>  
> -NO_TEST =Yes
> +# tests are present but are intended to run via Tox in a Docker container
> +NO_TEST =Yes
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/rdiff-backup/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  18 Jan 2015 03:15:14 -  1.3
> +++ distinfo  5 Dec 2022 11:20:28 -
> @@ -1,2 +1,2 @@
> -SHA256 (rdiff-backup-1.2.8.tar.gz) = 
> DZGoW0CUkRb6iq8V2hZcNKLRVEmzy+AcgCY5ExCslds=
> -SIZE (rdiff-backup-1.2.8.tar.gz) = 196526
> +SHA256 (rdiff-backup-2.0.5.tar.gz) = 
> VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s=
> +SIZE (rdiff-backup-2.0.5.tar.gz) = 456089
> Index: patches/patch-_librsyncmodule_c
> ===
> RCS file: patches/patch-_librsyncmodule_c
> diff -N patches/patch-_librsyncmodule_c
> --- patches/patch-_librsyncmodule_c   11 Mar 2022 19:57:55 -  1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,22 +0,0 @@
> -Fix with librsync v1.0.0; similar to
> -https://bugs.launchpad.net/duplicity/+bug/1416344
> -
> -This uses the backwards-compatible format that uses the insecure
> -truncated MD4 hash.
> -
>  _librsyncmodule.c.orig   Wed Aug 19 20:33:42 2015
> -+++ _librsyncmodule.cWed Aug 19 20:34:42 2015
> -@@ -59,8 +59,13 @@ _librsync_new_sigmaker(PyObject* self, PyObject* args)
> -   if (sm == NULL) return NULL;
> -   sm->x_attr = NULL;
> - 
> -+#ifdef RS_DEFAULT_STRONG_LEN
> -   sm->sig_job = rs_sig_begin((size_t)blocklen,
> -  
> (size_t)RS_DEFAULT_STRONG_LEN);
> -+#else
> -+  sm->sig_job = rs_sig_begin((size_t)blocklen,
> -+ (size_t)8, 
> RS_MD4_SIG_MAGIC);
> -+#endif
> -   return (PyObject*)sm;
> - }
> - 
> Index: patches/patch-rdiff_backup_SetConnections_py
> ===
&g

Re: sysutils/rdiff-backup: update or remove ?

[Giovanni Bechis]

On Sat, Dec 03, 2022 at 07:30:55PM +, Klemens Nanni wrote:
> Last port update is from 2010, i consider this port unmaintained despite
> the variable being set.
> 
> python 2, but upstream is super active (last beta is a few hours old)
> with python 3 support and a stable version of 2.0.5.
> 
> Does anyone use this port and cares to update it?
> It shouldn't rot away on py2 life support^W^W...
I am using it, update to 2.0.5 follows.
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/sysutils/rdiff-backup/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile11 Mar 2022 19:57:55 -  1.24
+++ Makefile5 Dec 2022 10:54:34 -
@@ -1,12 +1,13 @@
 COMMENT =  incremental backup
 
-MODPY_EGG_VERSION =1.2.8
+MODPY_EGG_VERSION =2.0.5
+GH_ACCOUNT =   rdiff-backup
+GH_PROJECT =   rdiff-backup
+GH_TAGNAME =   v2.0.5
+
 DISTNAME = rdiff-backup-${MODPY_EGG_VERSION}
-REVISION = 8
 CATEGORIES =   sysutils
 
-HOMEPAGE = http://www.nongnu.org/rdiff-backup/
-
 MAINTAINER =   Pierre-Emmanuel Andre 
 
 # GPLv2+
@@ -16,10 +17,8 @@ WANTLIB +=   rsync pthread ${MODPY_WANTLI
 
 LIB_DEPENDS += net/librsync
 
-MASTER_SITES = ${MASTER_SITE_SAVANNAH:=rdiff-backup/}
-
 MODULES=   lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
+MODPY_PYBUILD =setuptools_scm
 
 NO_TEST =  Yes
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rdiff-backup/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Jan 2015 03:15:14 -  1.3
+++ distinfo5 Dec 2022 10:54:34 -
@@ -1,2 +1,2 @@
-SHA256 (rdiff-backup-1.2.8.tar.gz) = 
DZGoW0CUkRb6iq8V2hZcNKLRVEmzy+AcgCY5ExCslds=
-SIZE (rdiff-backup-1.2.8.tar.gz) = 196526
+SHA256 (rdiff-backup-2.0.5.tar.gz) = 
/Trz05/pHvKygeapBkRREsW3GGQOSQyLb4OolgMYNSs=
+SIZE (rdiff-backup-2.0.5.tar.gz) = 441475
Index: patches/patch-_librsyncmodule_c
===
RCS file: patches/patch-_librsyncmodule_c
diff -N patches/patch-_librsyncmodule_c
--- patches/patch-_librsyncmodule_c 11 Mar 2022 19:57:55 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,22 +0,0 @@
-Fix with librsync v1.0.0; similar to
-https://bugs.launchpad.net/duplicity/+bug/1416344
-
-This uses the backwards-compatible format that uses the insecure
-truncated MD4 hash.
-
 _librsyncmodule.c.orig Wed Aug 19 20:33:42 2015
-+++ _librsyncmodule.c  Wed Aug 19 20:34:42 2015
-@@ -59,8 +59,13 @@ _librsync_new_sigmaker(PyObject* self, PyObject* args)
-   if (sm == NULL) return NULL;
-   sm->x_attr = NULL;
- 
-+#ifdef RS_DEFAULT_STRONG_LEN
-   sm->sig_job = rs_sig_begin((size_t)blocklen,
-
(size_t)RS_DEFAULT_STRONG_LEN);
-+#else
-+  sm->sig_job = rs_sig_begin((size_t)blocklen,
-+   (size_t)8, 
RS_MD4_SIG_MAGIC);
-+#endif
-   return (PyObject*)sm;
- }
- 
Index: patches/patch-rdiff_backup_SetConnections_py
===
RCS file: patches/patch-rdiff_backup_SetConnections_py
diff -N patches/patch-rdiff_backup_SetConnections_py
--- patches/patch-rdiff_backup_SetConnections_py11 Mar 2022 19:57:55 
-  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-Bugfix: DeprecationWarning: os.popen2 is deprecated
-cf http://bugs.gentoo.org/attachment.cgi?id=216585&action=view
-
 rdiff_backup/SetConnections.py.origMon Mar 16 14:36:21 2009
-+++ rdiff_backup/SetConnections.py Wed Aug 19 20:31:28 2015
-@@ -135,10 +135,10 @@ def init_connection(remote_cmd):
-   if not remote_cmd: return Globals.local_connection
- 
-   Log("Executing " + remote_cmd, 4)
--  if os.name == "nt":
-+  if map(int, sys.version.split()[0].split('.')[:2]) >= [2, 6]:
-   import subprocess
-   try:
--  process = subprocess.Popen(remote_cmd, shell=False, 
bufsize=0,
-+  process = subprocess.Popen(remote_cmd, shell=True, 
bufsize=0,
-   
stdin=subprocess.PIPE, 
-   
stdout=subprocess.PIPE)
-   (stdin, stdout) = (process.stdin, process.stdout)
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/sysutils/rdiff-backup/patches/patch-setup_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-setup_py
--- patches/patch-setup_py  11 Mar 2022 19:57:55 -  1.4
+++ patches/patch-setup_py  5 Dec 2022 10:54:34 -
@@ -1,34 +1,56 @@
 setup.py.orig  Mon Mar 16 15:36:21 2009
-+++ setup.py   Thu Feb 11 14:29:01 2010
-@@ -

Re: mail/opensmtpd-extras: update or remove -python package?

[Giovanni Bechis]

On 12/3/22 20:11, Klemens Nanni wrote:

There is 6.8.0 available but the -extras distfile is stuck at 6.7.1.

The python code over at https://github.com/OpenSMTPD/OpenSMTPD-extras
is at least six years old according to git...


according to git latest release is 6.7.1


Is anyone still using old python 2 bindings and/or do they still work
with current smtpd?

Anyone interested in porting them to python 3 or can we remove them?


I am not using python bindings at all.
 Cheers
  Giovanni



---
Information for 
https://cdn.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/opensmtpd-extras-python-6.7.1v0.tgz

Comment:
extras with python bindings for smtpd

Description:
Extras with Python bindings for OpenSMTPD.

Maintainer: Giovanni Bechis ,  Joerg Jung 


WWW: https://www.opensmtpd.org/

Re: some issues with sogo 5.7.1 in 7.2

[Giovanni Bechis]

On Mon, Nov 28, 2022 at 02:57:07PM +0100, Landry Breuil wrote:
> Hi,
> 
> finally upgraded my work sogo instance, hit two distinct issues
> unrelated to the WOPort one, both seen when trying to login:
> 
> [GCSSessionsFolder
> writeRecordForEntryWithID:value:creationDate:lastSeenDate:]: cannot
> write record: 
> NAME:PostgreSQL72FatalError REASON:fatal pgsql error
> (channel=<0x0x31374da1608[PostgreSQL72Channel]:
> connection=<0x0x3135d728468[PGConnection]:
> connection=0x0x313651c3800>>): ERROR:  value too long for type character
> varying(255)
> 
> found https://bugs.sogo.nu/view.php?id=5491 - from what i can see,
> https://github.com/Alinto/sogo/blob/master/Scripts/sql-update-5.5.1_to_5.6.0.sh
> isnt packaged in /usr/local/share/doc/sogo/. Maybe the PLIST should be
> updated ? anyway, solved it locally with psql:
> 
> sogo=> ALTER TABLE sogo_sessions_folder  ALTER COLUMN c_value TYPE
> VARCHAR(4096);
> 
> but also 'upstream sent too big header while reading response header
> from upstream' in nginx error logs, cf 
> https://www.sogo.nu/support/faq/errors-in-nginx-regarding-header-too-big.html#/faq
> 
> i already had some proxy buffers config in nginx (coming from the
> pkg-readme), had to bump them and could login just fine.
> 
> so .. maybe also update the pkg-readme with the values recommended
> upstream ?
> 
this diff works for me with Mariadb (nginx part untested).
ok ? What about 7.2 ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
--- Makefile8 Nov 2022 11:17:20 -   1.102
+++ Makefile29 Nov 2022 23:35:11 -
@@ -1,7 +1,7 @@
 COMMENT =  web based groupware server
 
 VERSION =  5.7.1
-REVISION = 1
+REVISION = 2
 DISTNAME = SOGo-${VERSION}
 PKGNAME =  sogo-${VERSION}
 
@@ -52,7 +52,7 @@ SUBST_VARS += SOGOLIBDIR VARBASE
 SCRIPTS =  cas-proxy-validate.py sql-update-2.2.17_to_2.3.0.sh \
sql-update-3.2.10_to_4.0.0.sh 
sql-update-2.2.17_to_2.3.0-mysql.sh \
sql-update-3.2.10_to_4.0.0-mysql.sh 
sql-update-3.0.0-to-combined.sh \
-   sql-update-3.0.0-to-combined-mysql.sh updates.php
+   sql-update-3.0.0-to-combined-mysql.sh 
sql-update-5.5.1_to_5.6.0.sh updates.php
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sogo
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.54
diff -u -p -r1.54 PLIST
--- pkg/PLIST   8 Nov 2022 11:17:20 -   1.54
+++ pkg/PLIST   29 Nov 2022 23:35:11 -
@@ -2875,6 +2875,7 @@ share/doc/sogo/sql-update-3.0.0-to-combi
 share/doc/sogo/sql-update-3.0.0-to-combined.sh
 share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
 share/doc/sogo/sql-update-3.2.10_to_4.0.0.sh
+share/doc/sogo/sql-update-5.5.1_to_5.6.0.sh
 share/doc/sogo/updates.php
 share/examples/login.conf.d/sogod
 @sample ${SYSCONFDIR}/login.conf.d/sogod
Index: pkg/README
===
RCS file: /cvs/ports/www/sogo/pkg/README,v
retrieving revision 1.25
diff -u -p -r1.25 README
--- pkg/README  19 Sep 2022 07:01:08 -  1.25
+++ pkg/README  29 Nov 2022 23:35:11 -
@@ -109,8 +109,8 @@ server {
 proxy_connect_timeout 90;
 proxy_send_timeout 90;
 proxy_read_timeout 90;
-proxy_buffer_size 4k;
-proxy_buffers 4 32k;
+proxy_buffer_size 64k;
+proxy_buffers 8 64k;
 proxy_busy_buffers_size 64k;
 proxy_temp_file_write_size 64k;
 client_max_body_size 50m;


signature.asc
Description: PGP signature

Re: Enable Ed25519 in apache-httpd

[Giovanni Bechis]

On Sun, Nov 13, 2022 at 03:31:03PM +0100, Theo Buehler wrote:
> Now that libcrypto ships with Ed25519 support and X25519 support in EVP,
> we can enable it in httpd. Ed448 is still not supported.
> 
> Also, do not use a dubious quality ASN1_TIME_diff() implementation from
> stackoverflow, use the one from libcrypto instead (which has been
> available since LibreSSL 3.6).
> 
> Regen patches while there.
> 
> I have only compile tested this.
> 
sure, ok giovanni@
 Thanks
  Giovanni


> PS: The unconditional setting of OPENSSL_NO_CT for LibreSSL in
> md_crypt.c is also iffy (CT is available since LibreSSL 3.5). Let's
> leave that for another day.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/apache-httpd/Makefile,v
> retrieving revision 1.118
> diff -u -p -r1.118 Makefile
> --- Makefile  9 Jun 2022 07:05:50 -   1.118
> +++ Makefile  13 Nov 2022 14:20:02 -
> @@ -3,6 +3,7 @@ COMMENT=  apache HTTP server
>  V=   2.4.54
>  DISTNAME=httpd-${V}
>  PKGNAME= apache-httpd-${V}
> +REVISION=0
>  
>  CATEGORIES=  www net
>  
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
> retrieving revision 1.23
> diff -u -p -r1.23 patch-configure
> --- patches/patch-configure   11 Mar 2022 20:09:37 -  1.23
> +++ patches/patch-configure   13 Nov 2022 14:20:02 -
> @@ -1,7 +1,7 @@
>  Index: configure
>  --- configure.orig
>  +++ configure
> -@@ -3462,7 +3462,7 @@ do
> +@@ -3472,7 +3472,7 @@ do
> ap_last="${ap_cur}"
> ap_cur=`eval "echo ${ap_cur}"`
>   done
> @@ -10,7 +10,7 @@ Index: configure
>   
>   
> APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
> -@@ -4668,7 +4668,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
> +@@ -4678,7 +4678,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
>   APR_INCLUDES=`$apr_config --includes`
>   APR_VERSION=`$apr_config --version`
>   apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
> Index: patches/patch-modules_md_md_crypt_c
> ===
> RCS file: patches/patch-modules_md_md_crypt_c
> diff -N patches/patch-modules_md_md_crypt_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-modules_md_md_crypt_c   13 Nov 2022 14:24:25 -
> @@ -0,0 +1,35 @@
> +Hunk 1: LibreSSL 3.6.0 and later have ASN1_TIME_diff()
> +Hunks 2 and 3: LibreSSL 3.7.0 and later have X25519 support in EVP
> +Index: modules/md/md_crypt.c
> +--- modules/md/md_crypt.c.orig
>  modules/md/md_crypt.c
> +@@ -210,7 +210,8 @@ static int pem_passwd(char *buf, int size, int rwflag,
> +  */
> + static apr_time_t md_asn1_time_get(const ASN1_TIME* time)
> + {
> +-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
> ++#if OPENSSL_VERSION_NUMBER < 0x10002000L || 
> (defined(LIBRESSL_VERSION_NUMBER) && \
> ++ LIBRESSL_VERSION_NUMBER < 
> 0x306fL)
> + /* courtesy: 
> https://stackoverflow.com/questions/10975542/asn1-time-to-time-t-conversion#11263731
> +  * all bugs are mine */
> + apr_time_exp_t t;
> +@@ -854,7 +855,8 @@ static apr_status_t gen_ec(md_pkey_t **ppkey, apr_pool
> + curve = EC_curve_nid2nist(curve_nid);
> + }
> + #endif
> +-#if defined(NID_X25519) && !defined(LIBRESSL_VERSION_NUMBER)
> ++#if defined(NID_X25519) && (!defined(LIBRESSL_VERSION_NUMBER) || \
> ++LIBRESSL_VERSION_NUMBER >= 0x307fL)
> + if (NID_undef == curve_nid && !apr_strnatcasecmp("X25519", curve)) {
> + curve_nid = NID_X25519;
> + curve = EC_curve_nid2nist(curve_nid);
> +@@ -872,7 +874,8 @@ static apr_status_t gen_ec(md_pkey_t **ppkey, apr_pool
> + *ppkey = make_pkey(p);
> + switch (curve_nid) {
> + 
> +-#if defined(NID_X25519) && !defined(LIBRESSL_VERSION_NUMBER)
> ++#if defined(NID_X25519) && (!defined(LIBRESSL_VERSION_NUMBER) || \
> ++LIBRESSL_VERSION_NUMBER >= 0x307fL)
> + case NID_X25519:
> + /* no parameters */
> + if (NULL == (ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_X25519, NULL))
> Index: patches/patch-modules_ssl_ssl_engine_init_c
> ===
> RCS file: 
> /cvs/ports/www/apache-httpd/patches/patch-modules_ssl_ssl_engine_init_c,v
> retrieving revision 1.20
> diff -u -p -r1.20 patch-modules_ssl_ssl_engine_init_c
> --- patches/patch-modules_ssl_ssl_engine_init_c   11 Mar 2022 20:09:38 
> -  1.20
> +++ patches/patch-modules_ssl_ssl_engine_init_c   13 Nov 2022 14:20:02 
> -
> @@ -1,7 +1,7 @@
>  Index: modules/ssl/ssl_engine_init.c
>  --- modules/ssl/ssl_engine_init.c.orig
>  +++ modules/ssl/ssl_engine_init.c
> -@@ -1601,7 +1601,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s
> +@@ -1681,7 +1681,7 

Re: remove security/p0f ?

[Giovanni Bechis]

On 11/13/22 20:17, Stuart Henderson wrote:

On 2022/11/13 19:13, Klemens Nanni wrote:

We also have this the newer version as of

revision 1.1.1.1
date: 2015/01/08 22:03:20;  author: sthen;  state: Exp;  lines: +0 -0;
import security/p0f3 (separate non-conflicting port to p0f as the rewrite uses
different database files than the earlier one / pf / tcpdump), ok giovanni@

Any reason to still keep the old one around?

yes, this is the one which uses the same format as /etc/pf.os


unless you have a patch for pf(4) to make it work with the new format ;-)

 Giovanni

Re: Tweak license detection in portgen(1)

[Giovanni Bechis]

On Sat, Oct 08, 2022 at 08:15:03PM -0400, Kurt Mosiejczuk wrote:
> I tweaked portgen's License.pm module a bit. There were common licenses
> that it would spit out as "Unknown". So I modified the munging a little
> and added more entries to its list of good licenses.
> 
> Now something that states its license is "The MIT License" will no
> longer stump it.
> 
> ok?
> 
sure, ok giovanni@
 Cheers
  Giovanni


> --Kurt
> 
> Index: License.pm
> ===
> RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/License.pm,v
> retrieving revision 1.5
> diff -u -p -r1.5 License.pm
> --- License.pm13 May 2019 00:21:29 -  1.5
> +++ License.pm9 Oct 2022 00:07:08 -
> @@ -28,28 +28,38 @@ our @EXPORT_OK = qw(
>  
>  # Add licenses not recognized here.
>  my %good_licenses = (
> - agpl_3  => 'AGPL 3',
> - apache_1_1  => 'Apache 1.1',
> - apache_2_0  => 'Apache 2.0',
> - artistic_1  => 'Artistic 1.0',
> - artistic_2  => 'Artistic 2.0',
> - bsd => 'BSD',
> - freebsd => 'FreeBSD',
> - gpl_2   => 'GPLv2',
> - gpl_2_0 => 'GPLv2',
> - gpl_3   => 'GPLv3',
> - gpl_3_0 => 'GPLv3',
> - isc => 'ISC',
> - lgpl=> 'LGPL',
> - lgpl_2_1=> 'LGPL v2.1',
> - 'lgpl_2_1+' => 'LGPL v2.1',
> - mit => 'MIT',
> - mpl_v2  => 'MPL 2.0',
> - new_bsd => 'BSD-3',
> - perl_5  => 'Perl',
> - ruby=> 'Ruby',
> - qpl_1_0 => 'QPLv1',
> - zlib=> 'zlib',
> + agpl_3  => 'AGPL 3',
> + apache_1_1  => 'Apache 1.1',
> + apache_2_0  => 'Apache 2.0',
> + artistic_1  => 'Artistic 1.0',
> + artistic_1_0=> 'Artistic 1.0',
> + artistic_2  => 'Artistic 2.0',
> + artistic_2_0=> 'Artistic 2.0',
> + bsd => 'BSD',
> + cc0 => 'CC0',
> + cc_by_nc_sa_3_0 => 'CC BY-NC-SA 3.0',
> + cmu => 'CMU',
> + freebsd => 'FreeBSD',
> + gpl_2   => 'GPLv2',
> + gpl_2_0 => 'GPLv2',
> + 'gpl_2+'=> 'GPLv2+',
> + gpl_3   => 'GPLv3',
> + gpl_3_0 => 'GPLv3',
> + 'gpl_3+'=> 'GPLv3+',
> + isc => 'ISC',
> + lgpl=> 'LGPL',
> + lgpl_2_1=> 'LGPL v2.1',
> + 'lgpl_2_1+' => 'LGPL v2.1+',
> + lgpl_3  => 'LGPL v3',
> + 'lgpl_3+'   => 'LGPL v3+',
> + mit => 'MIT',
> + mpl_v2  => 'MPL 2.0',
> + new_bsd => 'BSD-3',
> + perl_5  => 'Perl',
> + public_domain   => 'Public Domain',
> + ruby=> 'Ruby',
> + qpl_1_0 => 'QPLv1',
> + zlib=> 'zlib',
>  );
>  
>  sub is_good
> @@ -75,6 +85,8 @@ sub _munge
>  
>   $license = lc $license;
>   $license =~ s/[,-\.\s]/_/g;
> + $license =~ s/the_//;
> + $license =~ s/gnu_public_license/gpl/;
>   $license =~ s/_license//;
>   $license =~ s/_version//;
>   $license =~ s/_{2,}/_/g;
> 


signature.asc
Description: PGP signature

Re: Cannot start www/sogo 5.7.1

[Giovanni Bechis]

On Sat, Sep 17, 2022 at 07:56:37PM +0200, Sebastian Reitenbach wrote:
> On Friday, September 16, 2022 15:19 CEST, Landry Breuil  
> wrote:
> 
> > Le Fri, Sep 16, 2022 at 02:18:54PM +0200, Sebastian Reitenbach a écrit :
> > > On Wednesday, September 14, 2022 15:16 CEST, Giovanni Bechis 
> > >  wrote:
> > > 
> > > > On 9/14/22 13:08, Stuart Henderson wrote:
> > > > > On 2022/09/14 12:44, Landry Breuil wrote:
> > > > >> Le Wed, Sep 14, 2022 at 12:03:49PM +0200, Giovanni Bechis a écrit :
> > > > >>> On 9/14/22 11:19, Landry Breuil wrote:
> > > > >>>> Le Tue, Sep 13, 2022 at 11:29:01PM +0200, Giovanni Bechis a écrit :
> > > > >>>>> Hi,
> > > > >>>>> after updating to latest snapshot, sogod doesn't start anymore.
> > > > >>>>
> > > > >>>> just to make it clear, you were previously running 5.5.1 ?
> > > > >>>>
> > > > >>> Previously I was running 7.2-beta, looking at cvs history it was 
> > > > >>> SOGo 5.5.1.
> > > > >>>   Giovanni
> > > > >>>
> > > > >> i'd start by checking the changelogs:
> > > > >> https://www.sogo.nu/news/2022/sogo-v570-released.html
> > > > >> https://www.sogo.nu/news/2022/sogo-v560-released.html
> > > > >> https://www.sogo.nu/news/2022/sogo-v571-released.html
> > > > >>
> > > > >> my wild guess would be
> > > > >> https://github.com/Alinto/sogo/commit/edd64a396ef7a7227d5c45cc1deb61ef3e2b6112
> > > > >> which "adds support for IPv6" ... many dragons in there if you 
> > > > >> listen on
> > > > >> :2 only ;)
> > > > > 
> > > > > Or the big SOPE commit in https://github.com/Alinto/sope/pull/61 /
> > > > > https://github.com/Alinto/sope/commit/a7d04a02724c91797c3bf1b45d754ad909ba97bc
> > > > > 
> > > > > I would try "0.0.0.0:2" first (unless you can restrict it to a 
> > > > > localhost
> > > > > binding) - there's still quite a lot of software that doesn't cope 
> > > > > very
> > > > > well with OS that don't do v4-mapping on v6 sockets
> > > > > 
> > > > listening on 0.0.0.0:2000 or 127.0.0.1:2 works, I think SOGo tryes 
> > > > to bind on ipv4 and ipv6 using some code that is not portable 
> > > > (v4-mapping on v6 sockets).
> > > > I think we should add some info on the upgrade notes.
> > > 
> > > sorry, took a while.
> > > 
> > > As the README talks about the defaults command to configure SOGo,
> > > I only added a blurp to that file. We've something similar for a couple 
> > > of versions above.
> > > 
> > > questioning, if I probably should add that to the minimal default config 
> > > given even more above,
> > > for someone who is not upgrading, but just installing?
> > 
> > i'd put a section in current.html for those upgrading from 7.1 to 7.2,
> 
> yeah, will do.
> 
> > and patch out the default sogo.conf in the readme.
> 
> The sample nginx config goes along with the sample sogod config in the README.
> So I just added the WOPort statement there as well, people starting from 
> scratch
> will pick it up.
> 
> > 
> > maybe garbage collect the old old bits that conflict with it ?
> > 
> yeah, it's quite old, removed.
> 
> OK?
> 
ok giovanni@
 Thanks
  Giovanni


signature.asc
Description: PGP signature

Re: Cannot start www/sogo 5.7.1

[Giovanni Bechis]

On 9/14/22 13:08, Stuart Henderson wrote:

On 2022/09/14 12:44, Landry Breuil wrote:

Le Wed, Sep 14, 2022 at 12:03:49PM +0200, Giovanni Bechis a écrit :

On 9/14/22 11:19, Landry Breuil wrote:

Le Tue, Sep 13, 2022 at 11:29:01PM +0200, Giovanni Bechis a écrit :

Hi,
after updating to latest snapshot, sogod doesn't start anymore.


just to make it clear, you were previously running 5.5.1 ?


Previously I was running 7.2-beta, looking at cvs history it was SOGo 5.5.1.
  Giovanni


i'd start by checking the changelogs:
https://www.sogo.nu/news/2022/sogo-v570-released.html
https://www.sogo.nu/news/2022/sogo-v560-released.html
https://www.sogo.nu/news/2022/sogo-v571-released.html

my wild guess would be
https://github.com/Alinto/sogo/commit/edd64a396ef7a7227d5c45cc1deb61ef3e2b6112
which "adds support for IPv6" ... many dragons in there if you listen on
:2 only ;)


Or the big SOPE commit in https://github.com/Alinto/sope/pull/61 /
https://github.com/Alinto/sope/commit/a7d04a02724c91797c3bf1b45d754ad909ba97bc

I would try "0.0.0.0:2" first (unless you can restrict it to a localhost
binding) - there's still quite a lot of software that doesn't cope very
well with OS that don't do v4-mapping on v6 sockets


listening on 0.0.0.0:2000 or 127.0.0.1:2 works, I think SOGo tryes to bind 
on ipv4 and ipv6 using some code that is not portable (v4-mapping on v6 
sockets).
I think we should add some info on the upgrade notes.
 Giovanni


OpenPGP_signature
Description: OpenPGP digital signature

Re: Cannot start www/sogo 5.7.1

[Giovanni Bechis]

On 9/14/22 11:19, Landry Breuil wrote:

Le Tue, Sep 13, 2022 at 11:29:01PM +0200, Giovanni Bechis a écrit :

Hi,
after updating to latest snapshot, sogod doesn't start anymore.


just to make it clear, you were previously running 5.5.1 ?


Previously I was running 7.2-beta, looking at cvs history it was SOGo 5.5.1.
 Giovanni



OpenPGP_signature
Description: OpenPGP digital signature

Cannot start www/sogo 5.7.1

[Giovanni Bechis]

Hi,
after updating to latest snapshot, sogod doesn't start anymore.
The error I have on my log files is:

Sep 13 23:20:23 sogod [36455]: version 5.7.1 (build @amd64.ports.openbsd.org 
202209110944) -- starting
Sep 13 23:20:23 sogod [36455]: vmem size check enabled: shutting down app when 
vmem > 384 MB. Currently at 0 MB
Sep 13 23:20:23 sogod [36455]: <0x0xad538afbe88[SOGoProductLoader]> SOGo 
products loaded from '/usr/local/lib/GNUstep/SOGo':
Sep 13 23:20:23 sogod [36455]: <0x0xad538afbe88[SOGoProductLoader]>   
AdministrationUI.SOGo, Appointments.SOGo, CommonUI.SOGo, Contacts.SOGo, 
ContactsUI.SOGo, MailPartViewers.SOGo, Mailer.SOGo, MailerUI.SOGo, MainUI.SOGo, 
PreferencesUI.SOGo, SchedulerUI.SOGo
Sep 13 23:20:23 sogod [36455]: All products loaded - current memory usage at 0 
MB
Sep 13 23:20:23 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 1 failed
Sep 13 23:20:24 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 2 failed
Sep 13 23:20:25 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 3 failed
Sep 13 23:20:26 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 4 failed
Sep 13 23:20:27 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 5 failed
Sep 13 23:20:28 sogod [36455]: [ERROR] <0x0xad4ebfad808[WOWatchDog]> unable to 
listen on specified port, check that no other process is already using it
Loading two versions of SOGoMailBodyPart.  The class that will be used is 
undefined
...

In sogo.conf I have 'WOPort = "2";' and there is no other process listening 
on that port.

 Cheers
  Giovanni

$ doas pkg_info | grep -E '^so[go,pe]'
sogo-5.7.1  web based groupware server
sope-5.7.1  Skyrix Object Publishing Environment
sope-mysql-5.7.1SOPE MySQL adaptor
sope-postgres-5.7.1 SOPE PostgreSQL adaptor

$ doas dmesg

OpenBSD 7.2 (GENERIC.MP) #720: Sun Sep 11 15:41:58 MDT 2022
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 4277010432 (4078MB)
avail mem = 4129984512 (3938MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xe0010 (260 entries)
bios0: vendor Phoenix Technologies LTD version "6.00" date 12/12/2018
bios0: VMware, Inc. VMware Virtual Platform
acpi0 at bios0: ACPI 4.0
acpi0: sleep states S0 S1 S4 S5
acpi0: tables DSDT FACP BOOT APIC MCFG SRAT HPET WAET
acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S8F0(S3) 
S16F(S3) S18F(S3) S22F(S3) S23F(S3) S24F(S3) S25F(S3) PE40(S3) S1F0(S3) 
PE50(S3) S1F0(S3) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.52 MHz, 06-3a-00
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,MELTDOWN
cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 35MB 64b/line 20-way L3 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 66MHz
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.59 MHz, 06-3a-00
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,MELTDOWN
cpu1: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 35MB 64b/line 20-way L3 cache
cpu1: smt 0, core 0, package 2
cpu2 at mainbus0: apid 4 (application processor)
cpu2: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.56 MHz, 06-3a-00
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,MELTDOWN
cpu2: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 35MB 64b/line 20-way L3 cache
cpu2: smt 0, core 0, package 4
cpu3 at mainbus0: apid 6 (application processor)
cpu3: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.57 MHz, 06-3a-00
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLE

Re: www/sogod: add login.conf.d/sogod

[Giovanni Bechis]

On Thu, Apr 28, 2022 at 03:18:00PM +0200, Landry Breuil wrote:
> Le Thu, Apr 28, 2022 at 03:12:23PM +0200, Landry Breuil a écrit :
> > hi,
> > 
> > i've been using sogo with ~10 users since a while and i've had a line in
> > login.conf since 2017, because in some situations 128fd is not enough
> > for sogod.. i think that was for a high number of db/ldap cnx but i dont
> > remember the details honestly.
> > 
> > dunno if i should remove that login.conf knob and check how it fares
> > with 128, but here's a diff.
> 
> well.. now with a diff.
similar setup here, ok giovanni@
 Cheers
  Giovanni



> ? sogo-3.2.9.diff
> ? patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> ? patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/sogo/Makefile,v
> retrieving revision 1.98
> diff -u -r1.98 Makefile
> --- Makefile  11 Mar 2022 20:11:00 -  1.98
> +++ Makefile  28 Apr 2022 13:02:36 -
> @@ -3,6 +3,7 @@
>  VERSION =5.5.1
>  DISTNAME =   SOGo-${VERSION}
>  PKGNAME =sogo-${VERSION}
> +REVISION =   0
>  
>  SHARED_LIBS +=   GDLContentStore 3.0
>  SHARED_LIBS +=   NGCards 3.1
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
> retrieving revision 1.51
> diff -u -r1.51 PLIST
> --- pkg/PLIST 11 Mar 2022 20:11:01 -  1.51
> +++ pkg/PLIST 28 Apr 2022 13:02:37 -
> @@ -2833,6 +2833,8 @@
>  share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
>  share/doc/sogo/sql-update-3.2.10_to_4.0.0.sh
>  share/doc/sogo/updates.php
> +share/examples/login.conf.d/sogod
> +@sample ${SYSCONFDIR}/login.conf.d/sogod
>  @mode 750
>  @owner _sogo
>  @group _sogo
> Index: pkg/sogod.login
> ===
> RCS file: pkg/sogod.login
> diff -N pkg/sogod.login
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/sogod.login   28 Apr 2022 13:02:37 -
> @@ -0,0 +1,4 @@
> +sogod:\
> + :openfiles-cur=1024:\
> + :openfiles-max=2048:\
> + :tc=daemon:



signature.asc
Description: PGP signature

Re: NEW: misc/p5-Net-LibIDN2

[Giovanni Bechis]

On Wed, Apr 27, 2022 at 10:43:45AM +0200, Giovanni Bechis wrote:
> Net::LibIDN2 - Perl bindings for GNU Libidn2
> The port provides bindings for GNU Libidn2,
> a C library for handling internationalized domain names
> based on IDNA 2008, Punycode and TR46.
> 
> The port will be a dependency for Apache SpamAssassin 4.0.
> 
> Comments ? Ok ?
>  Cheers
>   Giovanni
Now with 100% more attachments.
 Giovanni


p5-Net-LibIDN2-1.01.tgz
Description: application/gzip


signature.asc
Description: PGP signature

NEW: misc/p5-Net-LibIDN2

[Giovanni Bechis]

Net::LibIDN2 - Perl bindings for GNU Libidn2
The port provides bindings for GNU Libidn2,
a C library for handling internationalized domain names
based on IDNA 2008, Punycode and TR46.

The port will be a dependency for Apache SpamAssassin 4.0.

Comments ? Ok ?
 Cheers
  Giovanni


signature.asc
Description: PGP signature

Re: mail/p5-Mail-DMARC: Update to 1.20211209

[Giovanni Bechis]

On 4/13/22 23:14, Alexander Bluhm wrote:
> On Sun, Apr 03, 2022 at 10:31:54AM +, wen heping wrote:
>> Hi,
>>
>> Here is a patch to update mail/p5-Mail-DMARC:
>> i) Update to 1.20211209
>> ii) Add p5-Email-Sender as RUN_DEPENDS
>> It build well,  1 of all 20 tests failed on my amd64-7.1 system.
>> 
>>
>> One port depends on p5-Mail-DMARC: mail/p5-Mail-Milter-Authentication.
>> It build well and pass all the tests with this patch.
>>
>> Cheers !
>> wen
> You have to make update-plist, new files are missing.
>
> +${P5SITE}/Mail/DMARC/Report/Sender.pm
> +${P5SITE}/Mail/DMARC/Test/
> +${P5SITE}/Mail/DMARC/Test/Transport.pm
>
> otherwise OK bluhm@
>
Committed, thanks.

 Giovanni

Re: mail/p5-Mail-DMARC: Update to 1.20211209

[Giovanni Bechis]

Please resubmit after unlock and feel free to take maintainership.
 Thanks
  Giovanni

On Sun, Apr 03, 2022 at 10:31:54AM +, wen heping wrote:
> Hi,
> 
> Here is a patch to update mail/p5-Mail-DMARC:
> i) Update to 1.20211209
> ii) Add p5-Email-Sender as RUN_DEPENDS
> It build well,  1 of all 20 tests failed on my amd64-7.1 system.
> 
> 
> One port depends on p5-Mail-DMARC: mail/p5-Mail-Milter-Authentication.
> It build well and pass all the tests with this patch.
> 
> Cheers !
> wen

> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/p5-Mail-DMARC/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile  11 Mar 2022 19:34:48 -  1.16
> +++ Makefile  3 Apr 2022 10:28:02 -
> @@ -1,8 +1,7 @@
>  COMMENT= Perl implementation of DMARC
>  
> -DISTNAME=Mail-DMARC-1.20200214
> +DISTNAME=Mail-DMARC-1.20211209
>  MAINTAINER=  Giovanni Bechis 
> -REVISION=1
>  
>  CATEGORIES=  mail
>  
> @@ -23,6 +22,7 @@ RUN_DEPENDS=converters/p5-JSON \
>   devel/p5-Net-Server \
>   devel/p5-Test-File-ShareDir \
>   mail/p5-Email-MIME \
> + mail/p5-Email-Sender \
>   mail/p5-Email-Simple \
>   mail/p5-Mail-DKIM \
>   net/p5-Net-DNS \
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/p5-Mail-DMARC/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  15 Apr 2020 09:32:57 -  1.9
> +++ distinfo  3 Apr 2022 10:28:02 -
> @@ -1,2 +1,2 @@
> -SHA256 (Mail-DMARC-1.20200214.tar.gz) = 
> dpxXxpPp1hLblpJkJkX4x0bL1fWmhaPJ7GNWQC/inHs=
> -SIZE (Mail-DMARC-1.20200214.tar.gz) = 786782
> +SHA256 (Mail-DMARC-1.20211209.tar.gz) = 
> 9RnTO7zeg60nqOtFaACfYp6Dde+0tshCYct6Ll2/fyQ=
> +SIZE (Mail-DMARC-1.20211209.tar.gz) = 794986



signature.asc
Description: PGP signature

Re: CVS: cvs.openbsd.org: ports

[Giovanni Bechis]

On Tue, Mar 15, 2022 at 05:03:17PM -0400, Kurt Mosiejczuk wrote:
> On Tue, Mar 15, 2022 at 08:22:43PM +, Stuart Henderson wrote:
> 
> > > It fails identically on -current.
> 
> > base-gcc won't be good enough:
> 
> > > util.c:3183: error: thread-local storage not supported for this target
> 
> Here's a diff to switch to ports-gcc for base-gcc arches.
> 
> ok?
> 
> (Should also be backported to fix -stable (minus the REVISION bump) to
> fix it there.
> 
ok giovanni@ portwise.

  Giovanni


> --Kurt
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/apache-httpd/Makefile,v
> retrieving revision 1.114
> diff -u -p -r1.114 Makefile
> --- Makefile  14 Mar 2022 14:41:34 -  1.114
> +++ Makefile  15 Mar 2022 21:03:05 -
> @@ -3,6 +3,7 @@ COMMENT=  apache HTTP server
>  V=   2.4.53
>  DISTNAME=httpd-${V}
>  PKGNAME= apache-httpd-${V}
> +REVISION=0
>  
>  CATEGORIES=  www net
>  
> @@ -12,6 +13,9 @@ HOMEPAGE=   https://httpd.apache.org/
>  
>  # Apache 2.0
>  PERMIT_PACKAGE=  Yes
> +
> +COMPILER=base-clang ports-gcc
> +COMPILER_LANGS=  c
>  
>  WANTLIB += apr-1 aprutil-1 brotlicommon brotlienc c crypto curl
>  WANTLIB += db expat iconv jansson lzma m nghttp2 pcre pthread ssl
> 


signature.asc
Description: PGP signature

WIP: security/rustls-ffi

[Giovanni Bechis]

This crate contains FFI bindings for the rustls TLS library,
so you can use the library in C programs or any other language that supports 
FFI.

Atm the port fails during "make fake" with:
$ make fake
===>  Faking installation for rustls-ffi-0.8.2
error: no packages found with binaries or examples

This port is needed to enable new mod_tls in www/apache-httpd.

Any hints ?
 Cheers
  Giovanni


rustls-ffi-0.8.2.tgz
Description: application/gzip


signature.asc
Description: PGP signature

FIX: mail/p5-Mail-SPF

[Giovanni Bechis]

Attached patch fixes the error:
spf: lookup failed: Can't locate object method "qualifier_pattern" via
package "Mail::SPF::Mech"
at /usr/local/lib/perl5/site_perl/Mail/SPF/Record.pm line 213.
that can be reproduced with SpamAssassin with certain emails.

Comments ? ok ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-SPF/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile3 Jul 2020 21:45:27 -   1.8
+++ Makefile23 Dec 2021 18:35:14 -
@@ -4,7 +4,7 @@ COMMENT =   perl oop implementation of Se
 
 DISTNAME = Mail-SPF-v2.9.0
 PKGNAME =  p5-${DISTNAME:S/-v/-/}
-REVISION = 1
+REVISION = 2
 CATEGORIES =   mail
 
 MAINTAINER =   Giovanni Bechis 
Index: patches/patch-lib_Mail_SPF_Record_pm
===
RCS file: patches/patch-lib_Mail_SPF_Record_pm
diff -N patches/patch-lib_Mail_SPF_Record_pm
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-lib_Mail_SPF_Record_pm23 Dec 2021 18:35:14 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+Fix for cpan bug 130299 (https://rt.cpan.org/Public/Bug/Display.html?id=130299)
+Index: lib/Mail/SPF/Record.pm
+--- lib/Mail/SPF/Record.pm.orig
 lib/Mail/SPF/Record.pm
+@@ -206,6 +206,7 @@ sub parse_version_tag {
+ 
+ sub parse_term {
+ my ($self) = @_;
++require Mail::SPF::Mech;
+ if (
+ $self->{parse_text} =~ s/
+ ^


signature.asc
Description: PGP signature

use Apache cdn on infrastructure/db/network.conf

[Giovanni Bechis]

Apache mirrors are behind a cdn, ok to use it ?
 Cheers
  Giovanni

Index: network.conf
===
RCS file: /cvs/ports/infrastructure/db/network.conf,v
retrieving revision 1.18
diff -u -p -r1.18 network.conf
--- network.conf7 Feb 2021 22:02:04 -   1.18
+++ network.conf20 Dec 2021 17:45:04 -
@@ -142,12 +142,7 @@ MASTER_SITE_PACKETSTORM+=  \
https://dl.packetstormsecurity.net/
 
 MASTER_SITE_APACHE+= \
-   https://www.mirrorservice.org/sites/ftp.apache.org/ \
-   https://mirrors.dotsrc.org/apache/ \
-   https://downloads.apache.org/ \
-   https://archive.apache.org/dist/ \
-   http://ftp.meisei-u.ac.jp/mirror/apache/dist/ \
-   https://apache.belnet.be/
+   https://dlcdn.apache.org/
 
 MASTER_SITE_PYPI +=\
https://pypi.io/packages/source/


signature.asc
Description: PGP signature

Re: [Maintainer Update] mail/p5-Mail-AuthenticationResults: Update to 2.20210915

[Giovanni Bechis]

On Sun, Dec 19, 2021 at 10:48:29AM +, wen heping wrote:
> Hi, ports@:
> 
>Here is simple patch for mail/p5-Mail-AuthenticationResults to 
> update to 2.20210915. It build well and pass all tests on 7.0-current
> amd54 system.
> 
>Only 1 port depends on it: mail/p5-Mail-DKIM. It build well and pass 
> all tests with this patch.
> 
>Comments ?
> 
committed, thanks
 Giovanni


> 
> wen
>

> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/p5-Mail-AuthenticationResults/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile  25 May 2021 23:12:53 -  1.5
> +++ Makefile  19 Dec 2021 10:44:28 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =object oriented Authentication-Results headers
>  
> -DISTNAME =   Mail-AuthenticationResults-2.20210112
> +DISTNAME =   Mail-AuthenticationResults-2.20210915
>  
>  CATEGORIES = mail
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/p5-Mail-AuthenticationResults/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo  25 May 2021 23:12:53 -  1.4
> +++ distinfo  19 Dec 2021 10:44:28 -
> @@ -1,2 +1,2 @@
> -SHA256 (Mail-AuthenticationResults-2.20210112.tar.gz) = 
> Eh38tWDy3GO8pdBh3/jnas7ezwm7q59SiuDFc+6V2B0=
> -SIZE (Mail-AuthenticationResults-2.20210112.tar.gz) = 30919
> +SHA256 (Mail-AuthenticationResults-2.20210915.tar.gz) = 
> wpe8m7GvKjcgHbmSDhy14vWBAkcT9cWxNfQUAuyU4Q8=
> +SIZE (Mail-AuthenticationResults-2.20210915.tar.gz) = 31535



signature.asc
Description: PGP signature

UPDATE: mail/mimedefang

[Giovanni Bechis]

Hi,
update to the (just released) latest version.
 ok ? Comments ?
   Cheers
Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile29 Aug 2021 10:32:01 -  1.54
+++ Makefile17 Dec 2021 17:15:44 -
@@ -2,8 +2,7 @@
 
 COMMENT=   mailfilter to identify and mark spam
 
-DISTNAME=  mimedefang-2.85
-REVISION=  1
+DISTNAME=  mimedefang-2.86
 
 CATEGORIES=mail
 
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo27 Aug 2021 15:58:30 -  1.20
+++ distinfo17 Dec 2021 17:15:44 -
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-2.85.tar.gz) = JA6VIHfnrJzBRWjzJSqGG4UHD6yCl0lTY9Tc1+HBt4Y=
-SIZE (mimedefang-2.85.tar.gz) = 499350
+SHA256 (mimedefang-2.86.tar.gz) = jumgOXy+pEftJS3uEouqR6PWs7KpYgkx+cXOzKAyGiM=
+SIZE (mimedefang-2.86.tar.gz) = 501484
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/mimedefang/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST   4 Sep 2018 12:46:15 -   1.14
+++ pkg/PLIST   17 Dec 2021 17:15:44 -
@@ -1,9 +1,11 @@
 @comment $OpenBSD: PLIST,v 1.14 2018/09/04 12:46:15 espie Exp $
-@comment non-volatile homedir needed for sa-learn(1), MD sets user_dir to 
QUARANTINEDIR
 @newgroup _mdefang:570
 @newuser _mdefang:570:_mdefang:daemon:MIMEDefang 
User:/var/spool/MD-Quarantine:/sbin/nologin
+@comment non-volatile homedir needed for sa-learn(1), MD sets user_dir to 
QUARANTINEDIR
 @extraunexec rm -rf /var/spool/MIMEDefang/*
 @extraunexec rm -rf /var/spool/MD-Quarantine/*
+@rcscript ${RCDIR}/mimedefang
+@rcscript ${RCDIR}/mimedefang_multiplexor
 @bin bin/md-mx-ctrl
 @bin bin/mimedefang
 @bin bin/mimedefang-multiplexor
@@ -38,10 +40,5 @@ share/examples/mimedefang/mail/sa-mimede
 @mode 0750
 @owner _mdefang
 @group _mdefang
-@sample /var/spool/MIMEDefang/
 @sample /var/spool/MD-Quarantine/
-@mode
-@owner
-@group
-@rcscript ${RCDIR}/mimedefang
-@rcscript ${RCDIR}/mimedefang_multiplexor
+@sample /var/spool/MIMEDefang/


signature.asc
Description: PGP signature

UPDATE: mail/courier-*

[Giovanni Bechis]

Update to latest version of mail/courier-* and mail/maildrop.
To start courier-imap the line
"IMAPACCESSFILE=/etc/courier/imapaccess"
must be added to /etc/courier/imapd configuration file.

 Comments ? Ok ?
  Cheers
   Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/courier-unicode/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile11 Oct 2020 17:55:17 -  1.14
+++ Makefile3 Dec 2021 17:15:40 -
@@ -1,10 +1,10 @@
 # $OpenBSD: Makefile,v 1.14 2020/10/11 17:55:17 landry Exp $
 
-SHARED_LIBS +=  courier-unicode1.0 # 2.0
+SHARED_LIBS +=  courier-unicode2.0 # 2.0
 
 COMMENT =  courier unicode library
 
-DISTNAME = courier-unicode-2.1
+DISTNAME = courier-unicode-2.2.3
 
 CATEGORIES =   mail devel
 
Index: distinfo
===
RCS file: /cvs/ports/mail/courier-unicode/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo19 Jun 2019 21:44:39 -  1.5
+++ distinfo3 Dec 2021 17:15:40 -
@@ -1,2 +1,2 @@
-SHA256 (courier-unicode-2.1.tar.bz2) = 
aEy6f+cisISuH/sKf3GZl1ZAnVrUyEvODv64iHlD6iE=
-SIZE (courier-unicode-2.1.tar.bz2) = 447917
+SHA256 (courier-unicode-2.2.3.tar.bz2) = 
COz13JdSnOOqncqghYYHYt5jbr75aL9LbgzfqvGMev8=
+SIZE (courier-unicode-2.2.3.tar.bz2) = 593337
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/courier-unicode/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   4 Aug 2017 23:05:01 -   1.4
+++ pkg/PLIST   3 Dec 2021 17:15:40 -
@@ -2,9 +2,26 @@
 include/courier-unicode-categories-tab.h
 include/courier-unicode-script-tab.h
 include/courier-unicode.h
-lib/libcourier-unicode.a
+@static-lib lib/libcourier-unicode.a
 lib/libcourier-unicode.la
 @lib lib/libcourier-unicode.so.${LIBcourier-unicode_VERSION}
+@man man/man3/unicode::bidi.3
+@man man/man3/unicode::bidi_calc.3
+@man man/man3/unicode::bidi_calc_types.3
+@man man/man3/unicode::bidi_cleanup.3
+@man man/man3/unicode::bidi_combinings.3
+@man man/man3/unicode::bidi_embed.3
+@man man/man3/unicode::bidi_embed_paragraph_level.3
+@man man/man3/unicode::bidi_get_direction.3
+@man man/man3/unicode::bidi_logical_order.3
+@man man/man3/unicode::bidi_needs_embed.3
+@man man/man3/unicode::bidi_override.3
+@man man/man3/unicode::bidi_reorder.3
+@man man/man3/unicode::canonical.3
+@man man/man3/unicode::compose.3
+@man man/man3/unicode::compose_default_callback.3
+@man man/man3/unicode::decompose.3
+@man man/man3/unicode::decompose_default_reallocate.3
 @man man/man3/unicode::iconvert::convert.3
 @man man/man3/unicode::iconvert::convert_tocase.3
 @man man/man3/unicode::iconvert::fromu.3
@@ -20,8 +37,32 @@ lib/libcourier-unicode.la
 @man man/man3/unicode::ucs_2.3
 @man man/man3/unicode::ucs_4.3
 @man man/man3/unicode::utf_8.3
+@man man/man3/unicode::wordbreak.3
 @man man/man3/unicode::wordbreak_callback_base.3
+@man man/man3/unicode_bidi.3
+@man man/man3/unicode_bidi_bracket_type.3
+@man man/man3/unicode_bidi_calc.3
+@man man/man3/unicode_bidi_calc_levels.3
+@man man/man3/unicode_bidi_calc_types.3
+@man man/man3/unicode_bidi_cleaned_size.3
+@man man/man3/unicode_bidi_cleanup.3
+@man man/man3/unicode_bidi_combinings.3
+@man man/man3/unicode_bidi_direction.3
+@man man/man3/unicode_bidi_embed.3
+@man man/man3/unicode_bidi_embed_paragraph_level.3
+@man man/man3/unicode_bidi_logical_order.3
+@man man/man3/unicode_bidi_mirror.3
+@man man/man3/unicode_bidi_needs_embed.3
+@man man/man3/unicode_bidi_reorder.3
+@man man/man3/unicode_bidi_setbnl.3
+@man man/man3/unicode_bidi_type.3
+@man man/man3/unicode_canonical.3
 @man man/man3/unicode_category_lookup.3
+@man man/man3/unicode_ccc.3
+@man man/man3/unicode_compose.3
+@man man/man3/unicode_composition_apply.3
+@man man/man3/unicode_composition_deinit.3
+@man man/man3/unicode_composition_init.3
 @man man/man3/unicode_convert.3
 @man man/man3/unicode_convert_deinit.3
 @man man/man3/unicode_convert_fromu_init.3
@@ -37,8 +78,22 @@ lib/libcourier-unicode.la
 @man man/man3/unicode_convert_tou_tobuf.3
 @man man/man3/unicode_convert_toutf8.3
 @man man/man3/unicode_convert_uc.3
+@man man/man3/unicode_decompose.3
+@man man/man3/unicode_decompose_reallocate_size.3
+@man man/man3/unicode_decomposition_deinit.3
+@man man/man3/unicode_decomposition_init.3
 @man man/man3/unicode_default_chset.3
+@man man/man3/unicode_emoji.3
+@man man/man3/unicode_emoji_component.3
+@man man/man3/unicode_emoji_extended_pictographic.3
+@man man/man3/unicode_emoji_lookup.3
+@man man/man3/unicode_emoji_modifier.3
+@man man/man3/unicode_emoji_modifier_base.3
+@man man/man3/unicode_emoji_presentation.3
 @man man/man3/unicode_grapheme_break.3
+@man man/man3/unicode_grapheme_break_deinit.3
+@man man/man3/unicode_grapheme_break_init.3
+@man man/man3/unicode_grapheme_break_next.3
 @man man/man

Re: sogo/gnustep mysteriously adds XML-encoded UTF-8 BOM

[Giovanni Bechis]

On Thu, Oct 28, 2021 at 01:41:24PM +0200, Landry Breuil wrote:
> Le Thu, Oct 28, 2021 at 01:18:33PM +0200, Marcus MERIGHI a écrit :
> > Hello!
> > 
> > This is just a heads-up for fellow SOGo users and a plea to 
> > @landry: would you mind sharing your new gnustep/sogo packages?
> > 
> > After upgrading to OpenBSD 7.0 with the updates to:
> > 
> > -sogo-5.0.1p0web based groupware server
> > +sogo-5.2.0  web based groupware server
> > -gnustep-base-1.27.0p0 GNUstep base library
> > +gnustep-base-1.28.0p1 GNUstep base library
> > 
> > I experience a symptom of "you can create events but you cannot change
> > them". Clients are DAVx5 for android and caldavsynchronizer for
> > Outlook/Windows10. DAV access with e.g. cadaver(1) works.
> > 
> > While chasing the cause I soon found I'm not the first to do so, thank
> > you, landry@, for beeing quicker:
> > 
> > SOGo bug report by landry@
> > https://www.sogo.nu/bugs/view.php?id=5416
> > 
> > Gnustep bug report by landry@
> > https://github.com/gnustep/libs-base/issues/212
> > 
> > The commit landry@ reverted to get www/sogo to a working state:
> > https://github.com/gnustep/libs-base/commit/bd5f2909e6edc8012a0a6e44ea1402dfbe1353a4
> 
> I havent tested access with DAVx5 or anything else, only from
> thunderbird/lightning. But if it's the same bug and reverting the commit
> fixes it for you too, please add your voice to the sogo/gnustep bug
> reports..
> 
your diff/package works with DAVx5 clients as well, thanks.
unfortunately I have no idea if this is the correct fix or just a
workaround.

 Giovanni



> I use the attached diff on 7.0-stable, there's an (unsigned) package at
> https://packages.rhaalovely.net/7.0/amd64/
> 
> Landry

> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/gnustep/base/Makefile,v
> retrieving revision 1.81
> diff -u -r1.81 Makefile
> --- Makefile  3 Sep 2021 11:47:42 -   1.81
> +++ Makefile  26 Oct 2021 14:50:55 -
> @@ -3,7 +3,7 @@
>  COMMENT= GNUstep base library
>  
>  DISTNAME=gnustep-base-1.28.0
> -REVISION=1
> +REVISION=2
>  
>  SHARED_LIBS= gnustep-base 10.4
>  CATEGORIES=  devel
> Index: patches/patch-Headers_Foundation_NSString_h
> ===
> RCS file: patches/patch-Headers_Foundation_NSString_h
> diff -N patches/patch-Headers_Foundation_NSString_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Headers_Foundation_NSString_h   26 Oct 2021 14:50:55 
> -
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +Revert 
> https://github.com/gnustep/libs-base/commit/bd5f2909e6edc8012a0a6e44ea1402dfbe1353a4
> +https://github.com/gnustep/libs-base/issues/212
> +
> +Index: Headers/Foundation/NSString.h
> +--- Headers/Foundation/NSString.h.orig
>  Headers/Foundation/NSString.h
> +@@ -482,10 +482,6 @@ GS_EXPORT_CLASS
> + // Working With Encodings
> + - (BOOL) canBeConvertedToEncoding: (NSStringEncoding)encoding;
> + - (NSData*) dataUsingEncoding: (NSStringEncoding)encoding;
> +-/** Conversion to an encoding where byte order matters but is not specified
> +- * (NSUnicodeStringEncoding, NSUTF16StringEncoding, NSUTF32StringEncoding)
> +- * produces data with a Byte Order Marker (BOM) at the start of the data.
> +- */
> + - (NSData*) dataUsingEncoding: (NSStringEncoding)encoding
> +  allowLossyConversion: (BOOL)flag;
> + + (NSStringEncoding) defaultCStringEncoding;
> Index: patches/patch-Source_GSString_m
> ===
> RCS file: patches/patch-Source_GSString_m
> diff -N patches/patch-Source_GSString_m
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Source_GSString_m   26 Oct 2021 14:50:55 -
> @@ -0,0 +1,196 @@
> +$OpenBSD$
> +
> +Revert 
> https://github.com/gnustep/libs-base/commit/bd5f2909e6edc8012a0a6e44ea1402dfbe1353a4
> +https://github.com/gnustep/libs-base/issues/212
> +
> +Index: Source/GSString.m
> +--- Source/GSString.m.orig
>  Source/GSString.m
> +@@ -2379,6 +2379,133 @@ cStringLength_u(GSStr self, NSStringEncoding enc)
> + }
> + }
> + 
> ++static inline NSData*
> ++dataUsingEncoding_c(GSStr self, NSStringEncoding encoding, BOOL lossy)
> ++{
> ++  unsigned  len = self->_count;
> ++
> ++  if (len == 0)
> ++{
> ++  return [NSDataClass data];
> ++}
> ++
> ++  if ((encoding == internalEncoding)
> ++|| ((internalEncoding == NSASCIIStringEncoding)
> ++  && (encoding == NSUTF8StringEncoding || isByteEncoding(encoding
> ++{
> ++  unsigned char *buff;
> ++
> ++  buff = (unsigned char*)NSZoneMalloc(NSDefaultMallocZone(), len);
> ++  memcpy(buff, self->_contents.c, len);
> ++  return [NSDataClass dataWithBytesNoCopy: buff length: len];
> ++}
> ++  else if (encoding == NSUnicodeStringEncoding)
> ++{
> ++  unsigned int  l = 0;
> ++  unichar   *r = 0;
> ++  unsigned int  options = GSUniBOM;
> ++
> ++  if (loss

mail/pyzor fix

[Giovanni Bechis]

Hi,
mail/pyzor has a server mode that needs some love.
Diff follows, ok ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/pyzor/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile2 Nov 2021 00:01:17 -   1.18
+++ Makefile18 Nov 2021 09:27:14 -
@@ -9,7 +9,7 @@ GH_COMMIT = 53aceee8943c30cc28850ca76e1
 MODPY_EGG_VERSION =1.1.1
 DISTNAME = pyzor-1.1.1pre20210613
 CATEGORIES =   mail net
-REVISION = 0
+REVISION = 1
 
 HOMEPAGE = https://www.pyzor.org/
 
@@ -17,6 +17,7 @@ HOMEPAGE =https://www.pyzor.org/
 PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/python
+RUN_DEPENDS =  lang/python/${MODPY_VERSION},-gdbm
 # actual releases should be available on pypi, could switch back if
 # there's a new release, but no tests
 #MODPY_PI =Yes
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/pyzor/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   29 Oct 2021 21:50:29 -  1.5
+++ pkg/PLIST   18 Nov 2021 09:27:14 -
@@ -1,9 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.5 2021/10/29 21:50:29 sthen Exp $
+@rcscript ${RCDIR}/pyzord
 bin/pyzor
 bin/pyzor-migrate
 bin/pyzord
 lib/python${MODPY_VERSION}/site-packages/pyzor/
-lib/python${MODPY_VERSION}/site-packages/pyzor-1.1.1-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/pyzor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/pyzor/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyzor/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/pyzor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
Index: pkg/pyzord.rc
===
RCS file: pkg/pyzord.rc
diff -N pkg/pyzord.rc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/pyzord.rc   18 Nov 2021 09:27:14 -
@@ -0,0 +1,12 @@
+#!/bin/ksh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/bin/pyzord"
+daemon_flags="--detach=/var/log/pyzord.log"
+
+. /etc/rc.d/rc.subr
+
+pexp=".*${daemon} ${daemon_flags}"
+
+rc_cmd $1


signature.asc
Description: PGP signature

Re: Ports incompatibilties with LibreSSL

[Giovanni Bechis]

On Wed, Sep 01, 2021 at 05:19:18PM +0100, Stuart Henderson wrote:
> On 2021/09/01 17:55, Theo Buehler wrote:
> > Please, if you run into issues building stuff against LibreSSL, let us
> > know, otherwise we can't fix them.
> > 
> > Some upstreams are helpful and cooperative, but there's too many #ifdefs
> > out there, many of them not so well done and they typically won't ever
> > be removed. We still strive to be as compatible as possible. If
> > something doesn't compile against LibreSSL, that's a LibreSSL bug, not
> > an upstream bug.
> > 
> 
> I would say Postfix 3.6 but you already know about it ;)
> 
> I believe there are also some issues with Dovecot replication across TCP
> connections with ssl=yes, workaround is to use ssh. But I haven't retried
> in a few months.
> 
www/apache-httpd doesn't have TLS-1.3 support yet but I think you should
be aware of it.
 Giovanni


signature.asc
Description: PGP signature

Re: WIP update: mail/mimedefang

[Giovanni Bechis]

On Tue, Aug 03, 2021 at 11:16:50PM +0200, Giovanni Bechis wrote:
> Hi,
> MIMEDefang 2.85-rc1 has been released last week and 2.85 will be
> released soon, now looking for testers.
> Full changelog at 
> https://github.com/The-McGrail-Foundation/MIMEDefang/blob/2.85-rc1/Changelog
> 

MIMEDefang 2.85 has been released, updated diff follows.
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile12 Jul 2019 20:47:30 -  1.51
+++ Makefile25 Aug 2021 08:31:33 -
@@ -2,12 +2,11 @@
 
 COMMENT=   mailfilter to identify and mark spam
 
-DISTNAME=  mimedefang-2.84
+DISTNAME=  mimedefang-2.85
 CATEGORIES=mail
-REVISION=  0
 
-HOMEPAGE=  http://www.mimedefang.org/
-MASTER_SITES=  ${HOMEPAGE}static/
+HOMEPAGE=  https://www.mimedefang.org/
+MASTER_SITES=  ${HOMEPAGE}releases/
 
 MAINTAINER=Antoine Jacoutot 
 
@@ -17,10 +16,10 @@ PERMIT_PACKAGE= Yes
 WANTLIB += c m milter perl pthread
 
 BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS=   devel/p5-IO-stringy \
-   mail/p5-Mail-Tools \
+RUN_DEPENDS=   mail/p5-Mail-Tools \
mail/p5-MIME-tools \
security/p5-Digest-SHA1 \
+   security/p5-Crypt-OpenSSL-Random \
sysutils/p5-Unix-Syslog
 
 # useful optional dependencies
@@ -36,7 +35,10 @@ CONFIGURE_ARGS=  --with-user=_mdefang \
--disable-anti-virus \
--enable-poll
 
-NO_TEST=   Yes
+TEST_DEPENDS=  devel/p5-Test-Class \
+   devel/p5-Test-Most
+
+TEST_TARGET=   test
 
 FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples/mimedefang
 
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo29 Mar 2018 20:52:15 -  1.19
+++ distinfo25 Aug 2021 08:31:33 -
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-2.84.tar.gz) = bRUxxwqQH83fnLmJ1Ii+r3isDMFtEb65gbmSABRsSEg=
-SIZE (mimedefang-2.84.tar.gz) = 371596
+SHA256 (mimedefang-2.85.tar.gz) = JA6VIHfnrJzBRWjzJSqGG4UHD6yCl0lTY9Tc1+HBt4Y=
+SIZE (mimedefang-2.85.tar.gz) = 499350
Index: patches/patch-examples_mimedefang-filter-openbsd-ports
===
RCS file: 
/cvs/ports/mail/mimedefang/patches/patch-examples_mimedefang-filter-openbsd-ports,v
retrieving revision 1.7
diff -u -p -r1.7 patch-examples_mimedefang-filter-openbsd-ports
--- patches/patch-examples_mimedefang-filter-openbsd-ports  31 Oct 2017 
07:34:01 -  1.7
+++ patches/patch-examples_mimedefang-filter-openbsd-ports  25 Aug 2021 
08:31:33 -
@@ -13,7 +13,7 @@ Index: examples/mimedefang-filter-openbs
  #
  # This program may be distributed under the terms of the GNU General
 @@ -20,7 +17,7 @@
- # MIMEDefang policy.  A good example would be 'defang-ad...@mydomain.com'
+ # MIMEDefang policy.A good example would be 'defang-ad...@mydomain.com'
  #***
  $AdminAddress = 'postmaster@localhost';
 -$AdminName = "MIMEDefang Administrator's Full Name";
@@ -22,7 +22,7 @@ Index: examples/mimedefang-filter-openbs
  #***
  # Set the e-mail address from which MIMEDefang quarantine warnings and
 @@ -28,7 +25,7 @@ $AdminName = "MIMEDefang Administrator's Full Name";
- # 'mimedef...@mydomain.com'.  Make sure to have an alias for this
+ # 'mimedef...@mydomain.com'.Make sure to have an alias for this
  # address if you want replies to it to work.
  #***
 -$DaemonAddress = 'mimedefang@localhost';
@@ -43,50 +43,7 @@ Index: examples/mimedefang-filter-openbs
  # Set various stupid things your mail client does below.
  #***
  
-@@ -137,6 +140,8 @@ sub filter_begin {
- if ($FoundVirus) {
-   md_graphdefang_log('virus', $VirusName, $RelayAddr);
-   md_syslog('warning', "Discarding because of virus $VirusName");
-+  # Uncomment to copy the message to quarantine before discarding it.
-+  # action_quarantine_entire_message();
-   return action_discard();
- }
- 
-@@ -180,10 +185,11 @@ sub filter {
-   return action_bounce("MIME type message/partial not accepted here");
- }
- 
--if (filter_bad_filename($entity)) {
--md_graphdefang_log('bad_filename', $fname, $type);
--  return action_drop_with_warning("An attachment named $fname was removed 
from this document as it\nconstituted a security hazard.  If you require this 
document, please

Re: devel/p5-Log-Any: Update to 1.710

[Giovanni Bechis]

On 8/21/21 3:56 PM, wen heping wrote:
> Hi,
> 
> Here is a patch for devel/p5-Log-Any to update to 1.710.
> It build well and passed all tests here on amd64-6.8 system.
>4 ports depends on it :
>www/p5-HTML-Mason
>   devel/p5-Search-Elasticsearch
>   devel/p5-Log-Any-Adapter-Callback
>   textproc/p5-LaTeX-Driver
>   All build well and passed all tests too.
> 
Committed, thanks.
 Giovanni

WIP update: mail/mimedefang

[Giovanni Bechis]

Hi,
MIMEDefang 2.85-rc1 has been released last week and 2.85 will be
released soon, now looking for testers.
Full changelog at 
https://github.com/The-McGrail-Foundation/MIMEDefang/blob/2.85-rc1/Changelog

 Cheers & Thanks
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile12 Jul 2019 20:47:30 -  1.51
+++ Makefile3 Aug 2021 21:10:13 -
@@ -2,12 +2,12 @@
 
 COMMENT=   mailfilter to identify and mark spam
 
-DISTNAME=  mimedefang-2.84
+DISTNAME=  MIMEDefang-2.85-rc1
+PKGNAME=   ${DISTNAME:L}
 CATEGORIES=mail
-REVISION=  0
 
-HOMEPAGE=  http://www.mimedefang.org/
-MASTER_SITES=  ${HOMEPAGE}static/
+HOMEPAGE=  https://www.mimedefang.org/
+MASTER_SITES=  ${HOMEPAGE}releases/
 
 MAINTAINER=Antoine Jacoutot 
 
@@ -17,10 +17,10 @@ PERMIT_PACKAGE= Yes
 WANTLIB += c m milter perl pthread
 
 BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS=   devel/p5-IO-stringy \
-   mail/p5-Mail-Tools \
+RUN_DEPENDS=   mail/p5-Mail-Tools \
mail/p5-MIME-tools \
security/p5-Digest-SHA1 \
+   security/p5-Crypt-OpenSSL-Random \
sysutils/p5-Unix-Syslog
 
 # useful optional dependencies
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo29 Mar 2018 20:52:15 -  1.19
+++ distinfo3 Aug 2021 21:10:13 -
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-2.84.tar.gz) = bRUxxwqQH83fnLmJ1Ii+r3isDMFtEb65gbmSABRsSEg=
-SIZE (mimedefang-2.84.tar.gz) = 371596
+SHA256 (MIMEDefang-2.85-rc1.tar.gz) = 
E0VSQqSwIF9O1Puerfzjsj6KLMBbG07z4Pr12AS6LoQ=
+SIZE (MIMEDefang-2.85-rc1.tar.gz) = 371038


signature.asc
Description: PGP signature

Re: WIP: Apache httpd vs LibreSSL

[Giovanni Bechis]

On Tue, May 18, 2021 at 01:21:25PM +0200, Theo Buehler wrote:
> On Tue, May 18, 2021 at 11:45:33AM +0200, Giovanni Bechis wrote:
> > Hi,
> > upcoming Apache httpd doesn't build with LibreSSL because it uses
> > EVP_PKEY_X25519 constants that are not defined on LibreSSL.
> > The following diff works, is it better to add EVP_PKEY_X constants
> > to evp.h instead ?
> 
> There is more code that would need to be added to libcrypto to make this
> work. We will likely have to add EVP_PKEY_X25519 at some point, but
> libcrypto is not ready. There are currently no plans for X448 support.
> 
> With your patch the call to EVP_PKEY_CTX_new_id() will fail. I would
> suggest disabling X25519 and X448 support as follows:
> 
final diff follows, Apache httpd 2.4.48 also fixes some CVE on mod_proxy
and mod_session.
Full Changelog at https://downloads.apache.org/httpd/CHANGES_2.4.48

ok ?

 Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.107
diff -u -p -r1.107 Makefile
--- Makefile13 Dec 2020 08:45:14 -  1.107
+++ Makefile1 Jun 2021 22:44:59 -
@@ -2,10 +2,9 @@
 
 COMMENT=   apache HTTP server
 
-V= 2.4.46
+V= 2.4.48
 DISTNAME=  httpd-${V}
 PKGNAME=   apache-httpd-${V}
-REVISION=  1
 
 CATEGORIES=www net
 
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo7 Aug 2020 15:15:37 -   1.35
+++ distinfo1 Jun 2021 22:44:59 -
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.46.tar.gz) = RLdZzpMtwJDA51wCELRIXr9pg0ZvuMobRGyBaOGhrsI=
-SIZE (httpd-2.4.46.tar.gz) = 9363314
+SHA256 (httpd-2.4.48.tar.gz) = MVwLxQIGuGb7F8LNwowZc3ZajVnKFouAKG6MsHfQUQ4=
+SIZE (httpd-2.4.48.tar.gz) = 9418226
Index: patches/patch-configure
===
RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
retrieving revision 1.20
diff -u -p -r1.20 patch-configure
--- patches/patch-configure 31 Mar 2020 14:30:33 -  1.20
+++ patches/patch-configure 1 Jun 2021 22:44:59 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.20 2020/03
 Index: configure
 --- configure.orig
 +++ configure
-@@ -3473,7 +3473,7 @@ do
+@@ -3474,7 +3474,7 @@ do
ap_last="${ap_cur}"
ap_cur=`eval "echo ${ap_cur}"`
  done
@@ -12,7 +12,7 @@ Index: configure
  
  
APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
-@@ -4679,7 +4679,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
+@@ -4680,7 +4680,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
  APR_INCLUDES=`$apr_config --includes`
  APR_VERSION=`$apr_config --version`
  apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
Index: patches/patch-modules_md_md_crypt_c
===
RCS file: patches/patch-modules_md_md_crypt_c
diff -N patches/patch-modules_md_md_crypt_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-modules_md_md_crypt_c 1 Jun 2021 22:44:59 -
@@ -0,0 +1,34 @@
+$OpenBSD$
+
+LibreSSL does not expose X25519 via EVP and has no X448 support.
+
+Index: modules/md/md_crypt.c
+--- modules/md/md_crypt.c.orig
 modules/md/md_crypt.c
+@@ -797,7 +797,7 @@ static apr_status_t gen_ec(md_pkey_t **ppkey, apr_pool
+ curve_nid = NID_X9_62_prime192v1;
+ }
+ #endif
+-#ifdef NID_X25519
++#if defined(NID_X25519) && !defined(LIBRESSL_VERSION_NUMBER)
+ if (NID_undef == curve_nid && !apr_strnatcasecmp("X25519", curve)) {
+ curve_nid = NID_X25519;
+ }
+@@ -814,7 +814,7 @@ static apr_status_t gen_ec(md_pkey_t **ppkey, apr_pool
+ *ppkey = make_pkey(p);
+ switch (curve_nid) {
+ 
+-#ifdef NID_X25519
++#if defined(NID_X25519) && !defined(LIBRESSL_VERSION_NUMBER)
+ case NID_X25519:
+ /* no parameters */
+ if (NULL == (ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_X25519, NULL))
+@@ -828,7 +828,7 @@ static apr_status_t gen_ec(md_pkey_t **ppkey, apr_pool
+ break;
+ #endif
+ 
+-#ifdef NID_X448
++#if defined(NID_X448) && !defined(LIBRESSL_VERSION_NUMBER)
+ case NID_X448:
+ /* no parameters */
+ if (NULL == (ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_X448, NULL))
Index: patches/patch-modules_proxy_mod_proxy_uwsgi_c
===
RCS file: patches/patch-modules_proxy_mod_proxy_uwsgi_c
diff -N patches/patch-modules_proxy_mod_proxy_uwsgi_c
--- patches/patch-modules_proxy_mod_proxy_uwsgi_c   10 Aug 2020 15:17:12 
-  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,32 +0,0 @@
-$OpenBSD: patch-modules_proxy_mod_proxy_uwsgi_c,v 1.3 2020/08/10 15:17

Re: postgrey: missing dependency?

[Giovanni Bechis]

On 6/1/21 11:37 PM, Mike Fischer wrote:
>> Am 01.06.2021 um 23:24 schrieb Giovanni Bechis :
>>
>> On 6/1/21 9:15 PM, Stuart Henderson wrote:
>>> On 2021/06/01 16:10, Mike Fischer wrote:
>>>> Friendly ping:
>>>>
>>>> Not that this is urgent, but this patch hasn’t made it into the ports tree 
>>>> yet AFAICT.
>>>>
>>>> Could someone with CVS write permission please ok and commit (or NAK) 
>>>> Giovanni's patch?
>>>
>>> It's already OK'd, giovanni@ has an account
>>>
>> I have committed the fix a couple of weeks ago.
>> https://cvsweb.openbsd.org/ports/devel/p5-Net-Server/Makefile?rev=1.25&content-type=text/x-cvsweb-markup
>>
>> Cheers
>>  Giovanni
>>
> 
> That fix was p5-Net-Server, not postgrey. Could you also update postgrey 
> please?
>
postgrey depends on p5-Net-Server, adding the missing dependency to 
p5-Net-Server automatically fixed postgrey as well. 

 
> Oh and I’m not sure I fully understand the semantics behind the CVS tags but 
> wouldn’t the tags OPENBSD_6_9 and possibly even OPENBSD_6_8 also be required 
> to get this to show up with pkg_add -u under OpenBSD 6.8/6.9?
> 
> Looking at 
> https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/mail/postgrey/Makefile seems 
> to indicate that. Also this shows that your patch to p5-Net-Server is not 
> visible on 6.9:
> $ pkg_info -Q p5-Net-Server 
> p5-Net-Server-2.009p0
> p5-Net-Server-SS-PreFork-0.05p2
> $ 
> 
development happens on -current, I do not think it's worth to backport this 
simple fix to 6.9 or 6.8.
"pkg_add p5-IO-Socket-INET6" is perfect workaround.

 Giovanni




OpenPGP_signature
Description: OpenPGP digital signature

Re: postgrey: missing dependency?

[Giovanni Bechis]

On 6/1/21 9:15 PM, Stuart Henderson wrote:
> On 2021/06/01 16:10, Mike Fischer wrote:
>> Friendly ping:
>>
>> Not that this is urgent, but this patch hasn’t made it into the ports tree 
>> yet AFAICT.
>>
>> Could someone with CVS write permission please ok and commit (or NAK) 
>> Giovanni's patch?
> 
> It's already OK'd, giovanni@ has an account
> 
I have committed the fix a couple of weeks ago.
https://cvsweb.openbsd.org/ports/devel/p5-Net-Server/Makefile?rev=1.25&content-type=text/x-cvsweb-markup

 Cheers
  Giovanni



OpenPGP_signature
Description: OpenPGP digital signature

Re: mail/py-authres, mail/py-spf, mail/py-policyd-spf - Remove?

[Giovanni Bechis]

On 5/26/21 4:59 AM, J Doe wrote:
> On 2021-05-25 10:44 p.m., Daniel Jakots wrote:
>> On Wed, 27 Nov 2019 11:00:07 +, Stuart Henderson
>>  wrote:
>>
>>> On 2019/11/26 19:08, Kurt Mosiejczuk wrote:
 These 3 are python2-only, and the only consumers are in a chain from
 one to the next.  (py-policyd-spf needs py-spf which needs
 py-authres).

 Is anyone using these?

 Any objections to removing them?

 --Kurt
    
>>>
>>> I don't use them (I don't think SPF is really useful) but
>>> py-policyd-spf is the main recommended "standalone" implementation of
>>> SPF for Postfix (as opposed to being part of a much more complex
>>> system like rspamd). So if anybody is using them there's not much
>>> alternative (there is a similarly named perl program but it's not
>>> very good).
>>>
>>
>> In 2017 Giovanni (added in Cc:) sent a wip diff for mail/py-policyd-spf.
>> This never went in and then in January 2019 he imported
>> mail/postfix-policyd-spf-perl. Is that the perl program you had in mind
>> Stuart?
>>
>> I assume since Giovanni imported the perl thing, he doesn't use the
>> python one anymore.
>>
>> Given there's been a WIP diff to update py-policyd-spf since 2017 and
>> it never went in, it seems there's not much interest for it. The
>> proposal from kmos to remove it didn't seem to have shocked anyone into
>> maintaining it either.
>>
>> What do you think about the situation Giovanni?
>>
>> (I looked at it because I recently added spf support to my postfix
>> setup, and I did it through postfix-policyd-spf-perl).
>>
>>
>> Cheers,
>> Daniel
> 
> Hello,
> 
> Does the postfix-policyd-spf-perl version provide identical functionality to 
> the Python one ?
> 
No,
the Python version can be configured with several options, the Perl one can 
just accept/reject/tempfail.
Last commit of the Perl code is from 3 years ago, I do not think anyone will 
improve that code.

 Giovanni



OpenPGP_signature
Description: OpenPGP digital signature

WIP: Apache httpd vs LibreSSL

[Giovanni Bechis]

Hi,
upcoming Apache httpd doesn't build with LibreSSL because it uses
EVP_PKEY_X25519 constants that are not defined on LibreSSL.
The following diff works, is it better to add EVP_PKEY_X constants
to evp.h instead ?
 Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.107
diff -u -p -r1.107 Makefile
--- Makefile13 Dec 2020 08:45:14 -  1.107
+++ Makefile18 May 2021 09:37:34 -
@@ -2,10 +2,9 @@
 
 COMMENT=   apache HTTP server
 
-V= 2.4.46
+V= 2.4.48
 DISTNAME=  httpd-${V}
 PKGNAME=   apache-httpd-${V}
-REVISION=  1
 
 CATEGORIES=www net
 
@@ -20,7 +19,8 @@ WANTLIB += apr-1 aprutil-1 brotlicommon 
 WANTLIB += db expat iconv jansson lzma m nghttp2 pcre pthread ssl
 WANTLIB += xml2 z
 
-MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/}
+# MASTER_SITES=${MASTER_SITE_APACHE:=httpd/}
+MASTER_SITES=  https://dist.apache.org/repos/dist/dev/httpd/
 
 NO_TEST=   Yes
 
Index: distinfo
===
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo7 Aug 2020 15:15:37 -   1.35
+++ distinfo18 May 2021 09:37:34 -
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.4.46.tar.gz) = RLdZzpMtwJDA51wCELRIXr9pg0ZvuMobRGyBaOGhrsI=
-SIZE (httpd-2.4.46.tar.gz) = 9363314
+SHA256 (httpd-2.4.48.tar.gz) = MVwLxQIGuGb7F8LNwowZc3ZajVnKFouAKG6MsHfQUQ4=
+SIZE (httpd-2.4.48.tar.gz) = 9418226
Index: patches/patch-configure
===
RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
retrieving revision 1.20
diff -u -p -r1.20 patch-configure
--- patches/patch-configure 31 Mar 2020 14:30:33 -  1.20
+++ patches/patch-configure 18 May 2021 09:37:34 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.20 2020/03
 Index: configure
 --- configure.orig
 +++ configure
-@@ -3473,7 +3473,7 @@ do
+@@ -3474,7 +3474,7 @@ do
ap_last="${ap_cur}"
ap_cur=`eval "echo ${ap_cur}"`
  done
@@ -12,7 +12,7 @@ Index: configure
  
  
APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
-@@ -4679,7 +4679,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
+@@ -4680,7 +4680,7 @@ APR_INCLUDEDIR=`$apr_config --includedir`
  APR_INCLUDES=`$apr_config --includes`
  APR_VERSION=`$apr_config --version`
  apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
Index: patches/patch-modules_md_md_crypt_c
===
RCS file: patches/patch-modules_md_md_crypt_c
diff -N patches/patch-modules_md_md_crypt_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-modules_md_md_crypt_c 18 May 2021 09:37:34 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: modules/md/md_crypt.c
+--- modules/md/md_crypt.c.orig
 modules/md/md_crypt.c
+@@ -71,6 +71,11 @@
+ #include 
+ #endif
+ 
++#if defined(LIBRESSL_VERSION_NUMBER)
++#define EVP_PKEY_X25519 NID_X25519
++#define EVP_PKEY_X448 NID_X448
++#endif
++
+ static int initialized;
+ 
+ struct md_pkey_t {
Index: patches/patch-modules_proxy_mod_proxy_uwsgi_c
===
RCS file: patches/patch-modules_proxy_mod_proxy_uwsgi_c
diff -N patches/patch-modules_proxy_mod_proxy_uwsgi_c
--- patches/patch-modules_proxy_mod_proxy_uwsgi_c   10 Aug 2020 15:17:12 
-  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,32 +0,0 @@
-$OpenBSD: patch-modules_proxy_mod_proxy_uwsgi_c,v 1.3 2020/08/10 15:17:12 
giovanni Exp $
-
-Avoid NULL pointer dereferences for empty environment variable values
-PR 64598
-
-Index: modules/proxy/mod_proxy_uwsgi.c
 modules/proxy/mod_proxy_uwsgi.c.orig
-+++ modules/proxy/mod_proxy_uwsgi.c
-@@ -175,7 +175,7 @@ static int uwsgi_send_headers(request_rec *r, proxy_co
- env = (apr_table_entry_t *) env_table->elts;
- 
- for (j = 0; j < env_table->nelts; ++j) {
--headerlen += 2 + strlen(env[j].key) + 2 + strlen(env[j].val);
-+headerlen += 2 + strlen(env[j].key) + 2 + (env[j].val ? 
strlen(env[j].val) : 0);
- }
- 
- pktsize = headerlen - 4;
-@@ -198,10 +198,12 @@ static int uwsgi_send_headers(request_rec *r, proxy_co
- memcpy(ptr, env[j].key, keylen);
- ptr += keylen;
- 
--vallen = strlen(env[j].val);
-+vallen = env[j].val ? strlen(env[j].val) : 0;
- *ptr++ = (apr_byte_t) (vallen & 0xff);
- *ptr++ = (apr_byte_t) ((vallen >> 8) & 0xff);
--memcpy(ptr, env[j].val, vallen);
-+if (env[j].val) {
-+memcpy(ptr, env[j].val, vallen);
-+}
- ptr += vallen;
- }
- 
Index: patches/patch-modules_ssl_ssl_engine_init_c
===
RCS file: 
/cvs/ports/www/apache-httpd/patches/pat

Re: postgrey: missing dependency?

[Giovanni Bechis]

On Fri, May 07, 2021 at 12:38:25AM +0200, Mike Fischer wrote:
> Hi!
> 
> In /var/log/maillog I saw this:
> May  6 20:07:21 to postgrey[41981]: FATAL: Can't locate IO/Socket/INET6.pm in 
> @INC (you may need to install the IO::Socket::INET6 module) (@INC contains: 
> /usr/local/libdata/perl5/site_perl/amd64-openbsd 
> /usr/local/libdata/perl5/site_perl /usr/libdata/perl5/amd64-openbsd 
> /usr/libdata/perl5) at /usr/local/libdata/perl5/site_perl/Net/Server/Proto.pm 
> line 118.
> 
> Environment:
> 
> OpenBSD 6.9-stable GENERIC.MP#473 amd64
> 
> postgrey-1.37p1
> 
> Details:
> 
> I first noticed this today after upgrading a server to OpenBSD 6.9 but the 
> issue might have existed before that. Though I checked on an 6.8 installation 
> and it does not seem to throw this error when (re)starting postgrey. But that 
> might be because that machine has imapsync-1.945 installed which lists 
> p5-IO-Socket-INET6 as a dependency.
> 
This diff fixes the issue.
netserver(1) is broken as well if you try to run it as "netserver port 
8080/IPv6".

ok ?

 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Net-Server/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile3 Jul 2020 21:45:03 -   1.24
+++ Makefile15 May 2021 09:51:49 -
@@ -6,12 +6,13 @@ MODULES = cpan
 PKG_ARCH = *
 DISTNAME = Net-Server-2.009
 CATEGORIES =   devel net
-REVISION = 0
+REVISION = 1
 
 # perl
 PERMIT_PACKAGE =   Yes
 
 MODCPAN_EXAMPLES = Yes
+RUN_DEPENDS =  net/p5-IO-Socket-INET6
 TEST_DEPENDS = devel/p5-IO-Multiplex
 
 .include 


signature.asc
Description: PGP signature

Re: ruby27 vs Puppet

[Giovanni Bechis]

On Sun, Mar 14, 2021 at 05:36:55PM +0100, Giovanni Bechis wrote:
> On Sat, Mar 13, 2021 at 02:33:48PM +0100, Klemens Nanni wrote:
> > On Sat, Mar 13, 2021 at 09:05:18AM +0100, Giovanni Bechis wrote:
> > > Hi,
> > > after updating to current I receive daily warnings that my Puppet client 
> > > is not running.
> > > This is because ruby27 starts programs in a different way then ruby26.
> > > 
> > > On OpenBSD 6.8 I have:
> > > $ ps auxww | grep puppet
> > > root 63876  0.0 10.2 82024 51836 ??  S  Fri05PM0:05.56 
> > > /usr/local/bin/ruby26 /usr/local/bin/puppet agent
> > > snb  29563  0.0  0.2   288  1252 p0  S+p 8:59AM0:00.00 grep 
> > > puppet
> > > 
> > > on OpenBSD 6.9-current:
> > > $ ps auxww | grep puppet
> > > root 91047  0.0  1.4 108760 56900 ??  S  Fri07PM0:05.86 
> > > /usr/local/bin/ruby27 -W0 /usr/local/bin/puppet agent
> > > root 81078  0.0  0.0   632  1544 p0  S+p 9:00AM0:00.01 grep 
> > > puppet
> > Not sure, I think this is because sebastia added `-W0' in 5/Makefile:
> > 
> > revision 1.33
> > date: 2021/01/18 22:26:11;  author: sebastia;  state: Exp;  lines: +4 
> > -2;  commitid: V8KuIdf4R32pgNMt;
> > suppress the huge number of deprecation/obsolete warnings since Ruby 2.7
> > 
> > > The "-W0" parameter breaks "rcctl ls failed" and a daily warning is sent.
> > > Is this a known issue ? I think other softwares may be affected.
> > I did not notice it because I'm using Puppet 6, but also without the
> > rc script, i.e. in a masterless setup.
> > 
> > I think the diff below should have been part of sebastia's commit,
> > it is untested however;  can you give this a try?
> > 
> That diff fixes it.
> ok giovanni@ if sebastia@ agrees.
> 
In the previous diff we forgot about puppetmaster that now has the same problem,
ok for this diff ?

 Giovanni

Index: 5/Makefile
===
RCS file: /cvs/ports/sysutils/ruby-puppet/5/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- 5/Makefile  16 Mar 2021 18:43:40 -  1.37
+++ 5/Makefile  4 May 2021 09:03:50 -
@@ -3,7 +3,7 @@
 PORTROACH= limit:^5
 
 VERSION=   5.5.22
-REVISION=  7
+REVISION=  8
 
 RUN_DEPENDS+=  databases/ruby-hiera3,${MODRUBY_FLAVOR} \
devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
Index: pkg/puppetmaster.rc
===
RCS file: /cvs/ports/sysutils/ruby-puppet/pkg/puppetmaster.rc,v
retrieving revision 1.2
diff -u -p -r1.2 puppetmaster.rc
--- pkg/puppetmaster.rc 11 Jan 2018 19:27:10 -  1.2
+++ pkg/puppetmaster.rc 4 May 2021 09:03:50 -
@@ -6,7 +6,7 @@ daemon="${TRUEPREFIX}/bin/puppet master"
 
 . /etc/rc.d/rc.subr
 
-pexp="${RUBY} ${daemon}${daemon_flags:+ ${daemon_flags}}"
+pexp="${RUBY} -W0 ${daemon}${daemon_flags:+ ${daemon_flags}}"
 rc_reload=NO
 
 rc_cmd $1


signature.asc
Description: PGP signature

bugfix update: mail/p5-Mail-SpamAssassin

[Giovanni Bechis]

Bugfix update to latest version, fixes a couple of bugs.
Announcement available at: 
https://svn.apache.org/repos/asf/spamassassin/branches/3.4/build/announcements/3.4.6.txt

ok for 6.9 and 6.8 ?

 Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.116
diff -u -p -r1.116 Makefile
--- Makefile25 Mar 2021 07:42:07 -  1.116
+++ Makefile12 Apr 2021 10:57:37 -
@@ -2,10 +2,10 @@
 
 COMMENT=   mailfilter to identify and mark spam
 
-VER=   3.4.5
+VER=   3.4.6
 DISTNAME=  Mail-SpamAssassin-${VER}
 PKGNAME=   p5-${DISTNAME}
-RULESNAME= Mail-SpamAssassin-rules-${VER}.r1887800.tgz
+RULESNAME= Mail-SpamAssassin-rules-${VER}.r1888502.tgz
 CATEGORIES=mail perl5
 
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo25 Mar 2021 07:42:07 -  1.42
+++ distinfo12 Apr 2021 10:57:37 -
@@ -1,4 +1,4 @@
-SHA256 (Mail-SpamAssassin-3.4.5.tar.bz2) = 
Z+34cSavSGnCpCcg/D27NM4lKFRJ7x8/watxLS4KVGM=
-SHA256 (Mail-SpamAssassin-rules-3.4.5.r1887800.tgz) = 
JpCqExt5eIunVgMK+HRt1FMassDLVsD+Rp9Y2d0EOq0=
-SIZE (Mail-SpamAssassin-3.4.5.tar.bz2) = 6167088
-SIZE (Mail-SpamAssassin-rules-3.4.5.r1887800.tgz) = 368878
+SHA256 (Mail-SpamAssassin-3.4.6.tar.bz2) = 
vEh18+S7WXnwwQKDITpRLEyWRiIK4BMqeMjjr5R4lhA=
+SHA256 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 
se/NxX5rEAc1hV4k7oORsIVzJ9cOHh0sJ1fV9m6KHOY=
+SIZE (Mail-SpamAssassin-3.4.6.tar.bz2) = 6166807
+SIZE (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 369768


signature.asc
Description: PGP signature

update mail/p5-Mail-SpamAssassin on 6.8

[Giovanni Bechis]

Diff to update SpamAssassin to latest version (that fixes a CVE) follows.
It's the same diff I have committed to -current.
Ok to commit it on 6.8 ?

 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile
--- Makefile30 Jan 2020 07:54:00 -  1.115
+++ Makefile25 Mar 2021 07:36:37 -
@@ -2,10 +2,10 @@
 
 COMMENT=   mailfilter to identify and mark spam
 
-VER=   3.4.4
+VER=   3.4.5
 DISTNAME=  Mail-SpamAssassin-${VER}
 PKGNAME=   p5-${DISTNAME}
-RULESNAME= Mail-SpamAssassin-rules-${VER}.r1873061.tgz
+RULESNAME= Mail-SpamAssassin-rules-${VER}.r1887800.tgz
 CATEGORIES=mail perl5
 
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
retrieving revision 1.41
diff -u -p -r1.41 distinfo
--- distinfo30 Jan 2020 07:54:00 -  1.41
+++ distinfo25 Mar 2021 07:36:37 -
@@ -1,4 +1,4 @@
-SHA256 (Mail-SpamAssassin-3.4.4.tar.bz2) = 
TivHniTNuz2CYubsT1uz3eZw3pyqpznVDGmLbUWsRT0=
-SHA256 (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = 
1MvZD6IrkQTuCV0f4IqdHNOzoPYCLFIhTAJUQ///4kE=
-SIZE (Mail-SpamAssassin-3.4.4.tar.bz2) = 2741290
-SIZE (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = 315930
+SHA256 (Mail-SpamAssassin-3.4.5.tar.bz2) = 
Z+34cSavSGnCpCcg/D27NM4lKFRJ7x8/watxLS4KVGM=
+SHA256 (Mail-SpamAssassin-rules-3.4.5.r1887800.tgz) = 
JpCqExt5eIunVgMK+HRt1FMassDLVsD+Rp9Y2d0EOq0=
+SIZE (Mail-SpamAssassin-3.4.5.tar.bz2) = 6167088
+SIZE (Mail-SpamAssassin-rules-3.4.5.r1887800.tgz) = 368878
Index: patches/patch-Makefile_PL
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v
retrieving revision 1.14
diff -u -p -r1.14 patch-Makefile_PL
--- patches/patch-Makefile_PL   18 Sep 2018 06:42:57 -  1.14
+++ patches/patch-Makefile_PL   25 Mar 2021 07:36:37 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_PL,v 1.14 2018/
 Index: Makefile.PL
 --- Makefile.PL.orig
 +++ Makefile.PL
-@@ -856,7 +856,7 @@ sub MY::install {
+@@ -857,7 +857,7 @@ sub MY::install {
  
foreach (@code) {
  # Add our install targets as a dependency to all top-level install targets
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v
retrieving revision 1.38
diff -u -p -r1.38 PLIST
--- pkg/PLIST   12 Dec 2019 16:10:34 -  1.38
+++ pkg/PLIST   25 Mar 2021 07:36:37 -
@@ -137,6 +137,7 @@ ${P5SITE}/Mail/SpamAssassin/Util/TieOneS
 ${P5SITE}/Mail/SpamAssassin/Util/TinyRedis.pm
 ${P5SITE}/spamassassin-run.pod
 @man man/man1/sa-awl.1
+@man man/man1/sa-check_spamd.1
 @man man/man1/sa-compile.1
 @man man/man1/sa-learn.1
 @man man/man1/sa-update.1
@@ -324,6 +325,7 @@ share/spamassassin/30_text_pt_br.cf
 share/spamassassin/50_scores.cf
 share/spamassassin/60_adsp_override_dkim.cf
 share/spamassassin/60_awl.cf
+share/spamassassin/60_bayes_stopwords.cf
 share/spamassassin/60_shortcircuit.cf
 share/spamassassin/60_txrep.cf
 share/spamassassin/60_whitelist.cf


signature.asc
Description: PGP signature

Re: ruby27 vs Puppet

[Giovanni Bechis]

On Sat, Mar 13, 2021 at 02:33:48PM +0100, Klemens Nanni wrote:
> On Sat, Mar 13, 2021 at 09:05:18AM +0100, Giovanni Bechis wrote:
> > Hi,
> > after updating to current I receive daily warnings that my Puppet client is 
> > not running.
> > This is because ruby27 starts programs in a different way then ruby26.
> > 
> > On OpenBSD 6.8 I have:
> > $ ps auxww | grep puppet
> > root 63876  0.0 10.2 82024 51836 ??  S  Fri05PM0:05.56 
> > /usr/local/bin/ruby26 /usr/local/bin/puppet agent
> > snb  29563  0.0  0.2   288  1252 p0  S+p 8:59AM0:00.00 grep 
> > puppet
> > 
> > on OpenBSD 6.9-current:
> > $ ps auxww | grep puppet
> > root 91047  0.0  1.4 108760 56900 ??  S  Fri07PM0:05.86 
> > /usr/local/bin/ruby27 -W0 /usr/local/bin/puppet agent
> > root 81078  0.0  0.0   632  1544 p0  S+p 9:00AM0:00.01 grep 
> > puppet
> Not sure, I think this is because sebastia added `-W0' in 5/Makefile:
> 
>   revision 1.33
>   date: 2021/01/18 22:26:11;  author: sebastia;  state: Exp;  lines: +4 
> -2;  commitid: V8KuIdf4R32pgNMt;
>   suppress the huge number of deprecation/obsolete warnings since Ruby 2.7
> 
> > The "-W0" parameter breaks "rcctl ls failed" and a daily warning is sent.
> > Is this a known issue ? I think other softwares may be affected.
> I did not notice it because I'm using Puppet 6, but also without the
> rc script, i.e. in a masterless setup.
> 
> I think the diff below should have been part of sebastia's commit,
> it is untested however;  can you give this a try?
> 
That diff fixes it.
ok giovanni@ if sebastia@ agrees.

 Cheers & Thanks
   Giovanni


> 
> Index: 5/Makefile
> ===
> RCS file: /cvs/ports/sysutils/ruby-puppet/5/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- 5/Makefile2 Feb 2021 20:10:09 -   1.36
> +++ 5/Makefile13 Mar 2021 13:26:22 -
> @@ -3,7 +3,7 @@
>  PORTROACH=   limit:^5
>  
>  VERSION= 5.5.22
> -REVISION=6
> +REVISION=7
>  
>  RUN_DEPENDS+=databases/ruby-hiera3,${MODRUBY_FLAVOR} \
>   devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
> Index: 6/Makefile
> ===
> RCS file: /cvs/ports/sysutils/ruby-puppet/6/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- 6/Makefile17 Feb 2021 18:45:58 -  1.16
> +++ 6/Makefile13 Mar 2021 13:26:20 -
> @@ -3,6 +3,7 @@
>  PORTROACH=   limit:^6
>  
>  VERSION= 6.21.1
> +REVISION=0
>  
>  MAINTAINER=  Klemens Nanni 
>  
> @@ -32,5 +33,7 @@ do-install:
>   mv ${WRKINST}${SYSCONFDIR}/puppetlabs 
> ${PREFIX}/${MODRUBY_RELEXAMPLEDIR}-puppet
>   ${INSTALL_DATA} ${WRKSRC}/conf/*.conf \
>   ${PREFIX}/${MODRUBY_RELEXAMPLEDIR}-puppet/puppet/
> + # Suppress a huge number of Ruby deprecation/obsolete warnings
> + sed -i -e "s/ruby${MODRUBY_BINREV}/ruby${MODRUBY_BINREV} -W0/" 
> ${PREFIX}/bin/puppet
>  
>  .include 
> Index: pkg/puppet.rc
> ===
> RCS file: /cvs/ports/sysutils/ruby-puppet/pkg/puppet.rc,v
> retrieving revision 1.3
> diff -u -p -r1.3 puppet.rc
> --- pkg/puppet.rc 11 Jan 2018 19:27:10 -  1.3
> +++ pkg/puppet.rc 13 Mar 2021 13:26:49 -
> @@ -6,7 +6,7 @@ daemon="${TRUEPREFIX}/bin/puppet agent"
>  
>  . /etc/rc.d/rc.subr
>  
> -pexp="${RUBY} ${daemon}${daemon_flags:+ ${daemon_flags}}"
> +pexp="${RUBY} -W0 ${daemon}${daemon_flags:+ ${daemon_flags}}"
>  rc_reload=NO
>  
>  rc_cmd $1
> 


signature.asc
Description: PGP signature

ruby27 vs Puppet

[Giovanni Bechis]

Hi,
after updating to current I receive daily warnings that my Puppet client is not 
running.
This is because ruby27 starts programs in a different way then ruby26.

On OpenBSD 6.8 I have:
$ ps auxww | grep puppet
root 63876  0.0 10.2 82024 51836 ??  S  Fri05PM0:05.56 
/usr/local/bin/ruby26 /usr/local/bin/puppet agent
snb  29563  0.0  0.2   288  1252 p0  S+p 8:59AM0:00.00 grep puppet

on OpenBSD 6.9-current:
$ ps auxww | grep puppet
root 91047  0.0  1.4 108760 56900 ??  S  Fri07PM0:05.86 
/usr/local/bin/ruby27 -W0 /usr/local/bin/puppet agent
root 81078  0.0  0.0   632  1544 p0  S+p 9:00AM0:00.01 grep puppet

The "-W0" parameter breaks "rcctl ls failed" and a daily warning is sent.
Is this a known issue ? I think other softwares may be affected.

 Cheers
  Giovanni

OpenBSD 6.9-beta (GENERIC.MP) #396: Thu Mar 11 19:15:56 MST 2021
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 4278124544 (4079MB)
avail mem = 4133093376 (3941MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xe0010 (248 entries)
bios0: vendor Phoenix Technologies LTD version "6.00" date 12/12/2018
bios0: VMware, Inc. VMware Virtual Platform
acpi0 at bios0: ACPI 4.0
acpi0: sleep states S0 S1 S4 S5
acpi0: tables DSDT FACP BOOT APIC MCFG SRAT HPET WAET
acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S8F0(S3) 
S16F(S3) S18F(S3) S22F(S3) S23F(S3) S24F(S3) S25F(S3) PE40(S3) S1F0(S3) 
PE50(S3) S1F0(S3) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: AMD Opteron(tm) Processor 4386, 3100.24 MHz, 15-10-00
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,x2APIC,POPCNT,AES,XSAVE,AVX,F16C,HV,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,XOP,FMA4,TBM,ITSC,BMI1
cpu0: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB 64b/line 
16-way L2 cache
cpu0: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu0: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 65MHz
cpu1 at mainbus0: apid 2 (application processor)
cpu1: AMD Opteron(tm) Processor 4386, 3100.08 MHz, 15-10-00
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,x2APIC,POPCNT,AES,XSAVE,AVX,F16C,HV,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,XOP,FMA4,TBM,ITSC,BMI1
cpu1: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB 64b/line 
16-way L2 cache
cpu1: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu1: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu1: disabling user TSC (skew=-12705)
cpu1: smt 0, core 0, package 2
cpu2 at mainbus0: apid 4 (application processor)
cpu2: AMD Opteron(tm) Processor 4386, 3100.08 MHz, 15-10-00
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,x2APIC,POPCNT,AES,XSAVE,AVX,F16C,HV,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,XOP,FMA4,TBM,ITSC,BMI1
cpu2: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB 64b/line 
16-way L2 cache
cpu2: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu2: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu2: disabling user TSC (skew=-10069)
cpu2: smt 0, core 0, package 4
cpu3 at mainbus0: apid 6 (application processor)
cpu3: AMD Opteron(tm) Processor 4386, 3100.08 MHz, 15-10-00
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,x2APIC,POPCNT,AES,XSAVE,AVX,F16C,HV,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,XOP,FMA4,TBM,ITSC,BMI1
cpu3: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB 64b/line 
16-way L2 cache
cpu3: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu3: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu3: disabling user TSC (skew=-12541)
cpu3: smt 0, core 0, package 6
ioapic0 at mainbus0: apid 1 pa 0xfec0, version 11, 24 pins
acpimcfg0 at acpi0
acpimcfg0: addr 0xf000, bus 0-127
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpipci0 at acpi0 PCI0: 0x 0x0011 0x0001
acpicmos0 at acpi0
"PNP0A05" at acpi0 not configured
acpiac0 at acpi0: AC unit online
acpicpu0 at acpi0: C1(@1 halt!)
acpicpu1 at acpi0: C1(@1 halt!)
acpicpu2 at acpi0: C1(@

Re: Puppet 5.5 broken on current

[Giovanni Bechis]

On 1/15/21 12:56 PM, Klemens Nanni wrote:
> On Fri, Jan 15, 2021 at 12:49:00PM +0100, Klemens Nanni wrote:
>> On Fri, Jan 15, 2021 at 12:18:21AM -0500, George Koehler wrote:
>>> On Thu, 14 Jan 2021 18:39:13 +0100
>>> Giovanni Bechis  wrote:
>>>
>>>> Attached is a wip port of ruby-sync (created with portgen in few minutes),
>>>> puppet 5.5 now works even if with a lot of deprecated warnings...
>>>
>>> My attachment is the port of ruby-sync with these changes:
>>>  - shorter "COMMENT = two-phase lock with a counter"
>>>  - "CATEGORIES = devel"
>>>  - "PERMIT_PACKAGE = Yes"
>>>  - "MODRUBY_TEST = rake" so "make test" runs the test target in the
>>>Rakefile, but it runs all zero tests.
>>>
>>> I don't know if we should also restrict the port to ruby>=2.7 only?
>> OK kn for your tarball.
>>
>> We only need it for 2.7 and 2.6 ought to go, so just add
>> "devel/ruby-sync" to devel/Makefile for hooking up the default ruby
>> version (2.7) only, do not add "devel/ruby-sync,ruby27" or
>> "devel/ruby-sync,ruby26".
>>
>>> Or we might not import ruby-sync if we move puppet 5 on ruby 2.6.
>> That sounds like a step backwards.
>>
>>> I have not yet built sysutils/ruby-puppet/5.  One should at least add
>>> the dependency on devel/ruby-sync and fix the typo ${SYSCONFIDR} in
>>> patch-ext_rack_config_ru
>> I have no actual Puppet 5 nodes anymore, but the diff below seems to fix
>> old puppet with your port in:
>>
>> Giovanni, could you try this with your setup?
>> If that works: Feedback? OK?
> Updated diff after I fixed the SYSCONFIDR typo, thanks gkoehler!
> 
> 
ok giovanni@ for import and for this diff.
 Thanks
  Giovanni

Re: Puppet 5.5 broken on current

[Giovanni Bechis]

On 1/15/21 11:52 AM, Stuart Henderson wrote:
> On 2021/01/14 18:39, Giovanni Bechis wrote:
>> On 1/14/21 5:21 PM, Giovanni Bechis wrote:
>>> On 1/14/21 5:14 PM, Jeremy Evans wrote:
>>>> On Thu, Jan 14, 2021 at 12:01 AM Klemens Nanni  wrote:
>>>>
>>>>> On Thu, Jan 14, 2021 at 08:46:26AM +0100, Giovanni Bechis wrote:
>>>>>> Hi,
>>>>>> on current (packages as of today) Puppet cannot start anymore,
>>>>>> the error is the following:
>>>>>>
>>>>>> [~]$ doas puppet agent -t
>>>>>> /usr/local/lib/ruby/site_ruby/2.7/puppet/util.rb:461: warning:
>>>>> URI.escape is obsolete
>>>>>> cannot load such file -- sync
>>>>> Reads like switching ruby's default version from 2.6 to 2.7 caused this.
>>>>>
>>>>> You could try building Puppet 5.5 with Ruby 2.6 altough most of its
>>>>> 2.6 flavored dependencies have already been unhooked, not sure how you
>>>>> get with this.
>>>>>
>>>>
>>>> Building the port for Ruby 2.6 should work fine if you manually specify
>>>> MODRUBY_REV:
>>>>
>>>> MODRUBY_REV=2.6 make package
>>>>
>>>> You'll want to do this for both facter and ruby-puppet/5.
>>>>
>>>>
>>>>> Perhaps patching `URI.escape' with whatever superseeded it is the way to
>>>>> go here.
>>>>>
>>>>
>>>> The URI.escape issue is just a warning in 2.7.  It will break in Ruby 3.0,
>>>> though.
>>>>
>>> URI.escape is just a warning, I think the real problem is "cannot load such 
>>> file -- sync".
>>> sync gem has been removed from Ruby 2.7, I think it should be ported.
>>> https://docs.ruby-lang.org/en/2.7.0/NEWS.html#label-Compatibility+issues+-28excluding+feature+bug+fixes-29
>>>
>> Attached is a wip port of ruby-sync (created with portgen in few minutes), 
>> puppet 5.5 now works even if with a lot of deprecated warnings
>> like:
>> /usr/local/lib/ruby/site_ruby/2.7/puppet/util.rb:461: warning: URI.escape is 
>> obsolete
>> /usr/local/lib/ruby/site_ruby/2.7/puppet/indirector/request.rb:283: warning: 
>> URI.unescape is obsolete
>> /usr/local/lib/ruby/site_ruby/2.7/puppet/file_system/file_impl.rb:80: 
>> warning: Using the last argument as keyword parameters is deprecated
>>
>> I do not know if it's worth to silence them or not.
> 
> This is a good hint that users should be looking at updating to newer
> puppet ;)
> 
Puppet6 agent works but there is no Puppet6 master port atm.
I think that similar warnings will be emitted if starting puppetmaster 5.5 on 
Ruby2.7.

 Giovanni

Re: Puppet 5.5 broken on current

[Giovanni Bechis]

On 1/14/21 5:21 PM, Giovanni Bechis wrote:
> On 1/14/21 5:14 PM, Jeremy Evans wrote:
>> On Thu, Jan 14, 2021 at 12:01 AM Klemens Nanni  wrote:
>>
>>> On Thu, Jan 14, 2021 at 08:46:26AM +0100, Giovanni Bechis wrote:
>>>> Hi,
>>>> on current (packages as of today) Puppet cannot start anymore,
>>>> the error is the following:
>>>>
>>>> [~]$ doas puppet agent -t
>>>> /usr/local/lib/ruby/site_ruby/2.7/puppet/util.rb:461: warning:
>>> URI.escape is obsolete
>>>> cannot load such file -- sync
>>> Reads like switching ruby's default version from 2.6 to 2.7 caused this.
>>>
>>> You could try building Puppet 5.5 with Ruby 2.6 altough most of its
>>> 2.6 flavored dependencies have already been unhooked, not sure how you
>>> get with this.
>>>
>>
>> Building the port for Ruby 2.6 should work fine if you manually specify
>> MODRUBY_REV:
>>
>> MODRUBY_REV=2.6 make package
>>
>> You'll want to do this for both facter and ruby-puppet/5.
>>
>>
>>> Perhaps patching `URI.escape' with whatever superseeded it is the way to
>>> go here.
>>>
>>
>> The URI.escape issue is just a warning in 2.7.  It will break in Ruby 3.0,
>> though.
>>
> URI.escape is just a warning, I think the real problem is "cannot load such 
> file -- sync".
> sync gem has been removed from Ruby 2.7, I think it should be ported.
> https://docs.ruby-lang.org/en/2.7.0/NEWS.html#label-Compatibility+issues+-28excluding+feature+bug+fixes-29
> 
Attached is a wip port of ruby-sync (created with portgen in few minutes), 
puppet 5.5 now works even if with a lot of deprecated warnings
like:
/usr/local/lib/ruby/site_ruby/2.7/puppet/util.rb:461: warning: URI.escape is 
obsolete
/usr/local/lib/ruby/site_ruby/2.7/puppet/indirector/request.rb:283: warning: 
URI.unescape is obsolete
/usr/local/lib/ruby/site_ruby/2.7/puppet/file_system/file_impl.rb:80: warning: 
Using the last argument as keyword parameters is deprecated

I do not know if it's worth to silence them or not.

 Giovanni 


ruby-sync.tgz
Description: application/compressed-tar

Re: Puppet 5.5 broken on current

[Giovanni Bechis]

On 1/14/21 5:14 PM, Jeremy Evans wrote:
> On Thu, Jan 14, 2021 at 12:01 AM Klemens Nanni  wrote:
> 
>> On Thu, Jan 14, 2021 at 08:46:26AM +0100, Giovanni Bechis wrote:
>>> Hi,
>>> on current (packages as of today) Puppet cannot start anymore,
>>> the error is the following:
>>>
>>> [~]$ doas puppet agent -t
>>> /usr/local/lib/ruby/site_ruby/2.7/puppet/util.rb:461: warning:
>> URI.escape is obsolete
>>> cannot load such file -- sync
>> Reads like switching ruby's default version from 2.6 to 2.7 caused this.
>>
>> You could try building Puppet 5.5 with Ruby 2.6 altough most of its
>> 2.6 flavored dependencies have already been unhooked, not sure how you
>> get with this.
>>
> 
> Building the port for Ruby 2.6 should work fine if you manually specify
> MODRUBY_REV:
> 
> MODRUBY_REV=2.6 make package
> 
> You'll want to do this for both facter and ruby-puppet/5.
> 
> 
>> Perhaps patching `URI.escape' with whatever superseeded it is the way to
>> go here.
>>
> 
> The URI.escape issue is just a warning in 2.7.  It will break in Ruby 3.0,
> though.
> 
URI.escape is just a warning, I think the real problem is "cannot load such 
file -- sync".
sync gem has been removed from Ruby 2.7, I think it should be ported.
https://docs.ruby-lang.org/en/2.7.0/NEWS.html#label-Compatibility+issues+-28excluding+feature+bug+fixes-29

 Giovanni

Re: NEW: mail/dcc

[Giovanni Bechis]

On 1/14/21 9:57 AM, Stuart Henderson wrote:
> On 2021/01/14 08:31, Giovanni Bechis wrote:
>> On Sat, Jan 09, 2021 at 04:45:48PM +, Stuart Henderson wrote:
>>> This port is for DCC (https://www.dcc-servers.net/dcc/),
>>>
>>>   'The Distributed Checksum Clearinghouses or DCC is an anti-spam content
>>>   filter that runs on a variety of operating systems. The counts can be
>>>   used by SMTP servers and mail user agents to detect and reject or filter
>>>   spam or unsolicited bulk mail. DCC servers exchange or "flood" common
>>>   checksums. The checksums include values that are constant across common
>>>   variations in bulk messages, including "personalizations."'
>>>
>>> It can be used in conjunction with various spam filtering software
>>> including rspamd, but note the license restrictions which I've summarised
>>> in DESCR and are detailed in https://www.dcc-servers.net/dcc/INSTALL.html.
>>> PERMIT_PACKAGE is disabled.
>>>
>>> ok to import?
>>>
>> few issues:
>> - make update-plist warns that groff should be used:
>> Warning: possible problematic entries in dcc-2.3.167:
>>  @man man/cat8/cdcc.0 (preformatted manpage (USE_GROFF ?) ?)
>>
>> - some directories are not created and during make install
>> this error is printed:
>> File /var/dcc/dcc_conf could not be installed:
>> No such file or directory
>> File /var/dcc/flod could not be installed:
>> No such file or directory
>> File /var/dcc/grey_flod could not be installed:
>> No such file or directory
>> File /var/dcc/grey_whitelist could not be installed:
>> No such file or directory
>> File /var/dcc/ids could not be installed:
>> No such file or directory
>>
>>  Giovanni
> 
> Thanks, I shouldn't have trusted update-plist's reordering.
> New tar attached, just moving @sample /var/dcc/ up.
> 
> The USE_GROFF warning is unavoidable, the pages are supplied
> in the distfile preformatted. groff is not needed by the port.
> 
Maybe it's worth adding a comment about this on the Makefile ?
ok giovanni@ either way.
 Thanks & Cheers
  Giovanni

Re: Puppet 5.5 broken on current

[Giovanni Bechis]

On 1/14/21 9:05 AM, Klemens Nanni wrote:
> On Thu, Jan 14, 2021 at 08:51:10AM +0100, Giovanni Bechis wrote:
>> On Thu, Jan 14, 2021 at 08:46:26AM +0100, Giovanni Bechis wrote:
>>> Hi,
>>> on current (packages as of today) Puppet cannot start anymore,
>>> the error is the following:
>>>
>>> [~]$ doas puppet agent -t
>>> /usr/local/lib/ruby/site_ruby/2.7/puppet/util.rb:461: warning: URI.escape 
>>> is obsolete
>>> cannot load such file -- sync
>>>
>>> Is this a known issue ?
>>> Before updating I was running 6.8 so I do not know when it broke.
>>>
>> It seems the sync gem should be ported, maybe other ports could be also 
>> affected.
>> https://bugs.archlinux.org/task/65107
> That issue describes Puppet 6 with Ruby 2.7 which does work fine for me:
> 
yes, sorry but the error message is the same.
unfortunately Puppet6 has no pdk command ported yet and I have lot of Puppet 
code to double check before switching to Puppet6.

 Giovanni

Re: Puppet 5.5 broken on current

[Giovanni Bechis]

On Thu, Jan 14, 2021 at 08:46:26AM +0100, Giovanni Bechis wrote:
> Hi,
> on current (packages as of today) Puppet cannot start anymore,
> the error is the following:
> 
> [~]$ doas puppet agent -t
> /usr/local/lib/ruby/site_ruby/2.7/puppet/util.rb:461: warning: URI.escape is 
> obsolete
> cannot load such file -- sync
> 
> Is this a known issue ?
> Before updating I was running 6.8 so I do not know when it broke.
> 
It seems the sync gem should be ported, maybe other ports could be also 
affected.
https://bugs.archlinux.org/task/65107

 Giovanni


signature.asc
Description: PGP signature

Puppet 5.5 broken on current

[Giovanni Bechis]

Hi,
on current (packages as of today) Puppet cannot start anymore,
the error is the following:

[~]$ doas puppet agent -t
/usr/local/lib/ruby/site_ruby/2.7/puppet/util.rb:461: warning: URI.escape is 
obsolete
cannot load such file -- sync

Is this a known issue ?
Before updating I was running 6.8 so I do not know when it broke.

 Giovanni

OpenBSD 6.8-current (GENERIC.MP) #271: Mon Jan 11 19:04:37 MST 2021
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 4278124544 (4079MB)
avail mem = 4133150720 (3941MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xe0010 (248 entries)
bios0: vendor Phoenix Technologies LTD version "6.00" date 12/12/2018
bios0: VMware, Inc. VMware Virtual Platform
acpi0 at bios0: ACPI 4.0
acpi0: sleep states S0 S1 S4 S5
acpi0: tables DSDT FACP BOOT APIC MCFG SRAT HPET WAET
acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S8F0(S3) 
S16F(S3) S18F(S3) S22F(S3) S23F(S3) S24F(S3) S25F(S3) PE40(S3) S1F0(S3) 
PE50(S3) S1F0(S3) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: AMD Opteron(tm) Processor 4386, 3100.24 MHz, 15-10-00
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,x2APIC,POPCNT,AES,XSAVE,AVX,F16C,HV,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,XOP,FMA4,TBM,ITSC,BMI1
cpu0: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB 64b/line 
16-way L2 cache
cpu0: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu0: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 65MHz
cpu1 at mainbus0: apid 2 (application processor)
cpu1: AMD Opteron(tm) Processor 4386, 3100.10 MHz, 15-10-00
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,x2APIC,POPCNT,AES,XSAVE,AVX,F16C,HV,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,XOP,FMA4,TBM,ITSC,BMI1
cpu1: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB 64b/line 
16-way L2 cache
cpu1: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu1: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu1: disabling user TSC (skew=-10059)
cpu1: smt 0, core 0, package 2
cpu2 at mainbus0: apid 4 (application processor)
cpu2: AMD Opteron(tm) Processor 4386, 3100.06 MHz, 15-10-00
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,x2APIC,POPCNT,AES,XSAVE,AVX,F16C,HV,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,XOP,FMA4,TBM,ITSC,BMI1
cpu2: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB 64b/line 
16-way L2 cache
cpu2: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu2: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu2: disabling user TSC (skew=-11240)
cpu2: smt 0, core 0, package 4
cpu3 at mainbus0: apid 6 (application processor)
cpu3: AMD Opteron(tm) Processor 4386, 3100.10 MHz, 15-10-00
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,x2APIC,POPCNT,AES,XSAVE,AVX,F16C,HV,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,XOP,FMA4,TBM,ITSC,BMI1
cpu3: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB 64b/line 
16-way L2 cache
cpu3: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu3: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu3: disabling user TSC (skew=-10988)
cpu3: smt 0, core 0, package 6
ioapic0 at mainbus0: apid 1 pa 0xfec0, version 11, 24 pins
acpimcfg0 at acpi0
acpimcfg0: addr 0xf000, bus 0-127
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpipci0 at acpi0 PCI0: 0x 0x0011 0x0001
acpicmos0 at acpi0
"PNP0A05" at acpi0 not configured
acpiac0 at acpi0: AC unit online
acpicpu0 at acpi0: C1(@1 halt!)
acpicpu1 at acpi0: C1(@1 halt!)
acpicpu2 at acpi0: C1(@1 halt!)
acpicpu3 at acpi0: C1(@1 halt!)
pvbus0 at mainbus0: VMware
vmt0 at pvbus0
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel 82443BX AGP" rev 0x01
ppb0 at pci0 dev 1 function 0 "Intel 82443BX AGP" rev 0x01
pci1 at ppb0 bus 1
pcib0 at pci0 dev 7 function 0 "Intel 82371AB PIIX4 ISA" rev 0x08
pciide0 at pci0 dev 7 function 1 "Intel 82371AB IDE" rev 0x01: DMA, channel 0 
configured to compatibility, channel 1 configured to compatibility
pciide0: channel 0 disa

Re: NEW: mail/dcc

[Giovanni Bechis]

On Sat, Jan 09, 2021 at 04:45:48PM +, Stuart Henderson wrote:
> This port is for DCC (https://www.dcc-servers.net/dcc/),
> 
>   'The Distributed Checksum Clearinghouses or DCC is an anti-spam content
>   filter that runs on a variety of operating systems. The counts can be
>   used by SMTP servers and mail user agents to detect and reject or filter
>   spam or unsolicited bulk mail. DCC servers exchange or "flood" common
>   checksums. The checksums include values that are constant across common
>   variations in bulk messages, including "personalizations."'
> 
> It can be used in conjunction with various spam filtering software
> including rspamd, but note the license restrictions which I've summarised
> in DESCR and are detailed in https://www.dcc-servers.net/dcc/INSTALL.html.
> PERMIT_PACKAGE is disabled.
> 
> ok to import?
> 
few issues:
- make update-plist warns that groff should be used:
Warning: possible problematic entries in dcc-2.3.167:
 @man man/cat8/cdcc.0 (preformatted manpage (USE_GROFF ?) ?)

- some directories are not created and during make install
this error is printed:
File /var/dcc/dcc_conf could not be installed:
No such file or directory
File /var/dcc/flod could not be installed:
No such file or directory
File /var/dcc/grey_flod could not be installed:
No such file or directory
File /var/dcc/grey_whitelist could not be installed:
No such file or directory
File /var/dcc/ids could not be installed:
No such file or directory

 Giovanni


signature.asc
Description: PGP signature

Re: NEW: sysutils/open-vm-tools

[Giovanni Bechis]

On Fri, Jan 08, 2021 at 08:49:47PM +0100, Klemens Nanni wrote:
> On Fri, Jan 08, 2021 at 12:58:45PM +0100, Giovanni Bechis wrote:
> > Can't put into any plist (no applicable prefix):
> > /etc/pam.d
> > /etc/pam.d/vmtoolsd
> > /etc/vmware-tools
> > /etc/vmware-tools/tools.conf.example
> > /sbin/mount.vmblock
> > 
> > /etc/pam.d should be @commented, tools.conf.example should go into 
> > $PREFIX/share/examples/vmware-tools.
> > For mount.vmblock I do not know if it's of any use.
> 
> I looked into adjusting configure and/or fake to do the right thing but
> with no avail, so here's an updated port with a simple post-install that
> removed pam.d, move the example and removes the symlink from /sbin/ to
> /usr/local/bin/, therefore fixing all warnings.
> 
attached a wip effort to enable regression tests.
atm they fails with "ld: error: undefined symbol: CU_assertImplementation".
 Giovanni


open-vm-tools.tgz
Description: application/gzip


signature.asc
Description: PGP signature

Re: NEW: sysutils/open-vm-tools

[Giovanni Bechis]

On 1/8/21 10:50 AM, Klemens Nanni wrote:
> This is a straight forward port that I've tested against ESXi 7.0U1:
> 
>   Information for inst:open-vm-tools-11.2.0
> 
>   Comment:
>   Open VMware tools for VMware guests
> 
>   Description:
>   open-vm-tools is a set of services and modules that enable several 
> features in
>   VMware products for better management of, and seamless user 
> interactions with,
>   guests. It includes kernel modules for enhancing the performance of 
> virtual
>   machines running Linux or other VMware supported Unix like guest 
> operating
>   systems.
> 
>   Maintainer: Klemens Nanni 
> 
>   WWW: https://github.com/vmware/open-vm-tools
> 
> With vmt(4) enabled (default), it is enough to do set basic values with
> `vmware-rpctool "info-set ..."', i.e. `vmtoolsd' does not have to run.
> 
> With vm(4) disabled (`boot -c ; disable vmt ; exit') is it enough to
> start the daemon in order to populate all relevant guestinfo values
> including the IP addresses which vmt(4) currently does not work for
> anymore.
> 
> I turned off basically all optional functionality for now to ease
> initial porting, but that still leaves users the complete RPC client and
> various features I could not test (yet).
> 
> All of the 39 patches consist of small hunks that basically add
> a preprocessor check for OpenBSD in every place where FreeBSD already
> has one - besides minor differences that were equally simple to adapt.
> 
> Those hunks that merely check for OpenBSD such that it bulds can be
> upstreamed as is, the minority which change or implement behaviour
> should get more looks and tests before trying to upstream them.
> 
> Select features such as the Wiper (wipe virtual disk via RPC) are
> effectively NOOPs for now in so far as their init routines always return
> false (for OpenBSD).
> 
> Once this is tested and in-tree, we can test and add more features one
> by one;  X and therefore clipboard support for example seem handy.
> 
> 
> Feedback? OK?
> 
Can't put into any plist (no applicable prefix):
/etc/pam.d
/etc/pam.d/vmtoolsd
/etc/vmware-tools
/etc/vmware-tools/tools.conf.example
/sbin/mount.vmblock

/etc/pam.d should be @commented, tools.conf.example should go into 
$PREFIX/share/examples/vmware-tools.
For mount.vmblock I do not know if it's of any use.

 Giovanni

Re: Killing gpg1

[Giovanni Bechis]

On 9/5/20 1:25 PM, Edd Barrett wrote:
> Hi all,
> 
> We've been talking about trying to remove security/gnupg (i.e. gpg
> version 1) for some time, and the recent plist clash has given me the
> kick up the butt I needed to look more seriously at this.
> 
> Below is a list of things that still depend upon gpg1, by maintainer, as
> determined by:
> 
> select fullpkgpath from ports where build_depends glob '*security/gnupg[^2]*' 
> or run_depends glob '*security/gnupg[^2]*' order by maintainer;
> 
> Let's see if we can move these to gpg2. I'll start by working my way
> through the ports with no maintainer. I'd appreciate it if maintainers
> could help out with their ports.
> 
> Cheers!
> 
> 
> bluhm@:
> security/p5-Module-Signature
> 
> giovanni@:
> databases/mysql-zrm
> mail/p5-Mail-SpamAssassin
> 
both SpamAssassin and mysql-zrm works woth gpg2.

> feinerer@:
> security/fwknop
> 
> robert@:
> www/rt
> 
> semarie@:
> www/weboob
> 
> solene@:
> mail/mailpile
> 
> No maintainer:
> mail/pine-pgp-filters
> security/py-gnupg
> security/py-gnupg,python3
> security/clamav-unofficial-sigs
> 

FIX: www/apache-httpd

[Giovanni Bechis]

Patch from upstream to fix a NULL dereference, ok ?

 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- Makefile	17 Apr 2020 16:26:32 -	1.103
+++ Makefile	17 Jul 2020 08:45:58 -
@@ -5,7 +5,7 @@ COMMENT=		apache HTTP server
 V=			2.4.43
 DISTNAME=		httpd-${V}
 PKGNAME=		apache-httpd-${V}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		www net
 
Index: patches/patch-modules_proxy_mod_proxy_uwsgi_c
===
RCS file: patches/patch-modules_proxy_mod_proxy_uwsgi_c
diff -N patches/patch-modules_proxy_mod_proxy_uwsgi_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-modules_proxy_mod_proxy_uwsgi_c	17 Jul 2020 08:45:58 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Avoid NULL pointer dereferences for empty environment variable values
+PR 64598
+
+Index: modules/proxy/mod_proxy_uwsgi.c
+--- modules/proxy/mod_proxy_uwsgi.c.orig
 modules/proxy/mod_proxy_uwsgi.c
+@@ -175,7 +175,7 @@ static int uwsgi_send_headers(request_rec *r, proxy_co
+ env = (apr_table_entry_t *) env_table->elts;
+ 
+ for (j = 0; j < env_table->nelts; ++j) {
+-headerlen += 2 + strlen(env[j].key) + 2 + strlen(env[j].val);
++headerlen += 2 + strlen(env[j].key) + 2 + (env[j].val ? strlen(env[j].val) : 0);
+ }
+ 
+ ptr = buf = apr_palloc(r->pool, headerlen);
+@@ -189,10 +189,12 @@ static int uwsgi_send_headers(request_rec *r, proxy_co
+ memcpy(ptr, env[j].key, keylen);
+ ptr += keylen;
+ 
+-vallen = strlen(env[j].val);
++vallen = env[j].val ? strlen(env[j].val) : 0;
+ *ptr++ = (apr_byte_t) (vallen & 0xff);
+ *ptr++ = (apr_byte_t) ((vallen >> 8) & 0xff);
+-memcpy(ptr, env[j].val, vallen);
++if (env[j].val) {
++memcpy(ptr, env[j].val, vallen);
++}
+ ptr += vallen;
+ }
+ 

Re: Puppet module generate broken ?

[Giovanni Bechis]

On Tue, Mar 24, 2020 at 03:40:14PM +0100, Giovanni Bechis wrote:
> Puppet module generate seems broken (6.6-current as of today with 
> puppet-5.5.19 and 6.6-stable).
> 
> $ doas puppet module generate --skip-interview test-common
> Warning: `puppet module generate` is deprecated and will be removed in a 
> future release. This action has been replaced by Puppet Development Kit. For 
> more information visit https://puppet.com/docs/pdk/latest/pdk.html.
>(location: 
> /usr/local/lib/ruby/site_ruby/2.6/puppet/face/module/generate.rb:142:in 
> `generate')
> 
> Notice: Generating module at /tmp/common...
> Notice: Populating templates...
> Error: undefined method `delete' for 
> #
> Error: Try 'puppet help module generate' for usage
> 
> The above command creates a "common" dir with broken config files.
> Is this a known problem ?
> 
> Puppet master is working fine.
>  
The following diff fixes the problem, ok after unlock ?
 Cheers
  Giovanni

Index: 5/Makefile
===
RCS file: /cvs/ports/sysutils/ruby-puppet/5/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- 5/Makefile  18 Mar 2020 18:39:17 -  1.23
+++ 5/Makefile  8 May 2020 08:10:16 -
@@ -3,11 +3,13 @@
 PORTROACH= limit:^5
 
 VERSION=   5.5.19
+REVISION=  0
 
 RUN_DEPENDS+=  databases/ruby-hiera3,${MODRUBY_FLAVOR} \
devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
devel/ruby-locale,${MODRUBY_FLAVOR}>=2.1,<3 \
devel/ruby-rgen,${MODRUBY_FLAVOR} \
+   converters/ruby-multi_json,${MODRUBY_FLAVOR} \
sysutils/facter
 
 SUBST_VARS +=  MODPY_DEFAULT_VERSION_2 MODPY_DEFAULT_VERSION_3


signature.asc
Description: PGP signature

Re: opensmtpd-extras -main & python 2.7

[Giovanni Bechis]

On Sat, Apr 18, 2020 at 01:38:20AM +0200, Klemens Nanni wrote:
> On Sat, Apr 18, 2020 at 01:34:47AM +0200, Joerg Jung wrote:
> > thanks, but please hold-off for a second, as giovanni is already going
> > to commit a diff to upgrade to latest release 6.7.0 better he merges
> > the line then into his diff instead of the revision bumps, I believe ...
> Go ahead with whatever seems fit;  I don't use this port, just wanted to
> help out florian.
> 
diff to 6.7.1 with kn@ fix.
ok ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/opensmtpd-extras/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile26 Dec 2019 11:19:28 -  1.32
+++ Makefile18 Apr 2020 20:19:21 -
@@ -6,14 +6,13 @@ COMMENT-pgsql=postgresql based smtpd t
 COMMENT-python=extras with python bindings for smtpd
 COMMENT-redis= redis based smtpd table support
 
-V= 6.6.0
+V= 6.7.1
 DISTNAME=  opensmtpd-extras-${V}
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-mysql= opensmtpd-extras-mysql-${V}
 PKGNAME-pgsql= opensmtpd-extras-pgsql-${V}
 PKGNAME-python=opensmtpd-extras-python-${V}
 PKGNAME-redis= opensmtpd-extras-redis-${V}
-REVISION=  2
 EPOCH= 0
 
 CATEGORIES=mail
@@ -36,9 +35,8 @@ WANTLIB-redis=c crypto event ssl hired
 
 MASTER_SITES=  ${HOMEPAGE}archives/
 
-WRKSRC=${WRKDIR}/OpenSMTPD-extras-${V}
-
 MODULES=   lang/python
+MODPY_RUNDEP=  no
 
 LIB_DEPENDS-main=  databases/sqlite3
 LIB_DEPENDS-mysql= databases/mariadb,-main
Index: distinfo
===
RCS file: /cvs/ports/mail/opensmtpd-extras/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo22 Dec 2019 12:19:20 -  1.17
+++ distinfo18 Apr 2020 20:19:21 -
@@ -1,2 +1,2 @@
-SHA256 (opensmtpd-extras-6.6.0.tar.gz) = 
EmsCNgLouyIr8kVDoFbuClSDQ9yG0YRmn/nYLfyh+98=
-SIZE (opensmtpd-extras-6.6.0.tar.gz) = 124234
+SHA256 (opensmtpd-extras-6.7.1.tar.gz) = 
+EOFVZqLs2ay/iXYsfeMEI8HzBWZI1AXFWnXvcLpNaw=
+SIZE (opensmtpd-extras-6.7.1.tar.gz) = 548792


signature.asc
Description: PGP signature

Re: fix: www/apache-httpd

[Giovanni Bechis]

On Wed, Apr 15, 2020 at 06:42:17PM +0100, Stuart Henderson wrote:
> On 2020/04/15 19:20, Giovanni Bechis wrote:
> > -BEGIN PGP SIGNED MESSAGE-
> > Hash: SHA512
> > 
> > Hi,
> > memory leak in mod_ssl fixed and take maintainership, ok ?
> > 
> >  Cheers
> >   Giovanni
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/apache-httpd/Makefile,v
> > retrieving revision 1.102
> > diff -u -p -r1.102 Makefile
> > - --- Makefile  31 Mar 2020 14:30:33 -  1.102
> > +++ Makefile15 Apr 2020 17:06:22 -
> > @@ -5,8 +5,11 @@ COMMENT=   apache HTTP server
> >  V= 2.4.43
> >  DISTNAME=  httpd-${V}
> >  PKGNAME=   apache-httpd-${V}
> > +REVISION=  0
> >  
> >  CATEGORIES=www net
> > +
> > +MAINTAINER=Giovanni Bechis 
> >  
> >  HOMEPAGE=  https://httpd.apache.org/
> >  
> > Index: patches/patch-modules_ssl_ssl_util_stapling_c
> > ===
> > RCS file: patches/patch-modules_ssl_ssl_util_stapling_c
> > diff -N patches/patch-modules_ssl_ssl_util_stapling_c
> > - --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-modules_ssl_ssl_util_stapling_c   15 Apr 2020 17:06:22 
> > -
> > @@ -0,0 +1,84 @@
> > +$OpenBSD$
> > +
> > +# Memory leak in mod_ssl 
> > (https://bz.apache.org/bugzilla/show_bug.cgi?id=63687)
> 
> icing's version was already committed upstream, it's probably better to use 
> that I think?
> 
> https://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c?view=log
> 
this is icing's version, shouldn't I mention the bz as a referral ?

 Giovanni

> > +--- modules/ssl/ssl_util_stapling.c.orig
> >  modules/ssl/ssl_util_stapling.c
> > +@@ -134,6 +134,7 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
> > + X509 *issuer = NULL;
> > + OCSP_CERTID *cid = NULL;
> > + STACK_OF(OPENSSL_STRING) *aia = NULL;
> > ++int rv = 1; /* until further notice */
> > + 
> > + if (x == NULL)
> > + return 0;
> > +@@ -158,16 +159,18 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t 
> > *
> > + SSL_CTX_set_tlsext_status_cb(mctx->ssl_ctx, stapling_cb);
> > + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(10177) 
> > "OCSP stapling added via hook");
> > + }
> > +-return 1;
> > ++goto cleanup;
> > + }
> > + 
> > + if (mctx->stapling_enabled != TRUE) {
> > + /* mod_ssl's own implementation is not enabled */
> > +-return 1;
> > ++goto cleanup;
> > + }
> > + 
> > +-if (X509_digest(x, EVP_sha1(), idx, NULL) != 1)
> > +-return 0;
> > ++if (X509_digest(x, EVP_sha1(), idx, NULL) != 1) {
> > ++rv = 0;
> > ++goto cleanup;
> > ++}
> > + 
> > + cinf = apr_hash_get(stapling_certinfo, idx, sizeof(idx));
> > + if (cinf) {
> > +@@ -181,18 +184,18 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t 
> > *
> > +APLOGNO(02814) "ssl_stapling_init_cert: no 
> > OCSP URI "
> > +"in certificate and no SSLStaplingForceURL "
> > +"configured for server %s", 
> > mctx->sc->vhost_id);
> > +-return 0;
> > ++rv = 0;
> > + }
> > +-return 1;
> > ++goto cleanup;
> > + }
> > + 
> > + cid = OCSP_cert_to_id(NULL, x, issuer);
> > +-X509_free(issuer);
> > + if (!cid) {
> > + ssl_log_xerror(SSLLOG_MARK, APLOG_ERR, 0, ptemp, s, x, 
> > APLOGNO(02815)
> > +"ssl_stapling_init_cert: can't create CertID "
> > +"for OCSP request");
> > +-return 0;
> > ++rv = 0;
> > ++goto cleanup;
> > + }
> > + 
> > + aia = X509_get1_ocsp(x);
> > +@@ -201,7 +204,8 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
> > + ssl_log_xerror(SSLLOG_MARK, APLOG_ERR, 0, ptemp, s, x,
> > +APLOGNO(02218) "ssl_stapling_init_cert: no OCSP 
> > URI "
> > +"in certificate and no SSLS

fix: www/apache-httpd

[Giovanni Bechis]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Hi,
memory leak in mod_ssl fixed and take maintainership, ok ?

 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
- --- Makefile  31 Mar 2020 14:30:33 -  1.102
+++ Makefile15 Apr 2020 17:06:22 -
@@ -5,8 +5,11 @@ COMMENT=   apache HTTP server
 V= 2.4.43
 DISTNAME=  httpd-${V}
 PKGNAME=   apache-httpd-${V}
+REVISION=  0
 
 CATEGORIES=www net
+
+MAINTAINER=Giovanni Bechis 
 
 HOMEPAGE=  https://httpd.apache.org/
 
Index: patches/patch-modules_ssl_ssl_util_stapling_c
===
RCS file: patches/patch-modules_ssl_ssl_util_stapling_c
diff -N patches/patch-modules_ssl_ssl_util_stapling_c
- --- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-modules_ssl_ssl_util_stapling_c   15 Apr 2020 17:06:22 
-
@@ -0,0 +1,84 @@
+$OpenBSD$
+
+# Memory leak in mod_ssl (https://bz.apache.org/bugzilla/show_bug.cgi?id=63687)
+
+Index: modules/ssl/ssl_util_stapling.c
+--- modules/ssl/ssl_util_stapling.c.orig
 modules/ssl/ssl_util_stapling.c
+@@ -134,6 +134,7 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+ X509 *issuer = NULL;
+ OCSP_CERTID *cid = NULL;
+ STACK_OF(OPENSSL_STRING) *aia = NULL;
++int rv = 1; /* until further notice */
+ 
+ if (x == NULL)
+ return 0;
+@@ -158,16 +159,18 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+ SSL_CTX_set_tlsext_status_cb(mctx->ssl_ctx, stapling_cb);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(10177) "OCSP 
stapling added via hook");
+ }
+-return 1;
++goto cleanup;
+ }
+ 
+ if (mctx->stapling_enabled != TRUE) {
+ /* mod_ssl's own implementation is not enabled */
+-return 1;
++goto cleanup;
+ }
+ 
+-if (X509_digest(x, EVP_sha1(), idx, NULL) != 1)
+-return 0;
++if (X509_digest(x, EVP_sha1(), idx, NULL) != 1) {
++rv = 0;
++goto cleanup;
++}
+ 
+ cinf = apr_hash_get(stapling_certinfo, idx, sizeof(idx));
+ if (cinf) {
+@@ -181,18 +184,18 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+APLOGNO(02814) "ssl_stapling_init_cert: no OCSP 
URI "
+"in certificate and no SSLStaplingForceURL "
+"configured for server %s", mctx->sc->vhost_id);
+-return 0;
++rv = 0;
+ }
+-return 1;
++goto cleanup;
+ }
+ 
+ cid = OCSP_cert_to_id(NULL, x, issuer);
+-X509_free(issuer);
+ if (!cid) {
+ ssl_log_xerror(SSLLOG_MARK, APLOG_ERR, 0, ptemp, s, x, APLOGNO(02815)
+"ssl_stapling_init_cert: can't create CertID "
+"for OCSP request");
+-return 0;
++rv = 0;
++goto cleanup;
+ }
+ 
+ aia = X509_get1_ocsp(x);
+@@ -201,7 +204,8 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+ ssl_log_xerror(SSLLOG_MARK, APLOG_ERR, 0, ptemp, s, x,
+APLOGNO(02218) "ssl_stapling_init_cert: no OCSP URI "
+"in certificate and no SSLStaplingForceURL set");
+-return 0;
++rv = 0;
++goto cleanup;
+ }
+ 
+ /* At this point, we have determined that there's something to store */
+@@ -222,8 +226,10 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *
+mctx->sc->vhost_id);
+ 
+ apr_hash_set(stapling_certinfo, cinf->idx, sizeof(cinf->idx), cinf);
+-
+-return 1;
++
++cleanup:
++X509_free(issuer);
++return rv;
+ }
+ 
+ static certinfo *stapling_get_certinfo(server_rec *s, X509 *x, modssl_ctx_t 
*mctx,

-BEGIN PGP SIGNATURE-

iQIzBAEBCgAdFiEEqg3TnG6R3qYMxl94+r7qCYlyWOUFAl6XQkUACgkQ+r7qCYly
WOXJ1Q/+PGkrfKUjhHW1jhJEltrtXHvLGna+QfOsX9+JyCnTIq1qBeIeWmQRgwYB
seiDHupE2Mi2+ytwwzilV7f88GiHL6i+hd00kQiMHsOGkowr7x86hRWZc1kfNrcT
iQTUOKj38Ri78Xjyx/9kj1+vKDGtplD+eyuo9pVFH6HWDXKIV0Q7k7Jl7IffDmdY
9NeKGhwxvrnscjUliMOLBCyucsB04XcbtRyQZlxjsGnBLyyOWCeJR7o0CKUy3jE0
JZ3dQ5mdig+ZYbUsDnd5uMmBcWJV5uqu4lGMezCfhSf+fBQ6nO9L3J9NhPWRUcFu
EH01l/rBggE50bfL59tNCbutaEGIpesDSbN5nI54ugSb7FVm9vKO26WPsDgufr3s
fSZOY01qNi4Tyevik9Q8NTO4MSdcevlkSvh9InX/bKP3udX0Rj96X/qLMiwPlkYy
ffHzibnu3Fg4Z9EPWRe19PZ0QjBViQ7Z8iWGIgZd44aIj5AP42ZFbK8ptVAKqsd9
M0VwpDooUv8UDzFiBtu3M1NCatA/2I4CVXRdwQgAdXoe5OnaJGB11Z1Yfvgjxgr2
p39mSNZAAKIlLpzUVFFAyrv4QjvkphWLbeTLJ2yghpeQbRwfcLnW/wEXxA0d4Ehg
CUpq4IPNf/QUCnUQHHBscnd8NyWZ0T+tocHxtCRdoGalac1pCJg=
=nsHV
-END PGP SIGNATURE-

Puppet module generate broken ?

[Giovanni Bechis]

Puppet module generate seems broken (6.6-current as of today with puppet-5.5.19 
and 6.6-stable).

$ doas puppet module generate --skip-interview test-common
Warning: `puppet module generate` is deprecated and will be removed in a future 
release. This action has been replaced by Puppet Development Kit. For more 
information visit https://puppet.com/docs/pdk/latest/pdk.html.
   (location: 
/usr/local/lib/ruby/site_ruby/2.6/puppet/face/module/generate.rb:142:in 
`generate')

Notice: Generating module at /tmp/common...
Notice: Populating templates...
Error: undefined method `delete' for 
#
Error: Try 'puppet help module generate' for usage

The above command creates a "common" dir with broken config files.
Is this a known problem ?

Puppet master is working fine.
 
 Cheers
  Giovanni
 

[pkg-stable] missing py3-acme pkg

[Giovanni Bechis]

Hi,
certbot cannot be updated in i386-stable because py3-acme package is missing.

$ doas pkg_add -ui 
quirks-3.183 signed on 2020-03-04T20:39:17Z
Can't find py3-acme-1.3.0
Can't install certbot-0.38.0->1.3.0: can't resolve py3-acme-1.3.0
Couldn't find updates for certbot-0.38.0
Couldn't install certbot-1.3.0 py3-acme-1.3.0

Is this a problem with letsencrypt commits to stable ?
 
 Cheers
  Giovanni
OpenBSD 6.6 (GENERIC) #292: Tue Oct  8 17:46:27 MDT 2019
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC
real mem  = 536363008 (511MB)
avail mem = 510902272 (487MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: date 20/80/26, BIOS32 rev. 0 @ 0xfac40
pcibios0 at bios0: rev 2.0 @ 0xf/0x1
pcibios0: pcibios_get_intr_routing - function not supported
pcibios0: PCI IRQ Routing information unavailable.
pcibios0: PCI bus #0 is the last bus
bios0: ROM list: 0xc8000/0xa800
cpu0 at mainbus0: (uniprocessor)
cpu0: Geode(TM) Integrated Processor by AMD PCS ("AuthenticAMD" 586-class) 500 MHz, 05-0a-02
cpu0: FPU,DE,PSE,TSC,MSR,CX8,SEP,PGE,CMOV,CFLUSH,MMX,MMXX,3DNOW2,3DNOW
mtrr: K6-family MTRR support (2 registers)
amdmsr0 at mainbus0
pci0 at mainbus0 bus 0: configuration mode 1 (no bios)
0:20:0: io address conflict 0x6100/0x100
0:20:0: io address conflict 0x6200/0x200
pchb0 at pci0 dev 1 function 0 "AMD Geode LX" rev 0x31
glxsb0 at pci0 dev 1 function 2 "AMD Geode LX Crypto" rev 0x00: RNG AES
vr0 at pci0 dev 6 function 0 "VIA VT6105M RhineIII" rev 0x96: irq 11, address 00:00:24:c8:de:80
ukphy0 at vr0 phy 1: Generic IEEE 802.3u media interface, rev. 3: OUI 0x004063, model 0x0034
vr1 at pci0 dev 7 function 0 "VIA VT6105M RhineIII" rev 0x96: irq 5, address 00:00:24:c8:de:81
ukphy1 at vr1 phy 1: Generic IEEE 802.3u media interface, rev. 3: OUI 0x004063, model 0x0034
vr2 at pci0 dev 8 function 0 "VIA VT6105M RhineIII" rev 0x96: irq 9, address 00:00:24:c8:de:82
ukphy2 at vr2 phy 1: Generic IEEE 802.3u media interface, rev. 3: OUI 0x004063, model 0x0034
vr3 at pci0 dev 9 function 0 "VIA VT6105M RhineIII" rev 0x96: irq 12, address 00:00:24:c8:de:83
ukphy3 at vr3 phy 1: Generic IEEE 802.3u media interface, rev. 3: OUI 0x004063, model 0x0034
glxpcib0 at pci0 dev 20 function 0 "AMD CS5536 ISA" rev 0x03: rev 3, 32-bit 3579545Hz timer, watchdog, gpio, i2c
gpio0 at glxpcib0: 32 pins
iic0 at glxpcib0
pciide0 at pci0 dev 20 function 2 "AMD CS5536 IDE" rev 0x01: DMA, channel 0 wired to compatibility, channel 1 wired to compatibility
wd0 at pciide0 channel 0 drive 0: 
wd0: 16-sector PIO, LBA48, 476940MB, 976773168 sectors
wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 2
pciide0: channel 1 ignored (disabled)
ohci0 at pci0 dev 21 function 0 "AMD CS5536 USB" rev 0x02: irq 15, version 1.0, legacy support
ehci0 at pci0 dev 21 function 1 "AMD CS5536 USB" rev 0x02: irq 15
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "AMD EHCI root hub" rev 2.00/1.00 addr 1
isa0 at glxpcib0
isadma0 at isa0
com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
com0: console
com1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbc0: unable to establish interrupt for irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
nsclpcsio0 at isa0 port 0x2e/2: NSC PC87366 rev 9: GPIO VLM TMS
gpio1 at nsclpcsio0: 29 pins
npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
usb1 at ohci0: USB revision 1.0
uhub1 at usb1 configuration 1 interface 0 "AMD OHCI root hub" rev 1.00/1.00 addr 1
vscsi0 at root
scsibus1 at vscsi0: 256 targets
softraid0 at root
scsibus2 at softraid0: 256 targets
root on wd0a (5527fdd6d670763b.a) swap on wd0b dump on wd0b

Re: Apache network.conf change

[Giovanni Bechis]

On Thu, Mar 05, 2020 at 11:09:41PM +, Stuart Henderson wrote:
> On 2020/03/05 23:31, Giovanni Bechis wrote:
> > Hi,
> > Apache has changed their main download site,
> > www.apache.org/dist is a redirect to downloads.apache.org.
> > Anyway www.apache.org/dist will not be shut down any time soon.
> > ok ?
> >  Cheers
> >   Giovanni
> 
> hmm, they list that as a "backup site" and ask "Please only use the
> backup mirrors to download KEYS, PGP signatures and hashes (SHA* etc) --
> or if no other mirrors are working" .. maybe we should pick some other
> well-connected mirror to list first and move that one down a bit in
> the list?
> 
correct, what about this one ?

 Cheers
  Giovanni

Index: network.conf
===
RCS file: /cvs/ports/infrastructure/db/network.conf,v
retrieving revision 1.13
diff -u -p -r1.13 network.conf
--- network.conf26 Jan 2020 15:47:59 -  1.13
+++ network.conf6 Mar 2020 07:25:28 -
@@ -145,12 +145,12 @@ MASTER_SITE_PACKETSTORM+= \
https://dl.packetstormsecurity.net/
 
 MASTER_SITE_APACHE+= \
-   https://www.apache.org/dist/ \
-   https://archive.apache.org/dist/ \
https://www.mirrorservice.org/sites/ftp.apache.org/ \
-   http://mirror.reverse.net/pub/apache/ \
+   https://mirrors.dotsrc.org/apache/ \
+   https://downloads.apache.org/ \
+   https://archive.apache.org/dist/ \
http://ftp.meisei-u.ac.jp/mirror/apache/dist/ \
-   http://apache.belnet.be/
+   https://apache.belnet.be/
 
 MASTER_SITE_PYPI +=\
https://pypi.io/packages/source/


signature.asc
Description: PGP signature

Apache network.conf change

[Giovanni Bechis]

Hi,
Apache has changed their main download site,
www.apache.org/dist is a redirect to downloads.apache.org.
Anyway www.apache.org/dist will not be shut down any time soon.
ok ?
 Cheers
  Giovanni

Index: network.conf
===
RCS file: /cvs/ports/infrastructure/db/network.conf,v
retrieving revision 1.13
diff -u -p -r1.13 network.conf
--- network.conf26 Jan 2020 15:47:59 -  1.13
+++ network.conf5 Mar 2020 22:27:30 -
@@ -145,7 +145,7 @@ MASTER_SITE_PACKETSTORM+=   \
https://dl.packetstormsecurity.net/
 
 MASTER_SITE_APACHE+= \
-   https://www.apache.org/dist/ \
+   https://downloads.apache.org/ \
https://archive.apache.org/dist/ \
https://www.mirrorservice.org/sites/ftp.apache.org/ \
http://mirror.reverse.net/pub/apache/ \


signature.asc
Description: PGP signature

Re: UPDATE: devel/pcre2

[Giovanni Bechis]

On 2/13/20 11:40 AM, Nam Nguyen wrote:
> Giovanni Bechis writes:
> 
>> On Wed, Feb 12, 2020 at 06:26:35PM +, Stuart Henderson wrote:
>>> On 2020/02/12 13:15, Giovanni Bechis wrote:
>>>> Update to latest version, ok ? comments ?
>>>
>>> Please run update-patches, update-plist, and bump the shared library minor
>>> versions for all libraries.
>>>
>> new diff follows
> 
> Thank you for the update. It looks good except for some nits.
> 
> Here is a diff that:
> - resyncs shared_libs.log to the # numbers.
> - keeps pcre2-posix as is, as I did not see a reason to bump it.
>   (I do see the new functions for the other minor bumps.)
>   19. Implemented pcre2_get_match_data_size().
>   28. Add the pcre2_maketables_free() function.
> 
> from Changelog https://www.pcre.org/changelog.txt
> 
> 22. Corrected pcre2_set_character_tables() tables data type: was const 
> unsigned
> char * instead of const uint8_t *, as generated by pcre2_maketables().
> 
> pcre2_set_character_tables(pcre2_compile_context *, const unsigned char
> *);
> pcre2_set_character_tables(pcre2_compile_context *, const uint8_t *); \
> 
> All arches define:
> ./amd64/include/_types.h:typedefunsigned char   __uint8_t;
> 
> "If a type changes in an incompatible way, the library major number must
> be bumped." This seems like the type was changed in a compatible way, so
> I agree that a major bump is not necessary.
> 
> I tested against net/wget and shells/fish with runtime testing and they
> work.
> 
ok giovanni@

> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/pcre2/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- Makefile  12 Jul 2019 20:45:15 -  1.11
> +++ Makefile  13 Feb 2020 10:06:10 -
> @@ -2,12 +2,12 @@
>  
>  COMMENT =perl-compatible regular expression library, version 2
>  
> -DISTNAME =   pcre2-10.33
> +DISTNAME =   pcre2-10.34
>  
> -SHARED_LIBS +=  pcre2-16  0.3 # 8.0
> -SHARED_LIBS +=  pcre2-32  0.3 # 8.0
> -SHARED_LIBS +=  pcre2-8   0.4 # 8.0
> -SHARED_LIBS +=  pcre2-posix   0.3 # 2.2
> +SHARED_LIBS +=  pcre2-16  0.4 # 9.0
> +SHARED_LIBS +=  pcre2-32  0.4 # 9.0
> +SHARED_LIBS +=  pcre2-8   0.5 # 9.0
> +SHARED_LIBS +=  pcre2-posix   0.3 # 2.3
>  
>  CATEGORIES = devel
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/pcre2/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  1 May 2019 21:47:27 -   1.5
> +++ distinfo  13 Feb 2020 10:06:10 -
> @@ -1,2 +1,2 @@
> -SHA256 (pcre2-10.33.tar.gz) = 4uKJmpdIn8atGwzD2nlSx8ypkbSg99tmSbddlyECXTE=
> -SIZE (pcre2-10.33.tar.gz) = 2234905
> +SHA256 (pcre2-10.34.tar.gz) = 2mq6e6JQnpGOQfT3RKWfpBokJcWaKYojLn/oVpHgA3k=
> +SIZE (pcre2-10.34.tar.gz) = 2271533
> Index: patches/patch-RunGrepTest
> ===
> RCS file: /cvs/ports/devel/pcre2/patches/patch-RunGrepTest,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-RunGrepTest
> --- patches/patch-RunGrepTest 1 May 2019 21:47:27 -   1.2
> +++ patches/patch-RunGrepTest 13 Feb 2020 10:06:10 -
> @@ -5,7 +5,7 @@ Our sed(1) doesn't cope with NUL bytes a
>  Index: RunGrepTest
>  --- RunGrepTest.orig
>  +++ RunGrepTest
> -@@ -723,9 +723,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc|
> +@@ -740,9 +740,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc|
>   printf '%c--- Test N7 
> --\r\n' - >>testtrygrep
>   uname=`uname`
>   case $uname in
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/pcre2/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 1 May 2019 21:47:27 -   1.4
> +++ pkg/PLIST 13 Feb 2020 10:06:10 -
> @@ -4,16 +4,16 @@ bin/pcre2-config
>  @bin bin/pcre2test
>  include/pcre2.h
>  include/pcre2posix.h
> -lib/libpcre2-16.a
> +@static-lib lib/libpcre2-16.a
>  lib/libpcre2-16.la
>  @lib lib/libpcre2-16.so.${LIBpcre2-16_VERSION}
> -lib/libpcre2-32.a
> +@static-lib lib/libpcre2-32.a
>  lib/libpcre2-32.la
>  @lib lib/libpcre2-32.so.${LIBpcre2-32_VERSION}
> -lib/libpcre2-8.a
> +@static-lib lib/libpcre2-8.a
>  lib/libpcre2-8.la
>  @lib lib/libpcre2-8.so.${LIBpcre2-8_VERSION}
> -lib/libpcre2-posix.a
> +@static-lib lib/libpcre2-po

rm -rf www/icedtea-web ?

[Giovanni Bechis]

Hi,
I am not using it anymore and Java applets are dead,
ok to remove or should I just drop maintainership ?

 Giovanni

Re: UPDATE: devel/pcre2

[Giovanni Bechis]

On Wed, Feb 12, 2020 at 06:26:35PM +, Stuart Henderson wrote:
> On 2020/02/12 13:15, Giovanni Bechis wrote:
> > Update to latest version, ok ? comments ?
> 
> Please run update-patches, update-plist, and bump the shared library minor
> versions for all libraries.
> 
new diff follows

> > should it go on a bulk first ?
> 
> nope - even if it did have changes where testing dependent ports would
> help, there are only a handful, so there's no point in running a bulk
> when you can build separately easily enough.
> 
> (It may make sense to look at the selinux-friendly jit which is likely to
> also work with openbsd's restrictions, but that's definitely not something
> to mix with the update :)
this is another story ;-)

 Giovanni

Index: Makefile
===
RCS file: /cvs/ports/devel/pcre2/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile12 Jul 2019 20:45:15 -  1.11
+++ Makefile13 Feb 2020 07:30:03 -
@@ -2,12 +2,12 @@
 
 COMMENT =  perl-compatible regular expression library, version 2
 
-DISTNAME = pcre2-10.33
+DISTNAME = pcre2-10.34
 
-SHARED_LIBS +=  pcre2-16  0.3 # 8.0
-SHARED_LIBS +=  pcre2-32  0.3 # 8.0
-SHARED_LIBS +=  pcre2-8   0.4 # 8.0
-SHARED_LIBS +=  pcre2-posix   0.3 # 2.2
+SHARED_LIBS +=  pcre2-16  0.4 # 8.0
+SHARED_LIBS +=  pcre2-32  0.4 # 8.0
+SHARED_LIBS +=  pcre2-8   0.5 # 8.0
+SHARED_LIBS +=  pcre2-posix   0.4 # 2.2
 
 CATEGORIES =   devel
 
Index: distinfo
===
RCS file: /cvs/ports/devel/pcre2/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo1 May 2019 21:47:27 -   1.5
+++ distinfo13 Feb 2020 07:30:03 -
@@ -1,2 +1,2 @@
-SHA256 (pcre2-10.33.tar.gz) = 4uKJmpdIn8atGwzD2nlSx8ypkbSg99tmSbddlyECXTE=
-SIZE (pcre2-10.33.tar.gz) = 2234905
+SHA256 (pcre2-10.34.tar.gz) = 2mq6e6JQnpGOQfT3RKWfpBokJcWaKYojLn/oVpHgA3k=
+SIZE (pcre2-10.34.tar.gz) = 2271533
Index: patches/patch-RunGrepTest
===
RCS file: /cvs/ports/devel/pcre2/patches/patch-RunGrepTest,v
retrieving revision 1.2
diff -u -p -r1.2 patch-RunGrepTest
--- patches/patch-RunGrepTest   1 May 2019 21:47:27 -   1.2
+++ patches/patch-RunGrepTest   13 Feb 2020 07:30:03 -
@@ -5,7 +5,7 @@ Our sed(1) doesn't cope with NUL bytes a
 Index: RunGrepTest
 --- RunGrepTest.orig
 +++ RunGrepTest
-@@ -723,9 +723,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc|
+@@ -740,9 +740,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc|
  printf '%c--- Test N7 
--\r\n' - >>testtrygrep
  uname=`uname`
  case $uname in
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/pcre2/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   1 May 2019 21:47:27 -   1.4
+++ pkg/PLIST   13 Feb 2020 07:30:03 -
@@ -4,16 +4,16 @@ bin/pcre2-config
 @bin bin/pcre2test
 include/pcre2.h
 include/pcre2posix.h
-lib/libpcre2-16.a
+@static-lib lib/libpcre2-16.a
 lib/libpcre2-16.la
 @lib lib/libpcre2-16.so.${LIBpcre2-16_VERSION}
-lib/libpcre2-32.a
+@static-lib lib/libpcre2-32.a
 lib/libpcre2-32.la
 @lib lib/libpcre2-32.so.${LIBpcre2-32_VERSION}
-lib/libpcre2-8.a
+@static-lib lib/libpcre2-8.a
 lib/libpcre2-8.la
 @lib lib/libpcre2-8.so.${LIBpcre2-8_VERSION}
-lib/libpcre2-posix.a
+@static-lib lib/libpcre2-posix.a
 lib/libpcre2-posix.la
 @lib lib/libpcre2-posix.so.${LIBpcre2-posix_VERSION}
 lib/pkgconfig/libpcre2-16.pc
@@ -43,6 +43,7 @@ lib/pkgconfig/libpcre2-posix.pc
 @man man/man3/pcre2_general_context_free.3
 @man man/man3/pcre2_get_error_message.3
 @man man/man3/pcre2_get_mark.3
+@man man/man3/pcre2_get_match_data_size.3
 @man man/man3/pcre2_get_ovector_count.3
 @man man/man3/pcre2_get_ovector_pointer.3
 @man man/man3/pcre2_get_startchar.3
@@ -53,6 +54,7 @@ lib/pkgconfig/libpcre2-posix.pc
 @man man/man3/pcre2_jit_stack_create.3
 @man man/man3/pcre2_jit_stack_free.3
 @man man/man3/pcre2_maketables.3
+@man man/man3/pcre2_maketables_free.3
 @man man/man3/pcre2_match.3
 @man man/man3/pcre2_match_context_copy.3
 @man man/man3/pcre2_match_context_create.3
@@ -144,6 +146,7 @@ share/doc/pcre2/html/pcre2_general_conte
 share/doc/pcre2/html/pcre2_general_context_free.html
 share/doc/pcre2/html/pcre2_get_error_message.html
 share/doc/pcre2/html/pcre2_get_mark.html
+share/doc/pcre2/html/pcre2_get_match_data_size.html
 share/doc/pcre2/html/pcre2_get_ovector_count.html
 share/doc/pcre2/html/pcre2_get_ovector_pointer.html
 share/doc/pcre2/html/pcre2_get_startchar.html
@@ -154,6 +157,7 @@ share/doc/pcre2/html/pcre2_jit_stack_ass
 share/doc/pcre2/

UPDATE: devel/pcre2

[Giovanni Bechis]

Update to latest version, ok ? comments ? should it go on a bulk first ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/devel/pcre2/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile12 Jul 2019 20:45:15 -  1.11
+++ Makefile12 Feb 2020 12:06:12 -
@@ -2,7 +2,7 @@
 
 COMMENT =  perl-compatible regular expression library, version 2
 
-DISTNAME = pcre2-10.33
+DISTNAME = pcre2-10.34
 
 SHARED_LIBS +=  pcre2-16  0.3 # 8.0
 SHARED_LIBS +=  pcre2-32  0.3 # 8.0
Index: distinfo
===
RCS file: /cvs/ports/devel/pcre2/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo1 May 2019 21:47:27 -   1.5
+++ distinfo12 Feb 2020 12:06:12 -
@@ -1,2 +1,2 @@
-SHA256 (pcre2-10.33.tar.gz) = 4uKJmpdIn8atGwzD2nlSx8ypkbSg99tmSbddlyECXTE=
-SIZE (pcre2-10.33.tar.gz) = 2234905
+SHA256 (pcre2-10.34.tar.gz) = 2mq6e6JQnpGOQfT3RKWfpBokJcWaKYojLn/oVpHgA3k=
+SIZE (pcre2-10.34.tar.gz) = 2271533

Re: [update] databases/redis-5.0.7

[Giovanni Bechis]

On 2/6/20 4:15 PM, Daniel Jakots wrote:
> Hi Theo,
> 
> Thanks for working on that!
> 
> On Thu, 6 Feb 2020 15:21:23 +0100, Theo Buehler 
> wrote:
> 
>> First of all, despite the length of this mail, most of the update is
>> straightforward. The diff is an in-place upgrade from 4.0.14 to 5.0.7.
>>
>> The release notes (which contain migration instructions at the very
>> end)
>>
>> https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES
> 
> Since Redis 5.0 is still able to read 4.0 mdb format, I assume for a
> user there is nothing to do. I guess you don't plan to add anything to
> current.html do you?
> 
>> look as if there is no risk of losing data due to the migration and
>> looking around on the net I couldn't find any reports of breakage.
>> However, I don't know and can't know for sure.
>>
>> Since we're playing with user data here, it might be more prudent to
>> provide a redis5 port, and to leave it to the users to decide if and
>> when they want to migrate instead of forcing it upon them right when
>> the update goes in (or when they upgrade to 6.7).
> 
> AFAIK, redis is (or should be) used as a cache i.e. losing its data is
> a small inconvenience but shouldn't be a problem. I don't think
> duplicating the port is worth it.
> 
SpamAssassin can store bayes data into Redis, I have some 500k keys I do not 
want to lose but I can test database migration.

 Cheers
  Giovanni

>> A detail: redis-sentinel is installed as a symlink to redis-server.
>> Ports seem to do this frequently, but I wonder if that should be
>> turned into a hard link as is usually done in base?
> 
> What are the pro/cons of using a hard link instead?
> 
> Cheers,
> Daniel
> 

Re: [update] net/telegram-purple version 1.3.1 to 1.4.2

[Giovanni Bechis]

On Sat, Jan 25, 2020 at 09:26:53PM +0100, Stefan Hagen wrote:
> Giovanni Bechis wrote:
> > On Sat, Jan 25, 2020 at 09:38:23AM +0100, Stefan Hagen wrote:
> >> The BROKEN condition still applies. The code parse_tlo_file has not
> >> changed.
> >>
> > afaik this is BROKEN-sparc64 as well, otherwise ok giovanni@
> 
> Correct, it hits the same assertion on sparc64.
> http://build-failures.rhaalovely.net/sparc64/2020-01-23/net/telegram-purple.log
> 
> Updated patch below.
> 
> Ciao,
> Stefan
> 
ok giovanni@ on this version as well.
 Giovanni

> Index: net/telegram-purple/Makefile
> ===
> RCS file: /cvs/ports/net/telegram-purple/Makefile,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile
> --- net/telegram-purple/Makefile  12 Jul 2019 20:48:50 -  1.6
> +++ net/telegram-purple/Makefile  25 Jan 2020 20:22:45 -
> @@ -1,9 +1,9 @@
>  # $OpenBSD: Makefile,v 1.6 2019/07/12 20:48:50 sthen Exp $
>  
>  BROKEN-powerpc = assertion "get_int () == TLS_SCHEMA_V2" failed: file 
> "generate.c", line 2831, function "parse_tlo_file"
> +BROKEN-sparc64 = assertion "get_int () == TLS_SCHEMA_V2" failed: file 
> "generate.c", line 2831, function "parse_tlo_file"
>  
> -V =  1.3.1
> -REVISION =   2
> +V =  1.4.2
>  COMMENT =Telegram support for Pidgin
>  DISTNAME =   telegram-purple_$V.orig
>  PKGNAME =telegram-purple-$V
> Index: net/telegram-purple/distinfo
> ===
> RCS file: /cvs/ports/net/telegram-purple/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- net/telegram-purple/distinfo  24 Jun 2017 00:20:17 -  1.1.1.1
> +++ net/telegram-purple/distinfo  25 Jan 2020 20:22:45 -
> @@ -1,2 +1,2 @@
> -SHA256 (telegram-purple_1.3.1.orig.tar.gz) = 
> hpYnwitP1WyH1V0FQ1NTnzi4rhaSoBEebmaCr+ZUd9c=
> -SIZE (telegram-purple_1.3.1.orig.tar.gz) = 509083
> +SHA256 (telegram-purple_1.4.2.orig.tar.gz) = 
> vpkLXKwlzNpPuMBFotQjKW9K8Vhz9mwpk/uazz0eSWI=
> +SIZE (telegram-purple_1.4.2.orig.tar.gz) = 484790
> Index: net/telegram-purple/patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/net/telegram-purple/patches/patch-Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-Makefile_in
> --- net/telegram-purple/patches/patch-Makefile_in 24 Jun 2017 00:20:17 
> -  1.1.1.1
> +++ net/telegram-purple/patches/patch-Makefile_in 25 Jan 2020 20:22:45 
> -
> @@ -3,18 +3,19 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
>  Index: Makefile.in
>  --- Makefile.in.orig
>  +++ Makefile.in
> -@@ -22,8 +22,8 @@ datarootdir=@datarootdir@
> - localedir=@localedir@
> - gettext_package=@GETTEXT_PACKAGE@
> +@@ -54,9 +54,9 @@ WIN32_CONTRIB_FILES=contrib/libgcrypt-20.dll contrib/l
> + CFLAGS_INTL=-DENABLE_NLS -DLOCALEDIR='"$(localedir)"'
> + CFLAGS_WARN=-Wall -Wextra -Wno-deprecated-declarations -Wno-unused-parameter
> + CFLAGS_EXTRA=-I${srcdir} -I. -fno-strict-aliasing -fPIC -D_FORTIFY_SOURCE=2
> +-CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} ${CFLAGS_WARN} 
> ${CFLAGS_EXTRA}
> ++CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} -fPIC
>   
> --CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS 
> -DLOCALEDIR='"$(localedir)"' -Wall -Wextra -Wno-deprecated-declarations 
> -Wno-unused-parameter -I${srcdir} -I. -fno-strict-aliasing -fPIC 
> -D_FORTIFY_SOURCE=2
> --LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic -ggdb
> -+CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS 
> -DLOCALEDIR='"$(localedir)"' -I${srcdir} -I. -fno-strict-aliasing -fPIC
> -+LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic
> - DIR_PERM=0755
> - FILE_PERM=0644
> +-LDFLAGS_EXTRA=-rdynamic -ggdb
> ++LDFLAGS_EXTRA=-rdynamic
> + LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ ${LDFLAGS_EXTRA}
>   
> -@@ -81,7 +81,7 @@ tgl/Makefile.in:
> + DIR_PERM=0755
> +@@ -116,7 +116,7 @@ tgl/Makefile.in:
>   @echo "tgl/Makefile.in not found. Maybe you need to 'git submodule 
> update --init --recursive' ?" && exit 1
>   
>   tgl/Makefile: tgl/Makefile.in Makefile
> Index: net/telegram-purple/patches/patch-tgl_Makefile_in
> ===
> RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r

Re: [update] net/telegram-purple version 1.3.1 to 1.4.2

[Giovanni Bechis]

On Sat, Jan 25, 2020 at 09:38:23AM +0100, Stefan Hagen wrote:
> Hello,
> 
> this is an update for net/telegram-purple.
> 
> Port changes:
> - Updated patches
> - Reintroduced -fPIC as it won't build without it
> 
> Changelog:
> - mostly bugfixes and translation updates
> https://raw.githubusercontent.com/majn/telegram-purple/master/CHANGELOG.md
> 
> The BROKEN condition still applies. The code parse_tlo_file has not
> changed.
> 
afaik this is BROKEN-sparc64 as well, otherwise ok giovanni@

 Cheers
  Giovanni

> "make test" passes and I'm using it with pidgin.
> 
> Best Regards,
> Stefan
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/telegram-purple/Makefile,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile
> --- Makefile  12 Jul 2019 20:48:50 -  1.6
> +++ Makefile  25 Jan 2020 08:17:44 -
> @@ -2,8 +2,7 @@
>  
>  BROKEN-powerpc = assertion "get_int () == TLS_SCHEMA_V2" failed: file 
> "generate.c", line 2831, function "parse_tlo_file"
>  
> -V =  1.3.1
> -REVISION =   2
> +V =  1.4.2
>  COMMENT =Telegram support for Pidgin
>  DISTNAME =   telegram-purple_$V.orig
>  PKGNAME =telegram-purple-$V
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/telegram-purple/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo  24 Jun 2017 00:20:17 -  1.1.1.1
> +++ distinfo  25 Jan 2020 08:17:44 -
> @@ -1,2 +1,2 @@
> -SHA256 (telegram-purple_1.3.1.orig.tar.gz) = 
> hpYnwitP1WyH1V0FQ1NTnzi4rhaSoBEebmaCr+ZUd9c=
> -SIZE (telegram-purple_1.3.1.orig.tar.gz) = 509083
> +SHA256 (telegram-purple_1.4.2.orig.tar.gz) = 
> vpkLXKwlzNpPuMBFotQjKW9K8Vhz9mwpk/uazz0eSWI=
> +SIZE (telegram-purple_1.4.2.orig.tar.gz) = 484790
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/net/telegram-purple/patches/patch-Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-Makefile_in
> --- patches/patch-Makefile_in 24 Jun 2017 00:20:17 -  1.1.1.1
> +++ patches/patch-Makefile_in 25 Jan 2020 08:17:44 -
> @@ -3,18 +3,19 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
>  Index: Makefile.in
>  --- Makefile.in.orig
>  +++ Makefile.in
> -@@ -22,8 +22,8 @@ datarootdir=@datarootdir@
> - localedir=@localedir@
> - gettext_package=@GETTEXT_PACKAGE@
> +@@ -54,9 +54,9 @@ WIN32_CONTRIB_FILES=contrib/libgcrypt-20.dll contrib/l
> + CFLAGS_INTL=-DENABLE_NLS -DLOCALEDIR='"$(localedir)"'
> + CFLAGS_WARN=-Wall -Wextra -Wno-deprecated-declarations -Wno-unused-parameter
> + CFLAGS_EXTRA=-I${srcdir} -I. -fno-strict-aliasing -fPIC -D_FORTIFY_SOURCE=2
> +-CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} ${CFLAGS_WARN} 
> ${CFLAGS_EXTRA}
> ++CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} -fPIC
>   
> --CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS 
> -DLOCALEDIR='"$(localedir)"' -Wall -Wextra -Wno-deprecated-declarations 
> -Wno-unused-parameter -I${srcdir} -I. -fno-strict-aliasing -fPIC 
> -D_FORTIFY_SOURCE=2
> --LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic -ggdb
> -+CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS 
> -DLOCALEDIR='"$(localedir)"' -I${srcdir} -I. -fno-strict-aliasing -fPIC
> -+LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic
> - DIR_PERM=0755
> - FILE_PERM=0644
> +-LDFLAGS_EXTRA=-rdynamic -ggdb
> ++LDFLAGS_EXTRA=-rdynamic
> + LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ ${LDFLAGS_EXTRA}
>   
> -@@ -81,7 +81,7 @@ tgl/Makefile.in:
> + DIR_PERM=0755
> +@@ -116,7 +116,7 @@ tgl/Makefile.in:
>   @echo "tgl/Makefile.in not found. Maybe you need to 'git submodule 
> update --init --recursive' ?" && exit 1
>   
>   tgl/Makefile: tgl/Makefile.in Makefile
> Index: patches/patch-tgl_Makefile_in
> ===
> RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-tgl_Makefile_in
> --- patches/patch-tgl_Makefile_in 24 Jun 2017 00:20:17 -  1.1.1.1
> +++ patches/patch-tgl_Makefile_in 25 Jan 2020 08:17:44 -
> @@ -7,7 +7,7 @@ Index: tgl/Makefile.in
>   LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@
>   CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
>   DEFS=@DEFS@
> --COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra 
> -Werror -Wno-deprecated-declarations -fno-strict-aliasing 
> -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
> +-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra 
> -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer 
> -ggdb -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
>  +COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -fno-strict-aliasing 
> -fno-omit-frame-pointer

UPDATE: www/ap2-mod_perl

[Giovanni Bechis]

Update to latest version.
Comments ? Ok?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/www/ap2-mod_perl/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile12 Jul 2019 20:50:17 -  1.45
+++ Makefile2 Jan 2020 16:12:04 -
@@ -2,9 +2,8 @@
 
 COMMENT=   module that embeds a Perl interpreter into Apache2
 
-DISTNAME=  mod_perl-2.0.10
+DISTNAME=  mod_perl-2.0.11
 PKGNAME=   ap2-${DISTNAME:S/-rc/rc/}
-REVISION=  0
 CATEGORIES=www net
 
 MODULES=   cpan
@@ -13,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=perl
 # Apache Software License
 PERMIT_PACKAGE=Yes
 
-WANTLIB += apr-1 aprutil-1 c db expat iconv m perl pthread util
+WANTLIB += apr-1 aprutil-1 c db expat iconv m perl pthread
 
 CONFIGURE_ARGS+=   MP_APXS=${LOCALBASE}/sbin/apxs2 \
MP_NO_THREADS=1
@@ -25,5 +24,8 @@ BUILD_DEPENDS=${RUN_DEPENDS}
 USE_GMAKE= Yes
 
 PORTHOME=  ${WRKDIR}
+
+post-install:
+   find ${PREFIX} -name '*.orig' -print0 | xargs -0 rm
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/www/ap2-mod_perl/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo26 Jan 2019 22:40:30 -  1.8
+++ distinfo2 Jan 2020 16:12:04 -
@@ -1,2 +1,2 @@
-SHA256 (mod_perl-2.0.10.tar.gz) = 0c+D7U6jqd/Oqm2WYv9kUXcJB0mIEJMFECC/QvmHK2Q=
-SIZE (mod_perl-2.0.10.tar.gz) = 3846211
+SHA256 (mod_perl-2.0.11.tar.gz) = yiqeGM35D5xgI+eGNp1bp16NrCkuv+qZAMKb9C3Bb3Q=
+SIZE (mod_perl-2.0.11.tar.gz) = 3848147
Index: patches/patch-Apache-Test_lib_Apache_TestConfig_pm
===
RCS file: 
/cvs/ports/www/ap2-mod_perl/patches/patch-Apache-Test_lib_Apache_TestConfig_pm,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Apache-Test_lib_Apache_TestConfig_pm
--- patches/patch-Apache-Test_lib_Apache_TestConfig_pm  29 Apr 2016 08:21:03 
-  1.1
+++ patches/patch-Apache-Test_lib_Apache_TestConfig_pm  2 Jan 2020 16:12:04 
-
@@ -1,7 +1,8 @@
 $OpenBSD: patch-Apache-Test_lib_Apache_TestConfig_pm,v 1.1 2016/04/29 08:21:03 
sthen Exp $
 Apache-Test/lib/Apache/TestConfig.pm.orig  Fri Apr 29 09:12:45 2016
-+++ Apache-Test/lib/Apache/TestConfig.pm   Fri Apr 29 09:12:53 2016
-@@ -441,7 +441,7 @@ sub configure_apxs {
+Index: Apache-Test/lib/Apache/TestConfig.pm
+--- Apache-Test/lib/Apache/TestConfig.pm.orig
 Apache-Test/lib/Apache/TestConfig.pm
+@@ -474,7 +474,7 @@ sub configure_apxs {
  $vars->{conf_dir} ||= $self->apxs('SYSCONFDIR');
  
  if ($vars->{conf_dir}) {
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/ap2-mod_perl/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   4 Sep 2018 12:46:24 -   1.12
+++ pkg/PLIST   2 Jan 2020 16:12:04 -
@@ -55,7 +55,7 @@ include/apache2/modperl_util.h
 include/apache2/modperl_xs_sv_convert.h
 include/apache2/modperl_xs_typedefs.h
 include/apache2/modperl_xs_util.h
-lib/apache2/mod_perl.so
+@so lib/apache2/mod_perl.so
 ${P5ARCH}/
 ${P5ARCH}/APR/
 ${P5ARCH}/APR.pm
@@ -192,114 +192,114 @@ ${P5ARCH}/ModPerl/Util.pm
 ${P5ARCH}/ModPerl/WrapXS.pm
 ${P5ARCH}/auto/
 ${P5ARCH}/auto/APR/
-${P5ARCH}/auto/APR/APR.so
+@so ${P5ARCH}/auto/APR/APR.so
 ${P5ARCH}/auto/APR/Base64/
-${P5ARCH}/auto/APR/Base64/Base64.so
+@so ${P5ARCH}/auto/APR/Base64/Base64.so
 ${P5ARCH}/auto/APR/Brigade/
-${P5ARCH}/auto/APR/Brigade/Brigade.so
+@so ${P5ARCH}/auto/APR/Brigade/Brigade.so
 ${P5ARCH}/auto/APR/Bucket/
-${P5ARCH}/auto/APR/Bucket/Bucket.so
+@so ${P5ARCH}/auto/APR/Bucket/Bucket.so
 ${P5ARCH}/auto/APR/BucketAlloc/
-${P5ARCH}/auto/APR/BucketAlloc/BucketAlloc.so
+@so ${P5ARCH}/auto/APR/BucketAlloc/BucketAlloc.so
 ${P5ARCH}/auto/APR/BucketType/
-${P5ARCH}/auto/APR/BucketType/BucketType.so
+@so ${P5ARCH}/auto/APR/BucketType/BucketType.so
 ${P5ARCH}/auto/APR/Const/
-${P5ARCH}/auto/APR/Const/Const.so
+@so ${P5ARCH}/auto/APR/Const/Const.so
 ${P5ARCH}/auto/APR/Date/
-${P5ARCH}/auto/APR/Date/Date.so
+@so ${P5ARCH}/auto/APR/Date/Date.so
 ${P5ARCH}/auto/APR/Error/
-${P5ARCH}/auto/APR/Error/Error.so
+@so ${P5ARCH}/auto/APR/Error/Error.so
 ${P5ARCH}/auto/APR/Finfo/
-${P5ARCH}/auto/APR/Finfo/Finfo.so
+@so ${P5ARCH}/auto/APR/Finfo/Finfo.so
 ${P5ARCH}/auto/APR/IpSubnet/
-${P5ARCH}/auto/APR/IpSubnet/IpSubnet.so
+@so ${P5ARCH}/auto/APR/IpSubnet/IpSubnet.so
 ${P5ARCH}/auto/APR/OS/
-${P5ARCH}/auto/APR/OS/OS.so
+@so ${P5ARCH}/auto/APR/OS/OS.so
 ${P5ARCH}/auto/APR/PerlIO/
-${P5ARCH}/auto/APR/PerlIO/PerlIO.so
+@so ${P5ARCH}/auto/APR/PerlIO/PerlIO.so
 ${P5ARCH}/auto/APR/Pool/
-${P5ARCH}/auto/APR/Pool/Pool.so
+@so ${P5ARCH}/auto/APR/Pool/Pool.so
 ${P5ARCH}/auto/APR/SockAddr/
-${P5ARCH}/auto/APR/SockAddr/SockAddr.so
+@so ${P5ARCH}/auto/APR/SockAddr/SockAddr.so
 ${P5ARCH}/auto/APR/Socket/
-${P5A

WIP UPDATE: graphics/gimp/stable

[Giovanni Bechis]

Update to 2.10.14, I haven't checked if the removed plugins have been erased by 
upstream
or they do not build anymore.
 Giovanni

Index: Makefile
===
RCS file: /cvs/ports/graphics/gimp/stable/Makefile,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile
--- Makefile29 Nov 2019 12:15:46 -  1.126
+++ Makefile1 Dec 2019 15:30:59 -
@@ -2,7 +2,7 @@
 
 COMMENT=   GNU Image Manipulation Program
 
-DISTNAME = gimp-2.10.12
+DISTNAME = gimp-2.10.14
 
 .for i in gimp gimpbase gimpcolor gimpconfig gimpmath gimpmodule \
gimpthumb gimpui gimpwidgets
Index: distinfo
===
RCS file: /cvs/ports/graphics/gimp/stable/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo29 Nov 2019 12:15:46 -  1.39
+++ distinfo1 Dec 2019 15:30:59 -
@@ -1,2 +1,2 @@
-SHA256 (gimp-2.10.12.tar.bz2) = fYC1jgeEEg1X0ycpT2of2igf9Rphk1ws12TaKBrKrHE=
-SIZE (gimp-2.10.12.tar.bz2) = 32614932
+SHA256 (gimp-2.10.14.tar.bz2) = 35sPEcIHjuod4+vGZSml04VMXihjbNJajdB3vZ1t3FQ=
+SIZE (gimp-2.10.14.tar.bz2) = 32786424
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/gimp/stable/pkg/PLIST,v
retrieving revision 1.42
diff -u -p -r1.42 PLIST
--- pkg/PLIST   29 Nov 2019 12:15:46 -  1.42
+++ pkg/PLIST   1 Dec 2019 15:31:00 -
@@ -315,8 +315,6 @@ lib/gimp/2.0/plug-ins/colorxhtml/colorxh
 lib/gimp/2.0/plug-ins/colorxhtml/colorxhtml.pyc
 lib/gimp/2.0/plug-ins/compose/
 @bin lib/gimp/2.0/plug-ins/compose/compose
-lib/gimp/2.0/plug-ins/contrast-normalize/
-@bin lib/gimp/2.0/plug-ins/contrast-normalize/contrast-normalize
 lib/gimp/2.0/plug-ins/contrast-retinex/
 @bin lib/gimp/2.0/plug-ins/contrast-retinex/contrast-retinex
 lib/gimp/2.0/plug-ins/crop-zealous/
@@ -333,8 +331,6 @@ lib/gimp/2.0/plug-ins/destripe/
 @bin lib/gimp/2.0/plug-ins/destripe/destripe
 lib/gimp/2.0/plug-ins/edge-dog/
 @bin lib/gimp/2.0/plug-ins/edge-dog/edge-dog
-lib/gimp/2.0/plug-ins/edge-neon/
-@bin lib/gimp/2.0/plug-ins/edge-neon/edge-neon
 lib/gimp/2.0/plug-ins/emboss/
 @bin lib/gimp/2.0/plug-ins/emboss/emboss
 lib/gimp/2.0/plug-ins/file-aa/
@@ -493,12 +489,8 @@ lib/gimp/2.0/plug-ins/metadata-editor/
 @bin lib/gimp/2.0/plug-ins/metadata-editor/metadata-editor
 lib/gimp/2.0/plug-ins/metadata-viewer/
 @bin lib/gimp/2.0/plug-ins/metadata-viewer/metadata-viewer
-lib/gimp/2.0/plug-ins/newsprint/
-@bin lib/gimp/2.0/plug-ins/newsprint/newsprint
 lib/gimp/2.0/plug-ins/nl-filter/
 @bin lib/gimp/2.0/plug-ins/nl-filter/nl-filter
-lib/gimp/2.0/plug-ins/oilify/
-@bin lib/gimp/2.0/plug-ins/oilify/oilify
 lib/gimp/2.0/plug-ins/pagecurl/
 @bin lib/gimp/2.0/plug-ins/pagecurl/pagecurl
 lib/gimp/2.0/plug-ins/palette-offset/
@@ -3700,6 +3692,7 @@ share/gtk-doc/html/libgimp/GimpProcBrows
 share/gtk-doc/html/libgimp/GimpProgressBar.html
 share/gtk-doc/html/libgimp/GimpSelectButton.html
 share/gtk-doc/html/libgimp/GimpZoomPreview.html
+share/gtk-doc/html/libgimp/api-index-2-10-14.html
 share/gtk-doc/html/libgimp/api-index-2-10-2.html
 share/gtk-doc/html/libgimp/api-index-2-10-4.html
 share/gtk-doc/html/libgimp/api-index-2-10-6.html
@@ -3800,6 +3793,7 @@ share/gtk-doc/html/libgimp/style.css
 share/gtk-doc/html/libgimp/up-insensitive.png
 share/gtk-doc/html/libgimp/up.png
 share/gtk-doc/html/libgimpbase/
+share/gtk-doc/html/libgimpbase/api-index-2-10-10.html
 share/gtk-doc/html/libgimpbase/api-index-2-10.html
 share/gtk-doc/html/libgimpbase/api-index-2-2.html
 share/gtk-doc/html/libgimpbase/api-index-2-4.html
@@ -3810,6 +3804,8 @@ share/gtk-doc/html/libgimpbase/home.png
 share/gtk-doc/html/libgimpbase/index.html
 share/gtk-doc/html/libgimpbase/left-insensitive.png
 share/gtk-doc/html/libgimpbase/left.png
+share/gtk-doc/html/libgimpbase/libgimpbase-GimpMetadata.html
+share/gtk-doc/html/libgimpbase/libgimpbase-GimpParasite.html
 share/gtk-doc/html/libgimpbase/libgimpbase-GimpValueArray.html
 share/gtk-doc/html/libgimpbase/libgimpbase-gimpbaseenums.html
 share/gtk-doc/html/libgimpbase/libgimpbase-gimpbasetypes.html
@@ -3819,9 +3815,7 @@ share/gtk-doc/html/libgimpbase/libgimpba
 share/gtk-doc/html/libgimpbase/libgimpbase-gimpenv.html
 share/gtk-doc/html/libgimpbase/libgimpbase-gimplimits.html
 share/gtk-doc/html/libgimpbase/libgimpbase-gimpmemsize.html
-share/gtk-doc/html/libgimpbase/libgimpbase-gimpmetadata.html
 share/gtk-doc/html/libgimpbase/libgimpbase-gimpparam.html
-share/gtk-doc/html/libgimpbase/libgimpbase-gimpparasite.html
 share/gtk-doc/html/libgimpbase/libgimpbase-gimpparasiteio.html
 share/gtk-doc/html/libgimpbase/libgimpbase-gimprectangle.html
 share/gtk-doc/html/libgimpbase/libgimpbase-gimpsignal.html
@@ -3836,6 +3830,7 @@ share/gtk-doc/html/libgimpbase/style.css
 share/gtk-doc/html/libgimpbase/up-insensitive.png
 share/gtk-doc/html/libgimpbase/up.png
 share/gtk-doc/html/libgimpcolor/
+share/gtk-doc/html/libgimpcolor/GimpColorManaged.

Re: WIP UPDATE: graphics/gimp

[Giovanni Bechis]

On 11/27/19 1:26 PM, Stuart Henderson wrote:
> On 2018/09/10 12:06, Giovanni Bechis wrote:
>> Hi,
>> update to latest version, it's working fine but I have not tested any of the 
>> additional plugins yet.
>> Few time to hack atm, so do not hold your breath.
> 
> Here's an updated version of this. I saw a segfault once but it hasn't
> occurred again and I haven't been able to track it down further.
> 
> (I know there's a newer one, but that requires dep updates which it would
> be simpler not to deal with at the same time, and this is enough to stop
> confusing me when I move between OpenBSD and other machines :-)
> 
I was working on 2.10.14 but I stopped when I found some dep that needs to be 
updated,
it is better to go on this road.

> deskew and lqr plugins still seem to work.
> 
ok giovanni@

Re: UPDATE net/filezilla-3.45.1

[Giovanni Bechis]

On 11/27/19 5:04 PM, Björn Ketelaars wrote:
> On Sat 16/11/2019 17:31, Björn Ketelaars wrote:
>> Diff below brings filezilla to 3.45.1. Changelog can be found at
>> https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?revision=9474&view=markup&pathrev=9474.
>>
>> Security related bugfix or otherwise critical bugfix:
>> - Filenames containing double-quotation marks were not escaped correctly
>>   when selected for opening/editing. Depending on the associated
>>   program, parts of the filename could be interpreted as commands.
>>
>> Note that this update depends on a newer version of libfilezilla than
>> the one we have in ports. An update of the latter has been sent to
>> ports@.
>>
>> 'make test' fails as cppunit>=1.13.0 is required, which we do not have.
>> Run tested on amd64.
>>
>> It would be nice if this update would be tested on hppa and/or alpha...
>>
>> Comments/OK?
> 
> Slightly updated diff (no need for 'do-test'). 'make test' runs¬   
> successful with the update of cppunit [0].¬
> ¬  
> OK?¬   
> ¬  
> [0] https://marc.info/?l=openbsd-ports&m=157445228006211&w=2]¬
> 
ok giovanni@ for both filezilla and libfilezilla
 Cheers
  Giovanni

Re: UPDATE: mail/p5-Mail-DMARC

[Giovanni Bechis]

On Sat, Nov 23, 2019 at 11:01:45AM +0100, Giovanni Bechis wrote:
> Simple update to latest version.
> Comments ? ok ?
>  Cheers
>   Giovanni
> 
patch from wen heping is more updated but portroach did not find it.
ok ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-DMARC/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile28 Sep 2019 12:20:17 -  1.11
+++ Makefile23 Nov 2019 10:22:00 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Perl implementation of DMARC
 
-DISTNAME=  Mail-DMARC-1.20190831
+DISTNAME=  Mail-DMARC-1.20191024
 MAINTAINER=Giovanni Bechis 
 
 CATEGORIES=mail
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-Mail-DMARC/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo28 Sep 2019 12:20:17 -  1.7
+++ distinfo23 Nov 2019 10:22:00 -
@@ -1,2 +1,2 @@
-SHA256 (Mail-DMARC-1.20190831.tar.gz) = 
Kohh1Xe3XlZn3c+4BYPjaSAdaQGHH5/PRzeUCiu4EdI=
-SIZE (Mail-DMARC-1.20190831.tar.gz) = 733485
+SHA256 (Mail-DMARC-1.20191024.tar.gz) = 
UFdvUEyJhd5QDAAQR/clxQjRwTn9/AjhiJWXxiZ2Uo8=
+SIZE (Mail-DMARC-1.20191024.tar.gz) = 784322
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/p5-Mail-DMARC/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   26 Jan 2016 22:10:48 -  1.2
+++ pkg/PLIST   23 Nov 2019 10:22:00 -
@@ -35,7 +35,12 @@ ${P5SITE}/Mail/DMARC/Report/Send/HTTP.pm
 ${P5SITE}/Mail/DMARC/Report/Send/SMTP.pm
 ${P5SITE}/Mail/DMARC/Report/Store/
 ${P5SITE}/Mail/DMARC/Report/Store.pm
+${P5SITE}/Mail/DMARC/Report/Store/SQL/
 ${P5SITE}/Mail/DMARC/Report/Store/SQL.pm
+${P5SITE}/Mail/DMARC/Report/Store/SQL/Grammars/
+${P5SITE}/Mail/DMARC/Report/Store/SQL/Grammars/MySQL.pm
+${P5SITE}/Mail/DMARC/Report/Store/SQL/Grammars/PostgreSQL.pm
+${P5SITE}/Mail/DMARC/Report/Store/SQL/Grammars/SQLite.pm
 ${P5SITE}/Mail/DMARC/Report/URI.pm
 ${P5SITE}/Mail/DMARC/Result/
 ${P5SITE}/Mail/DMARC/Result.pm
@@ -107,6 +112,7 @@ ${P5SITE}/auto/share/dist/Mail-DMARC/htm
 ${P5SITE}/auto/share/dist/Mail-DMARC/mail-dmarc.cron
 ${P5SITE}/auto/share/dist/Mail-DMARC/mail-dmarc.ini
 ${P5SITE}/auto/share/dist/Mail-DMARC/mail_dmarc_schema.mysql
+${P5SITE}/auto/share/dist/Mail-DMARC/mail_dmarc_schema.pgsql
 ${P5SITE}/auto/share/dist/Mail-DMARC/mail_dmarc_schema.sqlite
 ${P5SITE}/auto/share/dist/Mail-DMARC/public_suffix_list
 ${P5SITE}/auto/share/dist/Mail-DMARC/rua-schema.xsd
@@ -139,6 +145,9 @@ ${P5SITE}/auto/share/dist/Mail-DMARC/rua
 @man man/man3p/Mail::DMARC::Report::Send::SMTP.3p
 @man man/man3p/Mail::DMARC::Report::Store.3p
 @man man/man3p/Mail::DMARC::Report::Store::SQL.3p
+@man man/man3p/Mail::DMARC::Report::Store::SQL::Grammars::MySQL.3p
+@man man/man3p/Mail::DMARC::Report::Store::SQL::Grammars::PostgreSQL.3p
+@man man/man3p/Mail::DMARC::Report::Store::SQL::Grammars::SQLite.3p
 @man man/man3p/Mail::DMARC::Report::URI.3p
 @man man/man3p/Mail::DMARC::Result.3p
 @man man/man3p/Mail::DMARC::Result::Reason.3p


signature.asc
Description: PGP signature

UPDATE: mail/p5-Mail-DMARC

[Giovanni Bechis]

Simple update to latest version.
Comments ? ok ?
 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-Mail-DMARC/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile28 Sep 2019 12:20:17 -  1.11
+++ Makefile23 Nov 2019 09:59:46 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Perl implementation of DMARC
 
-DISTNAME=  Mail-DMARC-1.20190831
+DISTNAME=  Mail-DMARC-1.20191004
 MAINTAINER=Giovanni Bechis 
 
 CATEGORIES=mail
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-Mail-DMARC/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo28 Sep 2019 12:20:17 -  1.7
+++ distinfo23 Nov 2019 09:59:46 -
@@ -1,2 +1,2 @@
-SHA256 (Mail-DMARC-1.20190831.tar.gz) = 
Kohh1Xe3XlZn3c+4BYPjaSAdaQGHH5/PRzeUCiu4EdI=
-SIZE (Mail-DMARC-1.20190831.tar.gz) = 733485
+SHA256 (Mail-DMARC-1.20191004.tar.gz) = 
leuh7B6kIYMtk0wU6J/DvY/M8TDHj+JOkuMbB7wsPpw=
+SIZE (Mail-DMARC-1.20191004.tar.gz) = 737794


signature.asc
Description: PGP signature

Re: UPDATE net/filezilla-3.45.1

[Giovanni Bechis]

On Sat, Nov 16, 2019 at 05:31:28PM +0100, Björn Ketelaars wrote:
> Diff below brings filezilla to 3.45.1. Changelog can be found at
> https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?revision=9474&view=markup&pathrev=9474.
> 
> Security related bugfix or otherwise critical bugfix:
> - Filenames containing double-quotation marks were not escaped correctly
>   when selected for opening/editing. Depending on the associated
>   program, parts of the filename could be interpreted as commands.
> 
> Note that this update depends on a newer version of libfilezilla than
> the one we have in ports. An update of the latter has been sent to
> ports@.
> 
> 'make test' fails as cppunit>=1.13.0 is required, which we do not have.
> Run tested on amd64.
> 
cppunit update to 1.14 follows.
comments ? ok ?

 Cheers
  Giovanni

Index: Makefile
===
RCS file: /cvs/ports/devel/cppunit/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:44:06 -  1.20
+++ Makefile22 Nov 2019 17:00:50 -
@@ -2,23 +2,22 @@
 
 COMMENT=   c++ unit testing framework
 
-DISTNAME=  cppunit-1.12.1
-REVISION = 4
+V= 1.14
+DISTNAME=  cppunit-${V}.0
 
-SHARED_LIBS += cppunit  3.0  # .1.0
+SHARED_LIBS += cppunit 0.0 # 3.0
+SHARED_LIBS += cppunit-${V}0.0 # 3.0
 
 CATEGORIES=devel
 
-# XXX dead.  Switch to newer releases at
-# https://freedesktop.org/wiki/Software/cppunit/ ?
-HOMEPAGE=  http://cppunit.sourceforge.net/
+HOMEPAGE=  https://www.freedesktop.org/wiki/Software/cppunit/
 
 # LGPLv2.1
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   c m ${COMPILER_LIBCXX}
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cppunit/}
+MASTER_SITES=  http://dev-www.libreoffice.org/src/
 
 COMPILER = base-clang ports-gcc base-gcc
 
Index: distinfo
===
RCS file: /cvs/ports/devel/cppunit/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:13:09 -  1.4
+++ distinfo22 Nov 2019 17:00:50 -
@@ -1,2 +1,2 @@
-SHA256 (cppunit-1.12.1.tar.gz) = rCigTI5skhfZELCucSKDLSjZkX+maLzJ4LiwmstOpEo=
-SIZE (cppunit-1.12.1.tar.gz) = 762803
+SHA256 (cppunit-1.14.0.tar.gz) = PVaYadJ7SIYCEMdYxPMTCCEDpeWCGadmm1K/0p1nR4A=
+SIZE (cppunit-1.14.0.tar.gz) = 959716
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/cppunit/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in   24 Oct 2008 14:49:44 -  1.1
+++ patches/patch-Makefile_in   22 Nov 2019 17:00:50 -
@@ -1,12 +1,13 @@
 $OpenBSD: patch-Makefile_in,v 1.1 2008/10/24 14:49:44 jasper Exp $
 Makefile.in.orig   Sun Oct 19 23:43:08 2008
-+++ Makefile.inSun Oct 19 23:43:11 2008
-@@ -231,7 +231,7 @@ top_builddir = @top_builddir@
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -385,7 +385,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.4
- ACLOCAL_AMFLAGS = -I config
+ ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = src include examples doc
 +SUBDIRS = src include examples
- pkgconfigdatadir = $(libdir)/pkgconfig
- pkgconfigdata_DATA = cppunit.pc
- bin_SCRIPTS = cppunit-config
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = cppunit.pc
+ doc_DATA = \
Index: patches/patch-src_cppunit_Makefile_in
===
RCS file: patches/patch-src_cppunit_Makefile_in
diff -N patches/patch-src_cppunit_Makefile_in
--- patches/patch-src_cppunit_Makefile_in   24 Oct 2008 14:49:44 -  
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_cppunit_Makefile_in,v 1.2 2008/10/24 14:49:44 jasper Exp $
 src/cppunit/Makefile.in.orig   Wed Feb 20 06:59:55 2008
-+++ src/cppunit/Makefile.inSun Oct 19 23:03:52 2008
-@@ -299,8 +299,7 @@ libcppunit_la_SOURCES = \
-   Win32DynamicLibraryManager.cpp
- 
- libcppunit_la_LDFLAGS = \
-- -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
-+ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- all: all-am
- 
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/cppunit/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   16 Mar 2015 18:07:39 -  1.3
+++ pkg/PLIST   22 Nov 2019 17:00:50 -
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:39 naddy Exp $
+@comment $OpenBSD: PLIST,v$
 @bin bin/DllPlugInTester
-bin/cppunit-config
 include/cppunit/
 include/cppunit/AdditionalMessage.h
 include/cppunit/Asserter.h
@@ -67,33 +66,28 @@ include/cppunit/plugin/PlugInParameters.
 

Re: nextcloudclient port

[Giovanni Bechis]

On 11/16/19 8:49 AM, Rafael Sadowski wrote:
> On Fri Nov 15, 2019 at 07:47:32PM +0300, Kirill Bychkov wrote:
>> On Fri, November 15, 2019 19:37, Giovanni Bechis wrote:
>>> On 11/15/19 4:08 PM, Kirill Bychkov wrote:
>>>> On Fri, November 8, 2019 16:15, Adriano Barbosa wrote:
>>>>> Em sex., 8 de nov. de 2019 ?s 09:32, Kirill Bychkov
>>>>>  escreveu:
>>>>>>
>>>>>> On Fri, November 8, 2019 12:32, Adriano Barbosa wrote:
>>>>>>> By the way, Kirill's suggestions are ok for me. Just compiled it
>>>>>>> without problems.
>>>>>>>
>>>>>>> Best
>>>>>>>
>>>>>>> Em sex., 8 de nov. de 2019 ?s 06:03, Adriano Barbosa
>>>>>>>  escreveu:
>>>>>>>>
>>>>>>>> Hi Kirill,
>>>>>>>> thank you for your test and suggestions.
>>>>>>>> error: use of undeclared identifier 'EVP_PKEY_CTX_set_rsa_oaep_md' is
>>>>>>>> related to LibreSSL. Are you running -current?
>>>>>>>> My original port had a patch for it, but its not necessary anymore in
>>>>>>>> -current.
>>>>>>
>>>>>> My -current was two weeks old, sorry. Now it builds fine.
>>>>>> Not tested yet.
>>>>>>
>>>>>> owncloudclient has 40 test and one is failing (FolderWatcherTest).
>>>>>> nextcloudclient has 35 tests and four of them are failing:
>>>>>>  12 - UtilityTest (Failed)
>>>>>>  19 - AllFilesDeletedTest (Failed)
>>>>>>  33 - check_vio_ext (Failed)
>>>>>>  35 - check_encoding_functions (Failed)
>>>>>> All of them passes in owncloudclient.
>>>>>
>>>>> I'm trying to learn as much as I can from this porting process and
>>>>> tests using cmake/cmocka are part of my ignorance. I found 25 binaries
>>>>> related to tests in ${WRKSRC}/nextcloudclient-2.6.1/build-amd64/bin
>>>>> after building the port. None of them fails, including
>>>>> AllFilesDeletedTest and UtilityTest, log attached, didn't find the
>>>>> other two tests you pointed out. I would be very happy if you could
>>>>> point out something for me to read about it.
>>>>
>>>> We can deal with the tests later. Nextcloudclient works fine for me
>>>> with my owncloud server. It even works better than owncloudclient
>>>> I'm maintaining. It syncs all my files without errors. With
>>>> owncloudclient I have to add more and more files to exclude list
>>>> because it fails.
>>>> Attached is updated tarball with more tweaks:
>>>>  - add COMPILER and comment because of c++14
>>>>  - pre-configure -> post-extract
>>>>  - saet SYSCONF_INSTALL_DIR similar to owncloudclient
>>>>  - fix typos in post-extract comment
>>>>  - use post-install target for dance with global exclude list (same
>>>> as in owncloudclient)
>>>> Changes for config file were needed because previous version of port
>>>> errors immediately after finishing setup wizard complaining that global
>>>> exclude file couldn't be found.
>>>> Currently it works for me. I want to test fresh install to be sure it
>>>> will work fine.
>>>>
>>> Bogus WANTLIB: inotify.2 (/usr/local/lib/libnextcloudsync.so.0.0) (NOT
>>> REACHABLE)
>>
>> That's normal for all ports linking with inotify.
>>
>>>
>>> at runtime I have the error:
>>> could not read system exclude file
>>>
>>> doas mkdir /etc/Nextcloud && doas cp
>>> /usr/obj/ports/nextcloudclient-2.6.1/desktop-2.6.1/sync-exclude.lst
>>> /etc/Nextcloud
>>> fixes the problem.
>>
>> Thanks for testing. So the last tweak we need is to add a couple of
>> @sample lines.
>> Updated tarball attached.
>>
>>>
> 
> Small tweaks:
> 
> - Fix spaces, tabs
> - Remove COMPILER because it comes from qt5
> 
> Optional: I would prefer "desktop sync client for Nextcloud" as COMMENT.
> 
> With this two tweaks + optional comment, OK rsadowski@ to import it.
> 
ok giovanni@ with all tweaks, I would prefer rsadowsky@ comment as well

> --- Makefile.orig Fri Nov 15 22:05:27 2019
> +++ Makefile  Fri Nov 15 22:11:04 2019
> @@ -1,13 +1,13 @@
>  # $OpenBSD: Makefile.template,v 1.85 2019/09/09 19:19:05 kmos Exp $ #
>  
> -COMMENT =nextcloud sync client
> +COMMENT =desktop sync client for Nextcloud
>  
>  V =  2.6.1
>  DISTNAME =   nextcloudclient-${V}
>  
> -GH_ACCOUNT =nextcloud
> -GH_PROJECT =desktop
> -GH_TAGNAME =v${V}
> +GH_ACCOUNT = nextcloud
> +GH_PROJECT = desktop
> +GH_TAGNAME = v${V}
>  
>  CATEGORIES = net
>  
> @@ -27,9 +27,6 @@ WANTLIB += sqlite3 ssl z lib/inotify/inotify
>  
>  MODULES =devel/cmake \
>   x11/qt5
> -
> -# C++14
> -COMPILER =   base-clang ports-gcc
>  
>  BUILD_DEPENDS =  devel/gettext,-tools
>  
>