OpenBSD Mail Box: September 2019

Monday, September 30, 2019

Re: valgrind diff to fix run memcheck on amd64

From: Masato Asou <asou@soum.co.jp>
Date: Fri, 27 Sep 2019 13:18:50 +0900 (JST)

> Hi ports,
>
> This is a patch for running valgrind memcheck on amd64. I corrected
> the following two problems.
>
> - FS register can be used.
> - Fixed a problem that strip command rewrites offset and align of
> memcheck ELF file.

Additional information:

- Abort trap was occurred when lounched valgrind.

$ cd /usr/ports/devel/valgrind
$ make && doas make install
$ valgrind /bin/ls
Abort trap
$

Sorry, I lost --strip-all option into
coregrind/link_tool_exe_openbsd.in.

New patch is below:

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/valgrind/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 12 Jul 2019 20:46:03 -0000 1.19
+++ Makefile 27 Sep 2019 03:08:46 -0000
@@ -38,4 +38,10 @@ AUTORECONF = /bin/sh ./autogen.sh
.if ${PROPERTIES:Mclang}
# replace -lgcc
MAKE_FLAGS = TOOL_LDADD_COMMON=-lcompiler_rt
+# XXX The '-s' option was not specified when executing the install command.
+# Instead '--strip-all' is now executed at link time.
+# strip command rewrite offset and align in ELF file. Therefor, when valgrind
+# launch memcheck-amd64-openbsd, an Abort trap occurs in the execvp() system
+# call.
+INSTALL_STRIP =
.endif
Index: patches/patch-VEX_priv_guest_amd64_helpers_c
===================================================================
RCS file: patches/patch-VEX_priv_guest_amd64_helpers_c
diff -N patches/patch-VEX_priv_guest_amd64_helpers_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-VEX_priv_guest_amd64_helpers_c 27 Sep 2019 03:08:46 -0000
@@ -0,0 +1,16 @@
+--- VEX/priv/guest_amd64_helpers.c.orig
++++ VEX/priv/guest_amd64_helpers.c
+@@ -3744,6 +3744,13 @@ void LibVEX_GuestAMD64_initialise ( /*OUT*/VexGuestAMD64State* vex_state )
+ /* HACK: represent the offset associated with %fs==0. This
+ assumes that %fs is only ever zero. */
+ vex_state->guest_FS_ZERO = 0;
++#if defined(__OpenBSD__)
++{
++ int fs;
++ __asm__("mov %%fs,%0" : "=r" (fs));
++ vex_state->guest_FS_ZERO = fs;
++}
++

Re: [update] security/polarssl 2.16.3

On Thu 19/09/2019 20:34, Björn Ketelaars wrote:
> Mbed TLS 2.16.3 is a maintenance release of the Mbed TLS 2.16 branch,
> and provides bug fixes and minor enhancements. Overview of changes can
> be found at
> https://github.com/ARMmbed/mbedtls/releases/tag/mbedtls-2.16.3.
>
> Major of mbedx509 has been bumped as check_sym found changes in data
> object sizes. Minor of mbedcrypto has been bumped as symbols have been
> added.
>
> 'make test' runs successfully on amd64. Build tested all consumers, and
> run tested with net/openvpn,mbedtls.
>
> OK?

Ping.

diff --git Makefile Makefile
index 6688890c02a..143997113df 100644
--- Makefile
+++ Makefile
@@ -4,13 +4,13 @@ PORTROACH= limit:^2\.16

COMMENT= SSL library with an intuitive API and readable source code

-DISTNAME= mbedtls-2.16.2
+DISTNAME= mbedtls-2.16.3
EXTRACT_SUFX= -gpl.tgz

# check SOVERSION
SHARED_LIBS += mbedtls 6.1 # 12
-SHARED_LIBS += mbedcrypto 4.2 # 3
-SHARED_LIBS += mbedx509 3.1 # 0
+SHARED_LIBS += mbedcrypto 4.3 # 3
+SHARED_LIBS += mbedx509 4.0 # 0

CATEGORIES= security

diff --git distinfo distinfo
index ec8ec6d9861..d8a902b3eb9 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mbedtls-2.16.2-gpl.tgz) = QNGJZd02zgFYorA3yMVEAbrVT2g/QxFQJRjuGhoLYiw=
-SIZE (mbedtls-2.16.2-gpl.tgz) = 2561449
+SHA256 (mbedtls-2.16.3-gpl.tgz) = /QH+SyiRFt93gdBeHvcStsmII8UzT0onQE8TqNBm72o=
+SIZE (mbedtls-2.16.3-gpl.tgz) = 2560598
diff --git patches/patch-include_mbedtls_config_h patches/patch-include_mbedtls_config_h
index d3341e52029..6ab437fd3aa 100644
--- patches/patch-include_mbedtls_config_h
+++ patches/patch-include_mbedtls_config_h
@@ -6,7 +6,7 @@ www/hiawatha.
Index: include/mbedtls/config.h
--- include/mbedtls/config.h.orig
+++ include/mbedtls/config.h
-@@ -1644,7 +1644,7 @@
+@@ -1678,7 +1678,7 @@
*
* Uncomment this to enable pthread mutexes.
*/
@@ -15,7 +15,7 @@ Index: include/mbedtls/config.h

/**
* \def MBEDTLS_VERSION_FEATURES
-@@ -2836,7 +2836,7 @@
+@@ -2870,7 +2870,7 @@
*
* Enable this layer to allow use of mutexes within mbed TLS
*/
diff --git patches/patch-tests_suites_host_test_function patches/patch-tests_suites_host_test_function
index 20abcc0633d..d247ff05d8d 100644
--- patches/patch-tests_suites_host_test_function
+++ patches/patch-tests_suites_host_test_function
@@ -15,8 +15,8 @@ Index: tests/suites/host_test.function

#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) && \
!defined(TEST_SUITE_MEMORY_BUFFER_ALLOC)
-@@ -548,20 +545,6 @@ int execute_tests( int argc , const char ** argv )
- test_info.failed = 0;
+@@ -549,20 +546,6 @@ int execute_tests( int argc , const char ** argv )
+ test_info.result = TEST_RESULT_SUCCESS;
test_info.paramfail_test_state = PARAMFAIL_TESTSTATE_IDLE;

-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
@@ -36,7 +36,7 @@ Index: tests/suites/host_test.function

function_id = strtol( params[0], NULL, 10 );
if ( (ret = check_test( function_id )) == DISPATCH_TEST_SUCCESS )
-@@ -573,13 +556,6 @@ int execute_tests( int argc , const char ** argv )
+@@ -574,13 +557,6 @@ int execute_tests( int argc , const char ** argv )
}
}

@@ -50,7 +50,7 @@ Index: tests/suites/host_test.function

}

-@@ -663,10 +639,6 @@ int execute_tests( int argc , const char ** argv )
+@@ -669,10 +645,6 @@ int execute_tests( int argc , const char ** argv )
mbedtls_memory_buffer_alloc_free();

[Update] textproc/p5-LaTeX-Driver : Update to 0.300.2

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/p5-LaTeX-Driver/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 12 Jul 2019 20:50:03 -0000 1.7
+++ Makefile 1 Oct 2019 01:51:24 -0000
@@ -2,9 +2,8 @@

COMMENT = driver to format LaTeX documents

-DISTNAME = LaTeX-Driver-0.200.4
+DISTNAME = LaTeX-Driver-0.300.2
CATEGORIES = textproc
-REVISION = 0

MODULES = cpan
PKG_ARCH = *
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/p5-LaTeX-Driver/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 25 May 2015 17:11:53 -0000 1.3
+++ distinfo 1 Oct 2019 01:51:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (LaTeX-Driver-0.200.4.tar.gz) = +FNQGEes6DS3hgkLrmMA7fvwINnexxBJekaEykWYt3s=
-SIZE (LaTeX-Driver-0.200.4.tar.gz) = 63968
+SHA256 (LaTeX-Driver-0.300.2.tar.gz) = +WNTljTjqxe8QwHjZ73YZvOHBpBnqfediTM9PIfneh0=
+SIZE (LaTeX-Driver-0.300.2.tar.gz) = 54084
Hi,

Here is a simple patch to update textproc/p5-LaTeX-Driver to 0.300.2.
It build well and passed all tests on amd64-head system.
No other ports depends on it.

Comments? OK?
wen

aarch64 bulk build report

Re: [NEW] comms/pterm-6.0.4

Stuart Henderson <stu@spacehopper.org> wrote:

> On 2019/09/29 16:00, trondd wrote:
> > Stuart Henderson <stu@spacehopper.org> wrote:
> >
> > > tar is mangled (sent as text/plain).
> > >
> > > On 2019/09/28 10:31, trondd wrote:
> > > > Bump to the top.
> > > >
> > > > No retro-computing/BBS nostalgia here? :P
> > > >
> > > > Thanks.
> > > > Tim.
> > > >
> > > > On Sat, September 21, 2019 5:32 pm, trondd wrote:
> > > > > New port of comms/pterm, aka PLATOterm.
> > > > >
> > > > > PLATO is a BBS-like system with roots in training and education but grew
> > > > > into a community through muti-user games, messaging, and chat. There's
> > > > > been a resurgence the past few years with effort from IRATA.online and
> > > > > ports of pterm to different OS's and retro-computers.
> > > > >
> > > > > The binary is officially 'pterm' but I had to rename it to 'platoterm' as
> > > > > putty already has a pterm binary.
> > > > >
> > > > > Only been able to test on amd64. Don't know how to test the floppy
> > > > > support yet, either.
> > > > >
> > > > > Default connection is to cyber1's system, but IRATA.online is free to sign
> > > > > up and also has a guest account for checking it out. If you want to try
> > > > > it, be sure to know the PLATO terminal keyoard maping to a PC keyboard:
> > > > > https://cyber1.org/keyboard.asp (it's also in pterm's help menu)
> > > > >
> > > > > Tim.
> > > > >
> > > > > DESCR:
> > > > > Pterm is a terminal emulator designed for connecting to PLATO-like
> > > > > systems such as Cyber1 and the Cybis release from Tom Hunter. It also
> > > > > has the ability to run MicroTutor from floppy disk images.
> > > > >
> > > > > PLATO is a multi-user system hosting games, educational material, and
> > > > > communities. A PLATO server is hosted at IRATA.online with free access
> > > > > and a CYBIS system is hosted at cyber1.org
> > >
> >
> > Ugh....sorry.
> >
> >
>
> New tgz attached, but here's the diff compared to yours so you can see my
> changes easily;
>
> - tidy Makefile
> - use python module, don't hardcode 3.7
> - simpler way to override CC/CXX, also honour CFLAGS
> - update the py2-only script to py3 so it can run without a build dep on
> multiple pythons; it wasn't run before because it needed a python -> python2.7
> symlink

I don't believe this script does run. I think it's only used when upstream
creates a release package. So either way... I'll push this upstream as they
should move to Python3 anyway. Then this can go away later.

> - just remove the lines in wxversion.py, simpler than commenting-out
>
> I see a runtime problem, if I go to help -> pterm keyboard (which seems pretty
> much essential for a new user?) it has some assertion failures:
>
> /src/gtk/colour.cpp(185): assert "IsOk()" failed in Red(): invalid colour
> /src/gtk/colour.cpp(196): assert "IsOk()" failed in Green(): invalid colour
> /src/gtk/colour.cpp(207): assert "IsOk()" failed in Blue(): invalid colour
>

I was going to leave this to upstream to resolve but I found a fix. It's
already there but commented out so maybe there is a downside I haven't hit yet.

Tim.

Re: xapian-{core,bindings,omega} - version bump to 1.4.12

Index: databases/xapian-bindings/Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- databases/xapian-bindings/Makefile 31 Aug 2019 18:28:08 -0000 1.21
+++ databases/xapian-bindings/Makefile 30 Sep 2019 22:30:28 -0000
@@ -4,16 +4,12 @@ COMMENT-main= perl bindings for Xapian
COMMENT-python= python bindings for Xapian
COMMENT-ruby= ruby bindings for Xapian

-V= 1.4.5
+V= 1.4.12
DISTNAME= xapian-bindings-${V}

PKGNAME-main= xapian-bindings-perl-${V}
PKGNAME-python= xapian-bindings-python-${V}
PKGNAME-ruby= ruby${MODRUBY_BINREV}-xapian-${V}
-
-REVISION-python= 6
-REVISION-ruby= 6
-REVISION-main= 3

MODULES= lang/python \
lang/ruby
Index: databases/xapian-bindings/distinfo
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- databases/xapian-bindings/distinfo 13 Nov 2017 23:36:05 -0000 1.2
+++ databases/xapian-bindings/distinfo 30 Sep 2019 22:30:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (xapian-bindings-1.4.5.tar.xz) = ZHiGcwpxvMDp9mb81wK3FB1OmoLhCF5E60RwYk4anTM=
-SIZE (xapian-bindings-1.4.5.tar.xz) = 1118884
+SHA256 (xapian-bindings-1.4.12.tar.xz) = dXcXTvvuK4k7U4f7C987Yw6C9VKIoApMPsn9xGPkKkk=
+SIZE (xapian-bindings-1.4.12.tar.xz) = 1132048
cvs server: Diffing databases/xapian-bindings/patches
cvs server: Diffing databases/xapian-bindings/pkg
Index: databases/xapian-bindings/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- databases/xapian-bindings/pkg/PLIST-main 13 Nov 2017 23:36:05 -0000 1.2
+++ databases/xapian-bindings/pkg/PLIST-main 30 Sep 2019 22:30:28 -0000
@@ -62,3 +62,4 @@ share/doc/xapian-bindings/perl/examples/
share/doc/xapian-bindings/perl/examples/simplematchdecider.pl
share/doc/xapian-bindings/perl/examples/simplesearch.pl
share/doc/xapian-bindings/perl/index.html
+share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/QueryParser.html
Index: databases/xapian-bindings/pkg/PLIST-ruby
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/pkg/PLIST-ruby,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-ruby
--- databases/xapian-bindings/pkg/PLIST-ruby 31 Aug 2019 18:28:08 -0000 1.4
+++ databases/xapian-bindings/pkg/PLIST-ruby 30 Sep 2019 22:30:28 -0000
@@ -2,6 +2,7 @@
@comment ${MODRUBY_SITEARCHDIR}/_xapian.a
${MODRUBY_SITEARCHDIR}/_xapian.so
${MODRUBY_SITEDIR}/xapian.rb
+lib/ruby/
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/examples/
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/examples/simpleexpand.rb
Index: databases/xapian-core/Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-core/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- databases/xapian-core/Makefile 12 Jul 2019 20:44:03 -0000 1.34
+++ databases/xapian-core/Makefile 30 Sep 2019 22:30:28 -0000
@@ -2,10 +2,9 @@

COMMENT= search engine library

-V= 1.4.5
+V= 1.4.12
PORTROACH= limitw:1,even
DISTNAME= xapian-core-${V}
-REVISION= 2

SHARED_LIBS += xapian 4.0 # .28.2

Index: databases/xapian-core/distinfo
===================================================================
RCS file: /cvs/ports/databases/xapian-core/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- databases/xapian-core/distinfo 13 Nov 2017 23:36:05 -0000 1.11
+++ databases/xapian-core/distinfo 30 Sep 2019 22:30:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (xapian-core-1.4.5.tar.xz) = hbX5Ut6d+SX9E+APboJIQWL9UG04dFYTpQsKIGTGsCs=
-SIZE (xapian-core-1.4.5.tar.xz) = 2810612
+SHA256 (xapian-core-1.4.12.tar.xz) = T4o22oMXEttB04oDn++1JRhpdhpYvii6gCmUu5MPrHw=
+SIZE (xapian-core-1.4.12.tar.xz) = 2979052
cvs server: Diffing databases/xapian-core/patches
Index: databases/xapian-core/patches/patch-pkgconfig_xapian-core_pc_in
===================================================================
RCS file: databases/xapian-core/patches/patch-pkgconfig_xapian-core_pc_in
diff -N databases/xapian-core/patches/patch-pkgconfig_xapian-core_pc_in
--- databases/xapian-core/patches/patch-pkgconfig_xapian-core_pc_in 29 Jun 2019 13:04:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-pkgconfig_xapian-core_pc_in,v 1.1 2019/06/29 13:04:36 robert Exp $
-
-our pkg-config(1) does not like multi-line values
-
-Index: pkgconfig/xapian-core.pc.in
---- pkgconfig/xapian-core.pc.in.orig
-+++ pkgconfig/xapian-core.pc.in
-@@ -4,9 +4,9 @@ libdir=@libdir@
- includedir=@incdir@
-
- Name: The Xapian Probabilistic Information Retrieval Library
--Description: Xapian is an Open Source Probabilistic Information Retrieval framework. It
--offers a highly adaptable toolkit that allows developers to easily add advanced
--indexing and search facilities to applications. This package provides the
-+Description: Xapian is an Open Source Probabilistic Information Retrieval framework. It \
-+offers a highly adaptable toolkit that allows developers to easily add advanced \
-+indexing and search facilities to applications. This package provides the \
- libraries for applications using Xapian functionality.
- URL: https://xapian.org/
- Version: @VERSION@
cvs server: Diffing databases/xapian-core/pkg
Index: databases/xapian-core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/xapian-core/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- databases/xapian-core/pkg/PLIST 13 Nov 2017 23:36:05 -0000 1.8
+++ databases/xapian-core/pkg/PLIST 30 Sep 2019 22:30:28 -0000
@@ -9,6 +9,7 @@
bin/xapian-config
@bin bin/xapian-delve
@bin bin/xapian-metadata
+@bin bin/xapian-pos
@bin bin/xapian-progsrv
@bin bin/xapian-replicate
@bin bin/xapian-replicate-server
@@ -66,6 +67,7 @@ lib/pkgconfig/xapian-core.pc
@man man/man1/xapian-config.1
@man man/man1/xapian-delve.1
@man man/man1/xapian-metadata.1
+@man man/man1/xapian-pos.1
@man man/man1/xapian-progsrv.1
@man man/man1/xapian-replicate-server.1
@man man/man1/xapian-replicate.1
@@ -107,6 +109,9 @@ share/doc/xapian-core/apidoc/html/classX
share/doc/xapian-core/apidoc/html/classXapian_1_1DPHWeight__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1Database-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Database.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseClosedError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseClosedError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseClosedError__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError__inherit__graph.png
@@ -122,6 +127,9 @@ share/doc/xapian-core/apidoc/html/classX
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseNotFoundError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseNotFoundError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseNotFoundError__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError__inherit__graph.png
@@ -456,6 +464,7 @@ share/doc/xapian-core/apidoc/html/namesp
share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Unicode.html
share/doc/xapian-core/apidoc/html/namespacemembers.html
share/doc/xapian-core/apidoc/html/namespacemembers_enum.html
+share/doc/xapian-core/apidoc/html/namespacemembers_eval.html
share/doc/xapian-core/apidoc/html/namespacemembers_func.html
share/doc/xapian-core/apidoc/html/namespacemembers_type.html
share/doc/xapian-core/apidoc/html/namespacemembers_vars.html
@@ -526,6 +535,7 @@ share/xapian-core/stopwords/finnish.list
share/xapian-core/stopwords/french.list
share/xapian-core/stopwords/german.list
share/xapian-core/stopwords/hungarian.list
+share/xapian-core/stopwords/indonesian.list
share/xapian-core/stopwords/italian.list
share/xapian-core/stopwords/norwegian.list
share/xapian-core/stopwords/portuguese.list
Index: www/xapian-omega/Makefile
===================================================================
RCS file: /cvs/ports/www/xapian-omega/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- www/xapian-omega/Makefile 12 Jul 2019 20:51:07 -0000 1.25
+++ www/xapian-omega/Makefile 30 Sep 2019 22:32:08 -0000
@@ -2,10 +2,9 @@

COMMENT= web search application

-V= 1.4.5
+V= 1.4.12
PORTROACH= limitw:1,even
DISTNAME= xapian-omega-${V}
-REVISION= 1

CATEGORIES= www textproc

Index: www/xapian-omega/distinfo
===================================================================
RCS file: /cvs/ports/www/xapian-omega/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- www/xapian-omega/distinfo 13 Nov 2017 23:36:05 -0000 1.9
+++ www/xapian-omega/distinfo 30 Sep 2019 22:32:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (xapian-omega-1.4.5.tar.xz) = mck8qQhQna67qlwXSGh4gQNk5qYjx8WFb71AcidDUX4=
-SIZE (xapian-omega-1.4.5.tar.xz) = 502820
+SHA256 (xapian-omega-1.4.12.tar.xz) = Dmdn1Fcba1iuTmWwtgzOV5CfEa7CRfxVfrnROkfKGc4=
+SIZE (xapian-omega-1.4.12.tar.xz) = 539324
Items 1 and 2 have been addressed in the updated (and attached) diff.

I've tested doxygen by building doxygen with the updated xapian lib and
then rebuilding xapian against the rebuilt doxygen (which xapian uses).
mu was tested by creating an index against my own Maildir folders and
running queries.

I don't have any KDE-based systems so if there are any users with kopano,
khelpcenter, and baloo that run into issues, please let me know.

Is that acceptable protocol? I can appreciate not dropping turds on people
while balancing the feasibility of testing every scenario. Feedback?

On Fri, Sep 20, 2019, at 04:32, Stuart Henderson wrote:
> When there are diffs for multiple ports in one mail, please generate from a
> common parent directory (i.e /usr/ports in this case) so they can be
> applied without chopping the mail into pieces.
>
> For xapian-bindings PLIST, these should be omitted:
>
> +lib/python${MODPY_VERSION}/
> +lib/ruby/
>
> And the other adoption should go to the ruby PLIST not -main.
>
> Have you tested any of the ports that depends on these?
>
> devel/doxygen
> mail/kopano/core
> mail/mu
> x11/kde-applications/khelpcenter
> x11/kde4/baloo
>
> I'm not aware of any specific reason to stick with the old versions, these
> ports have no maintainer so likely nobody is particularly interested and
> nobody ran into a problem that necessitated an update.
>
> --
> Sent from a phone, apologies for poor formatting.
>
> On 20 September 2019 01:34:53 Lucas Raab <tuftedocelot@fastmail.fm> wrote:
>
> > Beg pardon for any mistakes, I've tried to follow the porters guide as
> > best I can.
> >
> >
> > Here are some diffs to bring xapian up to date with the latest. If
> > there are any specific reasons to keep at 1.4.5, I didn't find them in
> > the archives. Everything seems to be working fine, but let me know if
> > not. If I'm bang off course, I'd love to be corrected.
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/databases/xapian-core/Makefile,v
> > retrieving revision 1.34
> > diff -u -p -r1.34 Makefile
> > --- Makefile 12 Jul 2019 20:44:03 -0000 1.34
> > +++ Makefile 19 Sep 2019 21:38:06 -0000
> > @@ -2,10 +2,9 @@
> >
> > COMMENT= search engine library
> >
> > -V= 1.4.5
> > +V= 1.4.12
> > PORTROACH= limitw:1,even
> > DISTNAME= xapian-core-${V}
> > -REVISION= 2
> >
> > SHARED_LIBS += xapian 4.0 # .28.2
> >
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/databases/xapian-core/distinfo,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 distinfo
> > --- distinfo 13 Nov 2017 23:36:05 -0000 1.11
> > +++ distinfo 19 Sep 2019 21:38:06 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (xapian-core-1.4.5.tar.xz) =
> > hbX5Ut6d+SX9E+APboJIQWL9UG04dFYTpQsKIGTGsCs=
> > -SIZE (xapian-core-1.4.5.tar.xz) = 2810612
> > +SHA256 (xapian-core-1.4.12.tar.xz) =
> > T4o22oMXEttB04oDn++1JRhpdhpYvii6gCmUu5MPrHw=
> > +SIZE (xapian-core-1.4.12.tar.xz) = 2979052
> > Index: patches/patch-pkgconfig_xapian-core_pc_in
> > ===================================================================
> > RCS file: patches/patch-pkgconfig_xapian-core_pc_in
> > diff -N patches/patch-pkgconfig_xapian-core_pc_in
> > --- patches/patch-pkgconfig_xapian-core_pc_in 29 Jun 2019 13:04:36 -0000 1.1
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,20 +0,0 @@
> > -$OpenBSD: patch-pkgconfig_xapian-core_pc_in,v 1.1 2019/06/29 13:04:36
> > robert Exp $
> > -
> > -our pkg-config(1) does not like multi-line values
> > -
> > -Index: pkgconfig/xapian-core.pc.in
> > ---- pkgconfig/xapian-core.pc.in.orig
> > -+++ pkgconfig/xapian-core.pc.in
> > -@@ -4,9 +4,9 @@ libdir=@libdir@
> > - includedir=@incdir@
> > -
> > - Name: The Xapian Probabilistic Information Retrieval Library
> > --Description: Xapian is an Open Source Probabilistic Information Retrieval
> > framework. It
> > --offers a highly adaptable toolkit that allows developers to easily add
> > advanced
> > --indexing and search facilities to applications. This package provides the
> > -+Description: Xapian is an Open Source Probabilistic Information Retrieval
> > framework. It \
> > -+offers a highly adaptable toolkit that allows developers to easily add
> > advanced \
> > -+indexing and search facilities to applications. This package provides the \
> > - libraries for applications using Xapian functionality.
> > - URL: https://xapian.org/
> > - Version: @VERSION@
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/databases/xapian-core/pkg/PLIST,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 PLIST
> > --- pkg/PLIST 13 Nov 2017 23:36:05 -0000 1.8
> > +++ pkg/PLIST 19 Sep 2019 21:38:06 -0000
> > @@ -9,6 +9,7 @@
> > bin/xapian-config
> > @bin bin/xapian-delve
> > @bin bin/xapian-metadata
> > +@bin bin/xapian-pos
> > @bin bin/xapian-progsrv
> > @bin bin/xapian-replicate
> > @bin bin/xapian-replicate-server
> > @@ -66,6 +67,7 @@ lib/pkgconfig/xapian-core.pc
> > @man man/man1/xapian-config.1
> > @man man/man1/xapian-delve.1
> > @man man/man1/xapian-metadata.1
> > +@man man/man1/xapian-pos.1
> > @man man/man1/xapian-progsrv.1
> > @man man/man1/xapian-replicate-server.1
> > @man man/man1/xapian-replicate.1
> > @@ -107,6 +109,9 @@ share/doc/xapian-core/apidoc/html/classX
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DPHWeight__inherit__graph.png
> > share/doc/xapian-core/apidoc/html/classXapian_1_1Database-members.html
> > share/doc/xapian-core/apidoc/html/classXapian_1_1Database.html
> > +share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseClosedError-members.html
> > +share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseClosedError.html
> > +share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseClosedError__inherit__graph.png
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError-members.html
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError.html
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError__inherit__graph.png
> > @@ -122,6 +127,9 @@ share/doc/xapian-core/apidoc/html/classX
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError-members.html
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError.html
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError__inherit__graph.png
> > +share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseNotFoundError-members.html
> > +share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseNotFoundError.html
> > +share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseNotFoundError__inherit__graph.png
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError-members.html
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError.html
> > share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError__inherit__graph.png
> > @@ -456,6 +464,7 @@ share/doc/xapian-core/apidoc/html/namesp
> > share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Unicode.html
> > share/doc/xapian-core/apidoc/html/namespacemembers.html
> > share/doc/xapian-core/apidoc/html/namespacemembers_enum.html
> > +share/doc/xapian-core/apidoc/html/namespacemembers_eval.html
> > share/doc/xapian-core/apidoc/html/namespacemembers_func.html
> > share/doc/xapian-core/apidoc/html/namespacemembers_type.html
> > share/doc/xapian-core/apidoc/html/namespacemembers_vars.html
> > @@ -526,6 +535,7 @@ share/xapian-core/stopwords/finnish.list
> > share/xapian-core/stopwords/french.list
> > share/xapian-core/stopwords/german.list
> > share/xapian-core/stopwords/hungarian.list
> > +share/xapian-core/stopwords/indonesian.list
> > share/xapian-core/stopwords/italian.list
> > share/xapian-core/stopwords/norwegian.list
> > share/xapian-core/stopwords/portuguese.list
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
> > retrieving revision 1.21
> > diff -u -p -r1.21 Makefile
> > --- Makefile 31 Aug 2019 18:28:08 -0000 1.21
> > +++ Makefile 19 Sep 2019 21:38:31 -0000
> > @@ -4,16 +4,12 @@ COMMENT-main= perl bindings for Xapian
> > COMMENT-python= python bindings for Xapian
> > COMMENT-ruby= ruby bindings for Xapian
> >
> > -V= 1.4.5
> > +V= 1.4.12
> > DISTNAME= xapian-bindings-${V}
> >
> > PKGNAME-main= xapian-bindings-perl-${V}
> > PKGNAME-python= xapian-bindings-python-${V}
> > PKGNAME-ruby= ruby${MODRUBY_BINREV}-xapian-${V}
> > -
> > -REVISION-python= 6
> > -REVISION-ruby= 6
> > -REVISION-main= 3
> >
> > MODULES= lang/python \
> > lang/ruby
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/databases/xapian-bindings/distinfo,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 distinfo
> > --- distinfo 13 Nov 2017 23:36:05 -0000 1.2
> > +++ distinfo 19 Sep 2019 21:38:31 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (xapian-bindings-1.4.5.tar.xz) =
> > ZHiGcwpxvMDp9mb81wK3FB1OmoLhCF5E60RwYk4anTM=
> > -SIZE (xapian-bindings-1.4.5.tar.xz) = 1118884
> > +SHA256 (xapian-bindings-1.4.12.tar.xz) =
> > dXcXTvvuK4k7U4f7C987Yw6C9VKIoApMPsn9xGPkKkk=
> > +SIZE (xapian-bindings-1.4.12.tar.xz) = 1132048
> > Index: pkg/PLIST-main
> > ===================================================================
> > RCS file: /cvs/ports/databases/xapian-bindings/pkg/PLIST-main,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 PLIST-main
> > --- pkg/PLIST-main 13 Nov 2017 23:36:05 -0000 1.2
> > +++ pkg/PLIST-main 19 Sep 2019 21:38:31 -0000
> > @@ -1,4 +1,6 @@
> > @comment $OpenBSD: PLIST-main,v 1.2 2017/11/13 23:36:05 jeremy Exp $
> > +lib/python${MODPY_VERSION}/
> > +lib/ruby/
> > libdata/perl5/site_perl/Xapian/
> > libdata/perl5/site_perl/Xapian.pm
> > libdata/perl5/site_perl/Xapian/AssertionError.pm
> > @@ -62,3 +64,4 @@ share/doc/xapian-bindings/perl/examples/
> > share/doc/xapian-bindings/perl/examples/simplematchdecider.pl
> > share/doc/xapian-bindings/perl/examples/simplesearch.pl
> > share/doc/xapian-bindings/perl/index.html
> > +share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/QueryParser.html
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/www/xapian-omega/Makefile,v
> > retrieving revision 1.25
> > diff -u -p -r1.25 Makefile
> > --- Makefile 12 Jul 2019 20:51:07 -0000 1.25
> > +++ Makefile 19 Sep 2019 21:42:37 -0000
> > @@ -2,10 +2,9 @@
> >
> > COMMENT= web search application
> >
> > -V= 1.4.5
> > +V= 1.4.12
> > PORTROACH= limitw:1,even
> > DISTNAME= xapian-omega-${V}
> > -REVISION= 1
> >
> > CATEGORIES= www textproc
> >
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/www/xapian-omega/distinfo,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 distinfo
> > --- distinfo 13 Nov 2017 23:36:05 -0000 1.9
> > +++ distinfo 19 Sep 2019 21:42:37 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (xapian-omega-1.4.5.tar.xz) =
> > mck8qQhQna67qlwXSGh4gQNk5qYjx8WFb71AcidDUX4=
> > -SIZE (xapian-omega-1.4.5.tar.xz) = 502820
> > +SHA256 (xapian-omega-1.4.12.tar.xz) =
> > Dmdn1Fcba1iuTmWwtgzOV5CfEa7CRfxVfrnROkfKGc4=
> > +SIZE (xapian-omega-1.4.12.tar.xz) = 539324
> >
> >
> > ok?
>
>
>
>

sparc64 bulk build report

Re: Update or retire? Python 3.6.9

On 2019/09/30 16:43, Kurt Mosiejczuk wrote:
> The below diff updates Python 3.6 to 3.6.9, the latest.
>
> I had looked at it many weeks ago, but one of the tests hangs forever on
> sparc64. (Tests seem to run in parallel and one seems to get lost).
>
> I figure we should either update Python 3.6 to the latest or bite the
> bullet and remove it. I originally voted in favor of keeping it around
> but don't feel strongly about that. If someone wants it gone, I'm fine
> with that.
>
> Thoughts? OK?

I would update, there's no point not doing so (and it's low risk anyway
now that other ports don't depend on it).

We can make a decision about removing completely post 6.6.

OK

Update or retire? Python 3.6.9

The below diff updates Python 3.6 to 3.6.9, the latest.

I had looked at it many weeks ago, but one of the tests hangs forever on
sparc64. (Tests seem to run in parallel and one seems to get lost).

I figure we should either update Python 3.6 to the latest or bite the
bullet and remove it. I originally voted in favor of keeping it around
but don't feel strongly about that. If someone wants it gone, I'm fine
with that.

Thoughts? OK?

--Kurt

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.6/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 20 May 2019 22:15:15 -0000 1.21
+++ Makefile 30 Sep 2019 20:38:24 -0000
@@ -6,11 +6,9 @@
# Python itself.

VERSION = 3.6
-PATCHLEVEL = .8
+PATCHLEVEL = .9
SHARED_LIBS = python3.6m 0.0
VERSION_SPEC = >=3.6,<3.7
-
-REVISION = 4

CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3.6/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 7 Jan 2019 06:43:00 -0000 1.9
+++ distinfo 30 Sep 2019 20:38:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-3.6.8.tgz) = f1sfCLOwpZU4fvbGTIWxsTs4q+8N2HGDXukjJi5PMvA=
-SIZE (Python-3.6.8.tgz) = 23010188
+SHA256 (Python-3.6.9.tgz) = R/ySody5RrntCrwxHTdntyFcVOZVsX/R0/m1OBlVJao=
+SIZE (Python-3.6.9.tgz) = 23016893
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.6/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 10 May 2019 12:01:55 -0000 1.13
+++ pkg/PLIST-main 30 Sep 2019 20:38:24 -0000
@@ -2339,9 +2339,9 @@ lib/python3.6/lib-dynload/xxlimited.so
lib/python3.6/lib-dynload/zlib.so
lib/python3.6/lib2to3/
lib/python3.6/lib2to3/Grammar.txt
-lib/python3.6/lib2to3/Grammar3.6.8.final.0.pickle
+lib/python3.6/lib2to3/Grammar3.6.9.final.0.pickle
lib/python3.6/lib2to3/PatternGrammar.txt
-lib/python3.6/lib2to3/PatternGrammar3.6.8.final.0.pickle
+lib/python3.6/lib2to3/PatternGrammar3.6.9.final.0.pickle
lib/python3.6/lib2to3/__init__.py
lib/python3.6/lib2to3/__main__.py
lib/python3.6/lib2to3/__pycache__/
@@ -2957,6 +2957,7 @@ lib/python3.6/test/support/__pycache__/t
lib/python3.6/test/support/__pycache__/testresult.cpython-36.opt-2.pyc
lib/python3.6/test/support/__pycache__/testresult.cpython-36.pyc
lib/python3.6/test/support/testresult.py
+lib/python3.6/test/talos-2019-0758.pem
lib/python3.6/test/test_bdb.py
lib/python3.6/textwrap.py
lib/python3.6/this.py

Re: aarch64 bulk build report

update/fix: filter-dkimsign

Per the README I believe /etc/mail/dkim should be a directory not a
file. ok?

--
James Turner

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-filters/dkimsign/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile 23 Sep 2019 19:24:45 -0000 1.2
+++ Makefile 30 Sep 2019 14:57:01 -0000
@@ -5,7 +5,7 @@ COMMENT= dkim signer integration to the
V= 0.1
FILTER_NAME = dkimsign
DISTNAME = filter-dkimsign-${V}
-REVISION = 0
+REVISION = 1

CATEGORIES= mail
HOMEPAGE= http://imperialat.at/dev/filter-dkimsign
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/opensmtpd-filters/dkimsign/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 23 Sep 2019 19:24:45 -0000 1.2
+++ pkg/PLIST 30 Sep 2019 14:57:01 -0000
@@ -7,7 +7,7 @@ libexec/smtpd/
@mode 0770
@owner _dkimsign
@group _dkimsign
-@sample ${SYSCONFDIR}/mail/dkim
+@sample ${SYSCONFDIR}/mail/dkim/
@mode
@owner
@group

Re: Epson ESC/P-R driver

On Mon, Sep 30, 2019 at 03:08:28PM +0100, Ed Gray wrote:

> Firstly I'm new to working with ports, I have read most of the ports
> FAQ and a good deal of the ports manpage (although some of it is maybe
> not relevant to basic use). I've not configured the ports tree in any
> way other than downloading the ports.tar.gz file from the 6.4 release,
> extracting it in /usr/ports and rebuilding the index.

Ports is developed on current. Many many things have changed in the ports
infrastructure since 6.4 (even 6.5).

--Kurt

Re: Epson ESC/P-R driver

+++ Mon Sep 30 14:45:07 BST 2019
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
===> epson-inkjet-printer-escpr-1.7.3 depends on: gettext-* -> gettext-0.19.8.1p1
===> epson-inkjet-printer-escpr-1.7.3 depends on: cups-libs-* -> cups-libs-2.2.8p0
===> Verifying specs: avahi-client avahi-common c cups cupsimage dbus-1 ffi gmp gnutls hogweed iconv idn2 intl m nettle p11-kit pthread tasn1 unistring z
===> found avahi-client.0.1 avahi-common.0.1 c.92.5 cups.6.4 cupsimage.5.1 dbus-1.11.2 ffi.1.2 gmp.10.0 gnutls.44.1 hogweed.2.0 iconv.6.0 idn2.1.0 intl.6.0 m.10.1 nettle.3.0 p11-kit.2.0 pthread.25.1 tasn1.4.0 unistring.0.1 z.5.0
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
--- Mon Sep 30 14:45:07 BST 2019
+++ Mon Sep 30 14:45:07 BST 2019
===> Checking files for epson-inkjet-printer-escpr-1.7.3
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
`/usr/ports/distfiles/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz' is up to date.
>> (SHA256) epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz: OK
===> Extracting for epson-inkjet-printer-escpr-1.7.3
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
cd /usr/ports/pobj/epson-inkjet-printer-escpr-1.7.3/epson-inkjet-printer-escpr-1.7.3 && perl -i -pe 's/\r$//' src/linux_cmn.c lib/epson-escpr-api.c lib/epson-typedefs.h lib/epson-usb.c
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
===> Patching for epson-inkjet-printer-escpr-1.7.3
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
===> Applying OpenBSD patch patch-lib_epson-escpr-api-private_h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD$
|
|Index: lib/epson-escpr-api-private.h
|--- lib/epson-escpr-api-private.h.orig
|+++ lib/epson-escpr-api-private.h
--------------------------
(Creating file lib/epson-escpr-api-private.h...)
Patching file lib/epson-escpr-api-private.h using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
done
===> Applying OpenBSD patch patch-lib_epson-escpr-api_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD$
|
|Index: lib/epson-escpr-api.c
|--- lib/epson-escpr-api.c.orig
|+++ lib/epson-escpr-api.c
--------------------------
Patching file lib/epson-escpr-api.c using Plan A...
Hunk #1 succeeded at 62.
Hunk #2 succeeded at 232.
Hunk #3 succeeded at 245.
Hunk #4 succeeded at 4475.
done
===> Applying OpenBSD patch patch-lib_epson-typedefs_h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD$
|
|Index: lib/epson-typedefs.h
|--- lib/epson-typedefs.h.orig
|+++ lib/epson-typedefs.h
--------------------------
Patching file lib/epson-typedefs.h using Plan A...
Hunk #1 succeeded at 41.
done
===> Applying OpenBSD patch patch-lib_epson-usb_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD$
|
|Index: lib/epson-usb.c
|--- lib/epson-usb.c.orig
|+++ lib/epson-usb.c
--------------------------
Patching file lib/epson-usb.c using Plan A...
Hunk #1 succeeded at 2325.
done
===> Applying OpenBSD patch patch-src_filter_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD$
|
|Index: src/filter.c
|--- src/filter.c.orig
|+++ src/filter.c
--------------------------
Patching file src/filter.c using Plan A...
Hunk #1 succeeded at 32.
Hunk #2 succeeded at 44.
Hunk #3 succeeded at 384.
Hunk #4 succeeded at 413.
Hunk #5 succeeded at 501.
Hunk #6 succeeded at 516.
Hunk #7 succeeded at 670.
Hunk #8 succeeded at 696.
Hunk #9 succeeded at 899.
done
===> Applying OpenBSD patch patch-src_linux_cmn_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD$
|
|Index: src/linux_cmn.c
|--- src/linux_cmn.c.orig
|+++ src/linux_cmn.c
--------------------------
Patching file src/linux_cmn.c using Plan A...
Hunk #1 succeeded at 28.
done
===> Applying OpenBSD patch patch-src_mem_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD$
|
|Index: src/mem.c
|--- src/mem.c.orig
|+++ src/mem.c
--------------------------
Patching file src/mem.c using Plan A...
Hunk #1 succeeded at 23.
done
===> Applying OpenBSD patch patch-src_wrapper_c
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD$
|
|Index: src/wrapper.c
|--- src/wrapper.c.orig
|+++ src/wrapper.c
--------------------------
Patching file src/wrapper.c using Plan A...
Hunk #1 succeeded at 176.
done
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
===> Compiler link: clang -> /usr/bin/clang
===> Compiler link: clang++ -> /usr/bin/clang++
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
===> Configuring for epson-inkjet-printer-escpr-1.7.3
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete. (in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in print/epson-inkjet-printer-escpr)
===> Building for epson-inkjet-printer-escpr-1.7.3
make: cannot open Makefile.
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2757 '/usr/ports/pobj/epson-inkjet-printer-escpr-1.7.3/.build_done')
*** Error 1 in /usr/ports/mystuff/print/epson-inkjet-printer-escpr (/usr/ports/infrastructure/mk/bsd.port.mk:2444 'all')
--- Mon Sep 30 14:45:09 BST 2019
Hi,

Firstly I'm new to working with ports, I have read most of the ports
FAQ and a good deal of the ports manpage (although some of it is maybe
not relevant to basic use). I've not configured the ports tree in any
way other than downloading the ports.tar.gz file from the 6.4 release,
extracting it in /usr/ports and rebuilding the index.

So trying this on: OpenBSD 6.4 (GENERIC.MP) #2: Thu Aug 8 10:18:26 MDT 2019
tb@syspatch-64-amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

Using the attached file epson-inkjet-printer-escpr.tgz in
/usr/ports/mystuff/print:
#make

It stops at the build target with an error message:
===> Building for epson-inkjet-printer-escpr-1.7.3
make: cannot open Makefile.
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2757
'/usr/ports/pobj/epson-inkjet-printer-escpr-1.7.3/.build_done')
*** Error 1 in /usr/ports/mystuff/print/epson-inkjet-printer-escpr
(/usr/ports/infrastructure/mk/bsd.port.mk:2444 'all')

There is an additional error about licensing but I'm not sure it's relevant:
The licensing info for epson-inkjet-printer-escpr-1.7.3 is incomplete.
(in print/epson-inkjet-printer-escpr)
Please notify the OpenBSD port maintainer: (in print/epson-inkjet-printer-escpr)
Antoine Jacoutot <ajacoutot@openbsd.org> (in
print/epson-inkjet-printer-escpr)

Attached are the logs from portslogger.

Regards
Ed Gray

On Mon, 30 Sep 2019 at 11:49, Ed Gray <e.mask.hmm@gmail.com> wrote:
>
> Thanks Antoine, Stuart,
>
> I'll try and test it this morning.
>
> Regards
> Ed Gray
>
> On Sun, 29 Sep 2019 at 14:43, Antoine Jacoutot <ajacoutot@bsdfrog.org> wrote:
> >
> > > I'm not sure why they added patch-lib_epson-typedefs_h, it doesn't fix any
> > > warnings and may break arm/powerpc so I'd prefer to drop that unless you have
> > > an idea?
> > >
> > > Otherwise OK but I don't have an epson printer to test. It would definitely be
> > > nice to have this in ports.
> >
> > Committed with patch-lib_epson-typedefs_h removed.
> > Thank you all.
> >
> > --
> > Antoine

Re: Merch

On Mon, Sep 30, 2019 at 01:24:58PM +0000, Ian Peacock wrote:
> Hi, I am interested in buying an OpenBSD Tshirt. I live in Denmark. Can you help me? Kind Regards Ian

I'd take a peek at https://www.openbsdstore.com/, they appear to offer a small collection
of OpenBSD items such as t-shirts and mugs.

- Peter

--
Peter N. M. Hansteen, member of the first RFC 1149 implementation team
http://bsdly.blogspot.com/ http://www.bsdly.net/ http://www.nuug.no/
"Remember to set the evil bit on all malicious network traffic"
delilah spamd[29949]: 85.152.224.147: disconnected after 42673 seconds.

Merch

Hi, I am interested in buying an OpenBSD Tshirt. I live in Denmark. Can you help me? Kind Regards Ian

Re: How can I contribute code to openbsd

subject fixed, hopefully. :)

On 9/28/19 7:05 PM, cc wrote:
>
> Hello,
>
>
> I recently started to study openbsd. I am a computer major student. How can I contribute to openbsd?
>

while ! dead; do
DoSomething.
submission="sucks" # Accept this. It's probably true.
while [[ $submission == "sucks" ]]; do
SubmitIt
AcceptCriticism
learn
if [[ $criticism == "no way" ]]; do
break # not everything is appropriate.
fi
reviseBasedOnCriticism
done # Congrats, your submission was accepted!
done # not dead yet.

People usually screw up on accepting that their first
submission sucks. And they really get confused
when they are told what to fix and resubmit it, "why
doesn't the committer just do it?" That's where the
"learn" step comes in -- the committer is trying to
help you get a point your submissions DON'T suck
initially.

Find something you want to fix or improve...do it,
and enter the loop. :)

Nick.

unbreak firefox-esr and thunderbird

Hi,

The update of lang/rust unintentionally broke mail/mozilla-thunderbird,
www/firefox-esr and www/tor-browser.

My test script for checking breakable doesn't worked as intented, and I miss the
failures. My bad.

The following patch corrects mail/mozilla-thunderbird and www/firefox-esr, by
backporting cssparser crate diff from upstream.

The change is composed of two parts:
- the patch on third_party/rust/cssparser/src/parser.rs
- a sed trick on post-patch target to "hide" the file change to cargo and let's
it building without complaining

For www/tor-browser, I will just mark it as BROKEN. The esr version used by
tor-browser is just too old for easily backport the patch, and I would be
reluctant to spend time on it as the www/tor-browser version we have in port is
just too outdated. An update of the port would be preferable.

Please note I only quickly test the patch on firefox-esr. I intent to let's
finish a full build of mail/mozilla-thunderbird and www/firefox-esr before
commiting if ok.

Thanks.
--
Sebastien Marie

Index: mail/mozilla-thunderbird/Makefile
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
retrieving revision 1.296
diff -u -p -r1.296 Makefile
--- mail/mozilla-thunderbird/Makefile 22 Sep 2019 17:19:07 -0000 1.296
+++ mail/mozilla-thunderbird/Makefile 30 Sep 2019 11:58:09 -0000
@@ -89,6 +89,10 @@ GUIDS = gdata-provider {a62ef8ec-5fdc-40

EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/extensions/

+post-patch:
+ sed -i 's/"files":{[^}]*}/"files":{}/' \
+ ${WRKSRC}/third_party/rust/cssparser/.cargo-checksum.json
+
post-install:
.for xpi guid in ${GUIDS}
cp ${WRKBUILD}/dist/xpi-stage/${xpi}*.xpi ${EXTDIR}/${guid}.xpi
Index: mail/mozilla-thunderbird/patches/patch-third_party_rust_cssparser_src_parser_rs
===================================================================
RCS file: mail/mozilla-thunderbird/patches/patch-third_party_rust_cssparser_src_parser_rs
diff -N mail/mozilla-thunderbird/patches/patch-third_party_rust_cssparser_src_parser_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mail/mozilla-thunderbird/patches/patch-third_party_rust_cssparser_src_parser_rs 30 Sep 2019 11:58:09 -0000
@@ -0,0 +1,65 @@
+$OpenBSD$
+backport https://github.com/servo/rust-cssparser/pull/245/commits/3c98d22c5de3b696bf1fde2b6c90069812312aa6
+to avoid hard failure due to rustc 1.38.0
+
+Index: third_party/rust/cssparser/src/parser.rs
+--- third_party/rust/cssparser/src/parser.rs.orig
++++ third_party/rust/cssparser/src/parser.rs
+@@ -567,30 +567,34 @@ impl<'i: 't, 't> Parser<'i, 't> {
+ }
+
+ let token_start_position = self.input.tokenizer.position();
+- let token;
+- match self.input.cached_token {
+- Some(ref cached_token) if cached_token.start_position == token_start_position => {
+- self.input.tokenizer.reset(&cached_token.end_state);
+- match cached_token.token {
+- Token::Function(ref name) => self.input.tokenizer.see_function(name),
+- _ => {}
+- }
+- token = &cached_token.token
++ let using_cached_token = self
++ .input
++ .cached_token
++ .as_ref()
++ .map_or(false, |cached_token| {
++ cached_token.start_position == token_start_position
++ });
++ let token = if using_cached_token {
++ let cached_token = self.input.cached_token.as_ref().unwrap();
++ self.input.tokenizer.reset(&cached_token.end_state);
++ match cached_token.token {
++ Token::Function(ref name) => self.input.tokenizer.see_function(name),
++ _ => {}
+ }
+- _ => {
+- let new_token = self
+- .input
+- .tokenizer
+- .next()
+- .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+- self.input.cached_token = Some(CachedToken {
+- token: new_token,
+- start_position: token_start_position,
+- end_state: self.input.tokenizer.state(),
+- });
+- token = self.input.cached_token_ref()
+- }
+- }
++ &cached_token.token
++ } else {
++ let new_token = self
++ .input
++ .tokenizer
++ .next()
++ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
++ self.input.cached_token = Some(CachedToken {
++ token: new_token,
++ start_position: token_start_position,
++ end_state: self.input.tokenizer.state(),
++ });
++ self.input.cached_token_ref()
++ };
+
+ if let Some(block_type) = BlockType::opening(token) {
+ self.at_start_of = Some(block_type);
Index: www/firefox-esr/Makefile
===================================================================
RCS file: /cvs/ports/www/firefox-esr/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- www/firefox-esr/Makefile 22 Sep 2019 17:19:06 -0000 1.106
+++ www/firefox-esr/Makefile 30 Sep 2019 11:58:09 -0000
@@ -66,6 +66,10 @@ CONFIGURE_ARGS += --enable-sandbox --ena
CONFIGURE_ARGS += --with-libclang-path=${LOCALBASE}/lib
CONFIGURE_ARGS += --with-clang-path=${LOCALBASE}/bin/clang

+post-patch:
+ sed -i 's/"files":{[^}]*}/"files":{}/' \
+ ${WRKSRC}/third_party/rust/cssparser/.cargo-checksum.json
+
post-install:
# install prefs
${INSTALL_DATA_DIR} ${PREFIX}/lib/${MOZILLA_PROJECT}-esr/browser/defaults/preferences
Index: www/firefox-esr/patches/patch-old-configure
===================================================================
RCS file: /cvs/ports/www/firefox-esr/patches/patch-old-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-old-configure
--- www/firefox-esr/patches/patch-old-configure 6 Sep 2019 17:13:22 -0000 1.1
+++ www/firefox-esr/patches/patch-old-configure 30 Sep 2019 11:58:09 -0000
@@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cg
Index: old-configure
--- old-configure.orig
+++ old-configure
-@@ -10113,7 +10113,7 @@ fi
+@@ -10191,7 +10191,7 @@ fi

case "$OS_TARGET" in
Index: www/firefox-esr/patches/patch-third_party_rust_cssparser_src_parser_rs
===================================================================
RCS file: www/firefox-esr/patches/patch-third_party_rust_cssparser_src_parser_rs
diff -N www/firefox-esr/patches/patch-third_party_rust_cssparser_src_parser_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/firefox-esr/patches/patch-third_party_rust_cssparser_src_parser_rs 30 Sep 2019 11:58:09 -0000
@@ -0,0 +1,65 @@
+$OpenBSD$
+backport https://github.com/servo/rust-cssparser/pull/245/commits/3c98d22c5de3b696bf1fde2b6c90069812312aa6
+to avoid hard failure due to rustc 1.38.0
+
+Index: third_party/rust/cssparser/src/parser.rs
+--- third_party/rust/cssparser/src/parser.rs.orig
++++ third_party/rust/cssparser/src/parser.rs
+@@ -567,30 +567,34 @@ impl<'i: 't, 't> Parser<'i, 't> {
+ }
+
+ let token_start_position = self.input.tokenizer.position();
+- let token;
+- match self.input.cached_token {
+- Some(ref cached_token) if cached_token.start_position == token_start_position => {
+- self.input.tokenizer.reset(&cached_token.end_state);
+- match cached_token.token {
+- Token::Function(ref name) => self.input.tokenizer.see_function(name),
+- _ => {}
+- }
+- token = &cached_token.token
++ let using_cached_token = self
++ .input
++ .cached_token
++ .as_ref()
++ .map_or(false, |cached_token| {
++ cached_token.start_position == token_start_position
++ });
++ let token = if using_cached_token {
++ let cached_token = self.input.cached_token.as_ref().unwrap();
++ self.input.tokenizer.reset(&cached_token.end_state);
++ match cached_token.token {
++ Token::Function(ref name) => self.input.tokenizer.see_function(name),
++ _ => {}
+ }
+- _ => {
+- let new_token = self
+- .input
+- .tokenizer
+- .next()
+- .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
+- self.input.cached_token = Some(CachedToken {
+- token: new_token,
+- start_position: token_start_position,
+- end_state: self.input.tokenizer.state(),
+- });
+- token = self.input.cached_token_ref()
+- }
+- }
++ &cached_token.token
++ } else {
++ let new_token = self
++ .input
++ .tokenizer
++ .next()
++ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
++ self.input.cached_token = Some(CachedToken {
++ token: new_token,
++ start_position: token_start_position,
++ end_state: self.input.tokenizer.state(),
++ });
++ self.input.cached_token_ref()
++ };
+
+ if let Some(block_type) = BlockType::opening(token) {
+ self.at_start_of = Some(block_type);
Index: www/tor-browser/browser/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- www/tor-browser/browser/Makefile 22 Sep 2019 17:19:06 -0000 1.36
+++ www/tor-browser/browser/Makefile 30 Sep 2019 11:58:09 -0000
@@ -6,6 +6,8 @@
COMMENT = modified version of Firefox ESR for browsing over Tor
ONLY_FOR_ARCHS = amd64 i386

+BROKEN = (unintentionally) broken by lang/rust 1.38.0
+
MOZILLA_VERSION = ${TB_VERSION}
MOZILLA_PROJECT = ${BROWSER_NAME}
MOZILLA_CODENAME = browser