[update patch] nnn 1.8 -> 2.8.1

2020-01-12 Thread Martin Ziemer
This patch updates nnn from 1.8 to 2.8.1.

I tested it on three amd64 Systems.

It would be great, if someone would update the port.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- Makefile17 Jul 2019 14:39:43 -  1.3
+++ Makefile19 Dec 2019 10:22:03 -
@@ -2,10 +2,9 @@
 
 COMMENT =  the missing terminal file browser for X
 
-V =1.8
+V =2.8.1
 DISTNAME = nnn-v${V}
 PKGNAME =  nnn-${V}
-REVISION = 0
 
 CATEGORIES =   sysutils
 
@@ -26,21 +25,21 @@ NO_TEST =   Yes
 WRKDIST =  ${WRKDIR}/nnn
 
 pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/nlay
 
 do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nnn ${PREFIX}/bin/
-   ${INSTALL_SCRIPT} ${WRKSRC}/nlay ${PREFIX}/bin/
+   ${INSTALL_PROGRAM} ${WRKSRC}/misc/nlay/nlay ${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/nnn.1 ${PREFIX}/man/man1/
+   ${INSTALL_MAN} ${WRKSRC}/misc/nlay/nlay.1 ${PREFIX}/man/man1/
 
${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/
-   ${INSTALL_DATA} 
${WRKSRC}/scripts/auto-completion/bash/nnn-completion.bash \
+   ${INSTALL_DATA} ${WRKSRC}/misc/auto-completion/bash/nnn-completion.bash 
\
${PREFIX}/share/bash-completion/completions/nnn
${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions/
-   ${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/fish/nnn.fish \
+   ${INSTALL_DATA} ${WRKSRC}/misc/auto-completion/fish/nnn.fish \
${PREFIX}/share/fish/completions/
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions/
-   ${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/zsh/_nnn \
+   ${INSTALL_DATA} ${WRKSRC}/misc/auto-completion/zsh/_nnn \
${PREFIX}/share/zsh/site-functions/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/nnn/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo7 May 2018 18:29:00 -   1.1.1.1
+++ distinfo19 Dec 2019 10:22:03 -
@@ -1,2 +1,2 @@
-SHA256 (nnn-v1.8.tar.gz) = 5VioxbeEe8flfyPw3faQ0mbBXGNDDjbolVj69p+jkH8=
-SIZE (nnn-v1.8.tar.gz) = 42453
+SHA256 (nnn-v2.8.1.tar.gz) = 4Pr45ifU+GBQ9XyzHu4hvw4hOK3vjtVBKwc12ptdh7w=
+SIZE (nnn-v2.8.1.tar.gz) = 91353
Index: patches/patch-nlay
===
RCS file: patches/patch-nlay
diff -N patches/patch-nlay
--- patches/patch-nlay  7 May 2018 18:29:00 -   1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-nlay,v 1.1.1.1 2018/05/07 18:29:00 kn Exp $
-
-Index: nlay
 nlay.orig
-+++ nlay
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!${LOCALBASE}/bin/bash
- 
- # 
#
- # nlay: a customizable script to play files in different apps by file type
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/nnn/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST   7 May 2018 18:29:00 -   1.1.1.1
+++ pkg/PLIST   19 Dec 2019 10:22:03 -
@@ -2,6 +2,7 @@
 bin/nlay
 @bin bin/nnn
 @man man/man1/nnn.1
+@man man/man1/nlay.1
 share/bash-completion/
 share/bash-completion/completions/
 share/bash-completion/completions/nnn



回复: [Update] math/matio : Update to 1.5.17

2020-01-12 Thread wen heping
Revised patch which switch HOMEPAGE to https.

wen

发件人: owner-po...@openbsd.org  代表 Rafael Sadowski 

发送时间: 2020年1月13日 14:19
收件人: wen heping 
抄送: ports@openbsd.org 
主题: Re: [Update] math/matio : Update to 1.5.17

On Sun Jan 12, 2020 at 12:14:46PM +, wen heping wrote:
> Hi, ports@:
>
>Here is a patch for math/matio to update to 1.5.17,
> It build well and pass all tests on amd64-current system.
>No other ports depends on it.
>
> Cheers,
> wen

> Index: Makefile
> ===
> RCS file: /cvs/ports/math/matio/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile  12 Jul 2019 20:47:42 -  1.16
> +++ Makefile  12 Jan 2020 12:09:20 -
> @@ -2,8 +2,8 @@
>
>  COMMENT= library for reading and writing Matlab MAT files
>
> -DISTNAME=matio-1.5.9
> -SHARED_LIBS= matio   2.0  # 6.0
> +DISTNAME=matio-1.5.17
> +SHARED_LIBS= matio   2.0  # 10.2
>  CATEGORIES=  math
>
>  HOMEPAGE=http://sourceforge.net/projects/matio/

s/http/https/ please.

> Index: distinfo
> ===
> RCS file: /cvs/ports/math/matio/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  30 Dec 2016 12:12:28 -  1.5
> +++ distinfo  12 Jan 2020 12:09:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (matio-1.5.9.tar.gz) = vrf5ZYMexbTvQ/iDDuHvHBIc2Y4RsPbh2YcT2fhgwFw=
> -SIZE (matio-1.5.9.tar.gz) = 8520329
> +SHA256 (matio-1.5.17.tar.gz) = XkVVJ9Nwqyl8Sr5aKrTVmck6x8GgyF2EHMXCL4IhxAA=
> +SIZE (matio-1.5.17.tar.gz) = 10066268
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/math/matio/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 30 Dec 2016 12:12:28 -  1.3
> +++ pkg/PLIST 12 Jan 2020 12:09:20 -
> @@ -8,7 +8,9 @@ lib/libmatio.la
>  lib/pkgconfig/matio.pc
>  @man man/man3/Mat_Close.3
>  @man man/man3/Mat_CreateVer.3
> +@man man/man3/Mat_GetDir.3
>  @man man/man3/Mat_GetFilename.3
> +@man man/man3/Mat_GetHeader.3
>  @man man/man3/Mat_GetLibraryVersion.3
>  @man man/man3/Mat_GetVersion.3
>  @man man/man3/Mat_Open.3
> @@ -16,13 +18,17 @@ lib/pkgconfig/matio.pc
>  @man man/man3/Mat_VarAddStructField.3
>  @man man/man3/Mat_VarCreate.3
>  @man man/man3/Mat_VarCreateStruct.3
> +@man man/man3/Mat_VarDelete.3
>  @man man/man3/Mat_VarFree.3
>  @man man/man3/Mat_VarGetNumberOfFields.3
> +@man man/man3/Mat_VarGetSize.3
>  @man man/man3/Mat_VarGetStructFieldnames.3
>  @man man/man3/Mat_VarGetStructs.3
>  @man man/man3/Mat_VarGetStructsLinear.3
> +@man man/man3/Mat_VarPrint.3
>  @man man/man3/Mat_VarRead.3
>  @man man/man3/Mat_VarReadInfo.3
>  @man man/man3/Mat_VarReadNext.3
>  @man man/man3/Mat_VarReadNextInfo.3
>  @man man/man3/Mat_VarWrite.3
> +@man man/man3/Mat_VarWriteAppend.3

Index: Makefile
===
RCS file: /cvs/ports/math/matio/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile12 Jul 2019 20:47:42 -  1.16
+++ Makefile13 Jan 2020 07:04:19 -
@@ -2,11 +2,11 @@
 
 COMMENT=   library for reading and writing Matlab MAT files
 
-DISTNAME=  matio-1.5.9
-SHARED_LIBS=   matio   2.0  # 6.0
+DISTNAME=  matio-1.5.17
+SHARED_LIBS=   matio   2.0  # 10.2
 CATEGORIES=math
 
-HOMEPAGE=  http://sourceforge.net/projects/matio/
+HOMEPAGE=  https://sourceforge.net/projects/matio/
 
 # BSD
 PERMIT_PACKAGE=Yes
Index: distinfo
===
RCS file: /cvs/ports/math/matio/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo30 Dec 2016 12:12:28 -  1.5
+++ distinfo13 Jan 2020 07:04:19 -
@@ -1,2 +1,2 @@
-SHA256 (matio-1.5.9.tar.gz) = vrf5ZYMexbTvQ/iDDuHvHBIc2Y4RsPbh2YcT2fhgwFw=
-SIZE (matio-1.5.9.tar.gz) = 8520329
+SHA256 (matio-1.5.17.tar.gz) = XkVVJ9Nwqyl8Sr5aKrTVmck6x8GgyF2EHMXCL4IhxAA=
+SIZE (matio-1.5.17.tar.gz) = 10066268
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/matio/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   30 Dec 2016 12:12:28 -  1.3
+++ pkg/PLIST   13 Jan 2020 07:04:19 -
@@ -8,7 +8,9 @@ lib/libmatio.la
 lib/pkgconfig/matio.pc
 @man man/man3/Mat_Close.3
 @man man/man3/Mat_CreateVer.3
+@man man/man3/Mat_GetDir.3
 @man man/man3/Mat_GetFilename.3
+@man man/man3/Mat_GetHeader.3
 @man man/man3/Mat_GetLibraryVersion.3
 @man man/man3/Mat_GetVersion.3
 @man man/man3/Mat_Open.3
@@ -16,13 +18,17 @@ lib/pkgconfig/matio.pc
 @man man/man3/Mat_VarAddStructField.3
 @man man/man3/Mat_VarCreate.3
 @man man/man3/Mat_VarCreateStruct.3
+@man man/man3/Mat_VarDelete.3
 @man man/man3/Mat_VarFree.3
 @man man/man3/Mat_VarGetNumberOfFields.3
+@man man/man3/Mat_VarGetSize.3
 @man man/man3/Mat_VarGetStructFieldnames.3

Re: [Update] math/matio : Update to 1.5.17

2020-01-12 Thread Rafael Sadowski
On Sun Jan 12, 2020 at 12:14:46PM +, wen heping wrote:
> Hi, ports@:
> 
>Here is a patch for math/matio to update to 1.5.17,
> It build well and pass all tests on amd64-current system.
>No other ports depends on it.
> 
> Cheers,
> wen

> Index: Makefile
> ===
> RCS file: /cvs/ports/math/matio/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile  12 Jul 2019 20:47:42 -  1.16
> +++ Makefile  12 Jan 2020 12:09:20 -
> @@ -2,8 +2,8 @@
>  
>  COMMENT= library for reading and writing Matlab MAT files
>  
> -DISTNAME=matio-1.5.9
> -SHARED_LIBS= matio   2.0  # 6.0
> +DISTNAME=matio-1.5.17
> +SHARED_LIBS= matio   2.0  # 10.2
>  CATEGORIES=  math
>  
>  HOMEPAGE=http://sourceforge.net/projects/matio/

s/http/https/ please.

> Index: distinfo
> ===
> RCS file: /cvs/ports/math/matio/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  30 Dec 2016 12:12:28 -  1.5
> +++ distinfo  12 Jan 2020 12:09:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (matio-1.5.9.tar.gz) = vrf5ZYMexbTvQ/iDDuHvHBIc2Y4RsPbh2YcT2fhgwFw=
> -SIZE (matio-1.5.9.tar.gz) = 8520329
> +SHA256 (matio-1.5.17.tar.gz) = XkVVJ9Nwqyl8Sr5aKrTVmck6x8GgyF2EHMXCL4IhxAA=
> +SIZE (matio-1.5.17.tar.gz) = 10066268
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/math/matio/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 30 Dec 2016 12:12:28 -  1.3
> +++ pkg/PLIST 12 Jan 2020 12:09:20 -
> @@ -8,7 +8,9 @@ lib/libmatio.la
>  lib/pkgconfig/matio.pc
>  @man man/man3/Mat_Close.3
>  @man man/man3/Mat_CreateVer.3
> +@man man/man3/Mat_GetDir.3
>  @man man/man3/Mat_GetFilename.3
> +@man man/man3/Mat_GetHeader.3
>  @man man/man3/Mat_GetLibraryVersion.3
>  @man man/man3/Mat_GetVersion.3
>  @man man/man3/Mat_Open.3
> @@ -16,13 +18,17 @@ lib/pkgconfig/matio.pc
>  @man man/man3/Mat_VarAddStructField.3
>  @man man/man3/Mat_VarCreate.3
>  @man man/man3/Mat_VarCreateStruct.3
> +@man man/man3/Mat_VarDelete.3
>  @man man/man3/Mat_VarFree.3
>  @man man/man3/Mat_VarGetNumberOfFields.3
> +@man man/man3/Mat_VarGetSize.3
>  @man man/man3/Mat_VarGetStructFieldnames.3
>  @man man/man3/Mat_VarGetStructs.3
>  @man man/man3/Mat_VarGetStructsLinear.3
> +@man man/man3/Mat_VarPrint.3
>  @man man/man3/Mat_VarRead.3
>  @man man/man3/Mat_VarReadInfo.3
>  @man man/man3/Mat_VarReadNext.3
>  @man man/man3/Mat_VarReadNextInfo.3
>  @man man/man3/Mat_VarWrite.3
> +@man man/man3/Mat_VarWriteAppend.3



Re: [lang/racket-minimal-7.5] Racket has issues rendering text via 2htdp/image

2020-01-12 Thread Juan Francisco Cantero Hurtado
On Sun, Jan 12, 2020 at 07:24:52PM +0100, Juan Francisco Cantero Hurtado wrote:
> On Sat, Jan 11, 2020 at 08:59:32PM -0500, rsiddharth wrote:
> > Hi,
> > 
> > Racket's 2htdp/image's `text`[1] function is having troubling rendering
> > text:
> > 
> > https://ricketyspace.net/tmp/racket-2htdp-image-text-issue.png
> > (In Emacs Racket-REPL via racket-mode[2])
> > 
> > https://ricketyspace.net/tmp/racket-drracket-text-issue.png
> > (In DrRacket)
> > 
> > https://ricketyspace.net/tmp/racket-fontrendering-issue.mkv
> > (Video demonstration of the issue)
> > 
> > [1]: 
> > https://docs.racket-lang.org/teachpack/2htdpimage.html?q=text#%28def._%28%28lib._2htdp%2Fimage..rkt%29._text%29%29
> > [2]: https://github.com/greghendershott/racket-mode
> > 
> > I've been using racket-minimal on OpenBSD for the last 6 months and I've
> > not had this issue before.
> > 
> > My OpenBSD system info:
> > 
> >cygnus$ uname -a
> >OpenBSD cygnus.ricketyspace.net 6.6 GENERIC.MP#597 amd64
> > 
> >cygnus$ pkg_info -A  | grep racket 
> >racket-minimal-7.5  multi-paradigm programming language
> > 
> >Running OpenBSD snapshot (2020-01-11) with racket-minimal version
> >7.5 installed.
> > 
> > I tried using the 2htdp/image's `text`[1] function on Ubuntu 19.10 with
> > Racket version 7.5. It works there. So, this issue seems to be specific
> > to OpenBSD.
> > 
> > I'm guessing this issue might be related to upgrades to[3]:
> > 
> > libXfont2 2.0.4.
> > font/util 1.3.2.
> > font/encodings 1.0.5.
> > 
> > [3]: https://www.openbsd.org/plus.html
> > 
> > I'm wondering if the racket-minimal package needs to re-compiled?
> > 
> > Steps to replicate this issue:
> > 
> >   # pkg_add racket-minimal
> > 
> >   $ raco pkg install --jobs $(sysctl -n hw.ncpuonline) \
> >  --auto drracket
> > 
> >   $ curl https://ricketyspace.net/tmp/text.rkt > /tmp/text.rkt
> > 
> >   $ $HOME/.racket/7.5/bin/drracket
> > 
> > File -> Open -> /tmp/text.rkt
> > 
> > To run the text.rkt file -> hit Ctrl+R or click "Run" button in
> > the top right.
> > 
> > In the REPL that opens at the bottom, do:
> > 
> > (hello)
> > 
> > It would be great if this issue can be fixed in OpenBSD.
> > 
> > Let me know if more information is needed from my end.
> 
> Thanks for the report. I will take a look.

Your code works for me.

solene@ and I tested this code and worked for us:

#lang racket

(require 2htdp/image)

(define (hello)
  (text/font "Hello World 42" 24 "black"
 "Luxi Sans" 'roman 'normal 'normal #f))

(save-image (hello) "test.png")

In the video, I see font rendering problems in the DrRacket REPL, which
is quite weird because the code editor and the menu work fine. So, you
have missing fonts, a broken config which renders erroneously some
glyphs or a broken lib. htdp uses the draw lib and it uses cairo. If we
had cairo/pango broken, we would see missing glyphs everywhere. Racket
doesn't use low level libs.

Try this:
- Change /etc/installurl to https://cdn.openbsd.org/pub/OpenBSD
- sysupgrade -f -s
- pkg_add -Dinstalled -Viu
- pkg_delete -a

That should reinstall everything and remove old libraries.



-- 
Juan Francisco Cantero Hurtado http://juanfra.info



Re: UPDATE: mail/msmtp 1.6.6p1 -> 1.8.6

2020-01-12 Thread Xiyue Deng
Stuart Henderson  writes:

> I'd prefer not to be CC'd on ports that I don't have anything to do with,
> ports@ is enough.
>

Sorry about this Stuart.  It's just that it has been weeks since I sent
out the diff and there is not dedicated maintainer for this port, and
you have been kindly offering your help.  I don't know how long I have to
keep bumping it before it is submitted.

It could be helpful if there was a bug tracker for such kind of ports so
that it doesn't get buried like in the mailing list.

>
> On 2020/01/12 03:13, Xiyue Deng wrote:
>> Friendly ping.
>> 
>> Xiyue Deng  writes:
>> 
>> > Friendly ping.  CCing Stuart in case he's interested.
>> >
>> > Xiyue Deng  writes:
>> >
>> >> Friendly ping.
>> >>
>> >> Xiyue Deng  writes:
>> >>
>> >>> Dear ports maintainers,
>> >>>
>> >>> I have updated msmtp to the latest version (1.8.6) in ports.  It
>> >>> includes the following changes:
>> >>>
>> >>> * GnuTLS is recommended and deprecated OpenSSL.
>> >>>   - So now GnuTLS is part of the build dependencies.
>> >>>
>> >>> * Use libidn2 instead of the older libidn.
>> >>>   - Configure switch remains as "--with-libidn".
>> >>>
>> >>> * Refreshed patches to apply cleanly.
>> >>>
>> >>> I also have a few questions when working on this ports:
>> >>>
>> >>> * Many of the patches just replace "#!/usr/bin/env bash" to
>> >>>   "#!/bin/sh".  Now most of scripts are changed to use "#!/usr/bin/env
>> >>>   sh" which should now be the same thing.  Should we just drop those
>> >>>   patches?
>> >>>
>> >>> * One of the patches changes the system /etc/msmtprc to provide an
>> >>>   "account default" that listens on localhost:25, which will then use
>> >>>   smtpd as server by default.  I think the intention is to provide a
>> >>>   working configure that works out of the box.  However this may not do
>> >>>   what you want because if one try to configure an account in a user
>> >>>   configuration and somehow it contains errors (e.g. not properly
>> >>>   provide a "from" address), msmtp will just send the mail through smtpd
>> >>>   and returns OK which will result in the mail stuck in the system mail
>> >>>   queue forever.  So my suggestion is to leave this file untouched so
>> >>>   that the system /etc/msmtprc will just provide a fake "account
>> >>>   default" and any mail not handled with a user provided account will
>> >>>   fail immediately.
>> >>>
>> >>> Tested on mips64el/loongson on 6.6-stable.  Please let me know what you
>> >>> think.  The diff is attached.
>> >>>
>> >>> Index: Makefile
>> >>> ===
>> >>> RCS file: /cvs/ports/mail/msmtp/Makefile,v
>> >>> retrieving revision 1.47
>> >>> diff -u -p -r1.47 Makefile
>> >>> --- Makefile 12 Jul 2019 20:47:30 -  1.47
>> >>> +++ Makefile 21 Dec 2019 13:54:18 -
>> >>> @@ -2,27 +2,27 @@
>> >>>  
>> >>>  COMMENT =   SMTP plugin for MUAs
>> >>>  
>> >>> -DISTNAME =  msmtp-1.6.6
>> >>> +DISTNAME =  msmtp-1.8.6
>> >>>  CATEGORIES =mail
>> >>> -REVISION =  1
>> >>>  
>> >>>  HOMEPAGE =  https://marlam.de/msmtp/
>> >>>  
>> >>>  # GPLv3
>> >>>  PERMIT_PACKAGE =Yes
>> >>>  
>> >>> -WANTLIB =  c crypto iconv idn intl ssl
>> >>> +WANTLIB =  c crypto iconv idn2 intl gnutls
>> >>>  
>> >>>  MASTER_SITES =  https://marlam.de/msmtp/releases/
>> >>>  EXTRACT_SUFX =  .tar.xz
>> >>>  
>> >>> -LIB_DEPENDS =   devel/libidn
>> >>> +LIB_DEPENDS =   devel/libidn2 \
>> >>> +security/gnutls
>> >>>  
>> >>>  SEPARATE_BUILD =Yes
>> >>>  CONFIGURE_STYLE =   gnu
>> >>>  CONFIGURE_ARGS =--with-libgsasl=no \
>> >>>  --with-libidn=yes \
>> >>> ---with-tls=openssl \
>> >>> +--with-tls=gnutls \
>> >>>  --without-libsecret
>> >>>  
>> >>>  post-install:
>> >>> Index: distinfo
>> >>> ===
>> >>> RCS file: /cvs/ports/mail/msmtp/distinfo,v
>> >>> retrieving revision 1.30
>> >>> diff -u -p -r1.30 distinfo
>> >>> --- distinfo 26 Mar 2017 13:34:06 -  1.30
>> >>> +++ distinfo 21 Dec 2019 13:54:18 -
>> >>> @@ -1,2 +1,2 @@
>> >>> -SHA256 (msmtp-1.6.6.tar.xz) = 
>> >>> 2hXbH2K9AgH85TEK24nIYYi+kc10W3yztiuBpQHn+14=
>> >>> -SIZE (msmtp-1.6.6.tar.xz) = 283744
>> >>> +SHA256 (msmtp-1.8.6.tar.xz) = 
>> >>> ZiXxR0MMZbqFJ/UsT+XU0zVS08D7bXk7p9+BmjswQuE=
>> >>> +SIZE (msmtp-1.8.6.tar.xz) = 339732
>> >>> Index: patches/patch-doc_msmtprc-system_example
>> >>> ===
>> >>> RCS file: 
>> >>> /cvs/ports/mail/msmtp/patches/patch-doc_msmtprc-system_example,v
>> >>> retrieving revision 1.1
>> >>> diff -u -p -r1.1 patch-doc_msmtprc-system_example
>> >>> --- patches/patch-doc_msmtprc-system_example 13 Feb 2009 14:59:01 
>> >>> -  1.1
>

update www/mozilla-firefox on 6.6-stable

2020-01-12 Thread Solene Rapenne
this patch allows building firefox 72.0.1 on 6.6-stable without
touching anything else.

It's mostly a copy/paste of the -current ports but it uses nss,
nspr and sqlite bundled with firefox. I disabled pledge and
updated README according to this (saying it's off by default).

built fine (after 482 minutes of building :P) and tested on amd64

Index: Makefile
===
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.398
diff -u -p -r1.398 Makefile
--- Makefile8 Oct 2019 20:16:08 -   1.398
+++ Makefile12 Jan 2020 19:34:01 -
@@ -1,23 +1,25 @@
-# $OpenBSD: Makefile,v 1.398 2019/10/08 20:16:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.408 2020/01/09 07:25:36 landry Exp $
 
 COMMENT =  Mozilla web browser
 ONLY_FOR_ARCHS =   amd64 i386 aarch64
 
 # Don't forget to bump www/firefox-i18n after updates.
 
-MOZILLA_VERSION =  69.0.2
+MOZILLA_VERSION =  72.0.1
 MOZILLA_BRANCH =   release
 MOZILLA_PROJECT =  firefox
 MOZILLA_CODENAME = browser
-REVISION = 0
 
 WRKDIST =  ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/b[0-9]*//}
 HOMEPAGE = https://www.mozilla.org/firefox/
-SO_VERSION =   84.0
+SO_VERSION =   87.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 MOZILLA_LIBS = mozavcodec mozavutil mozgtk xul clearkey lgpllibs
 
+# use bundled libs for the backport
+MOZILLA_LIBS+= freebl3 mozsqlite3 nspr4 nss3 nssckbi nssdbm3 nssutil3 plc4 
plds4 smime3 softokn3 ssl3   
+
 CATEGORIES =   www
 
 # mozilla public license
@@ -40,6 +42,11 @@ MOZILLA_USE_BUNDLED_CAIRO = Yes
 # #1460600
 MOZILLA_USE_BUNDLED_HUNSPELL = Yes
 
+# use bundled libs for the backport
+MOZILLA_USE_BUNDLED_SQLITE = Yes
+MOZILLA_USE_BUNDLED_NSS = Yes
+MOZILLA_USE_BUNDLED_NSPR = Yes
+
 # firefox >= 53 needs rust
 BUILD_DEPENDS +=   lang/rust>=1.34
 # stylo build needs LLVM
@@ -49,14 +56,18 @@ BUILD_DEPENDS +=lang/python/${MODPY_DEF
 # 63 requires node because why not #1483595
 BUILD_DEPENDS +=   lang/node
 # 63 requires cbindgen #1478813
-BUILD_DEPENDS +=   devel/cbindgen>=0.9.0
+BUILD_DEPENDS +=   devel/cbindgen>=0.9.1
 .if (${MACHINE_ARCH}==amd64) || (${MACHINE_ARCH}==i386)
 # 67 requires nasm for bundled libdav1d
 BUILD_DEPENDS +=   devel/nasm
 .endif
+# unveil support relies on xdg-open
+RUN_DEPENDS += devel/xdg-utils
 
+# uses pledge()
 WANTLIB += X11-xcb Xcursor Xi intl xcb xcb-shm ${COMPILER_LIBCXX}
 
+
 # Regression tests are too hard to adapt to run here
 NO_TEST =  Yes
 
@@ -67,7 +78,15 @@ MAKE_ENV +=  BUILD_VERBOSE_LOG="1" CARGO
 CONFIGURE_ARGS +=  --enable-release #1386371
 CONFIGURE_ARGS +=  --enable-sandbox
 CONFIGURE_ARGS +=  --with-libclang-path=${LOCALBASE}/lib
-SUBST_VARS +=  LOCALBASE X11BASE
+SUBST_VARS +=  LOCALBASE X11BASE MOZILLA_PROJECT
+
+DEBUG_PACKAGES =   ${BUILD_PACKAGES}
+DEBUG_CONFIGURE_ARGS +=--enable-debug-symbols \
+   --disable-install-strip
+
+post-patch:
+   sed -i 's/"files":{[^}]*}/"files":{}/' \
+   ${WRKSRC}/third_party/rust/slice-deque/.cargo-checksum.json
 
 show-commit:
@curl -s 
https://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MOZILLA_VERSION}/SOURCE|
 awk -F / '/^https:\/\/hg/ {print $$7 }'
@@ -87,14 +106,14 @@ post-install:
${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/distribution.ini
# install desktop file
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
-   ${SUBST_DATA} ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
+   ${SUBST_DATA} 
${WRKSRC}/taskcluster/docker/firefox-snap/${MOZILLA_PROJECT}.desktop \
${PREFIX}/share/applications/${MOZILLA_PROJECT}.desktop
-   # install icon for desktop file
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
-   ${INSTALL_DATA} 
${PREFIX}/lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default128.png \
-   ${PREFIX}/share/pixmaps/firefox.png
 
# link default48.png to default.png to be used by default by non-icccm 
compliant wm
ln 
${PREFIX}/lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default{48,}.png
+
+.for f in unveil.content unveil.gpu unveil.main pledge.content pledge.gpu 
pledge.main
+   ${INSTALL_DATA} ${FILESDIR}/${f} 
${PREFIX}/lib/${MOZILLA_PROJECT}/browser/defaults/preferences/
+.endfor
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/www/mozilla-firefox/distinfo,v
retrieving revision 1.199
retrieving revision 1.205
diff -u -p -r1.199 -r1.205
--- distinfo3 Oct 2019 17:57:49 -   1.199
+++ distinfo9 Jan 2020 07:25:36 -   1.205
@@ -1,2 +1,2 @@
-SHA256 (mozilla/firefox-69.0.2.source.tar.xz) = 
KQTvlUYm0qfzIGcMy3y12QYGEPCRyUGQpsvuFKos2C4=
-SIZE (mozilla/firefox-69.0.2.source.tar.xz) = 315308244
+SHA256 (mozilla/firefox-72.0.1.

Re: [lang/racket-minimal-7.5] Racket has issues rendering text via 2htdp/image

2020-01-12 Thread Juan Francisco Cantero Hurtado
On Sat, Jan 11, 2020 at 08:59:32PM -0500, rsiddharth wrote:
> Hi,
> 
> Racket's 2htdp/image's `text`[1] function is having troubling rendering
> text:
> 
> https://ricketyspace.net/tmp/racket-2htdp-image-text-issue.png
> (In Emacs Racket-REPL via racket-mode[2])
> 
> https://ricketyspace.net/tmp/racket-drracket-text-issue.png
> (In DrRacket)
> 
> https://ricketyspace.net/tmp/racket-fontrendering-issue.mkv
> (Video demonstration of the issue)
> 
> [1]: 
> https://docs.racket-lang.org/teachpack/2htdpimage.html?q=text#%28def._%28%28lib._2htdp%2Fimage..rkt%29._text%29%29
> [2]: https://github.com/greghendershott/racket-mode
> 
> I've been using racket-minimal on OpenBSD for the last 6 months and I've
> not had this issue before.
> 
> My OpenBSD system info:
> 
>cygnus$ uname -a
>OpenBSD cygnus.ricketyspace.net 6.6 GENERIC.MP#597 amd64
> 
>cygnus$ pkg_info -A  | grep racket 
>racket-minimal-7.5  multi-paradigm programming language
> 
>Running OpenBSD snapshot (2020-01-11) with racket-minimal version
>7.5 installed.
> 
> I tried using the 2htdp/image's `text`[1] function on Ubuntu 19.10 with
> Racket version 7.5. It works there. So, this issue seems to be specific
> to OpenBSD.
> 
> I'm guessing this issue might be related to upgrades to[3]:
> 
> libXfont2 2.0.4.
> font/util 1.3.2.
> font/encodings 1.0.5.
> 
> [3]: https://www.openbsd.org/plus.html
> 
> I'm wondering if the racket-minimal package needs to re-compiled?
> 
> Steps to replicate this issue:
> 
>   # pkg_add racket-minimal
> 
>   $ raco pkg install --jobs $(sysctl -n hw.ncpuonline) \
>  --auto drracket
> 
>   $ curl https://ricketyspace.net/tmp/text.rkt > /tmp/text.rkt
> 
>   $ $HOME/.racket/7.5/bin/drracket
> 
> File -> Open -> /tmp/text.rkt
> 
> To run the text.rkt file -> hit Ctrl+R or click "Run" button in
> the top right.
> 
> In the REPL that opens at the bottom, do:
> 
> (hello)
> 
> It would be great if this issue can be fixed in OpenBSD.
> 
> Let me know if more information is needed from my end.

Thanks for the report. I will take a look.


-- 
Juan Francisco Cantero Hurtado http://juanfra.info



bsd.port.mk: remove COMPILER_VERSION from MAKE_ENV (Was: Re: [ports-gcc] Unbreak multimedia/mkvtoolnix (impacts all archs))

2020-01-12 Thread Charlene Wendling
> > On Wed, 21 Aug 2019 21:09:33 +0200
> > Charlene Wendling wrote:
>
> > > > http://build-failures.rhaalovely.net/sparc64/2019-08-18/multimedia/mkvtoolnix%2Cno_x11.log
> > > (no full macppc bulk report available for now)
> > > 
> > > What happens behind the scene (--trace didn't help):
> > > 
> > > - $WRKSRC/rake.d/config.rb loads the 'build-config' file, that
> > > says that "COMPILER_VERSION = 8.3.0" (fine)
> > > - $WRKSRC/Rakefile does various compiler version checks to
> > > determine proper build flags to use
> > > - Compiler versions are checked in $WRKSRC/rake.d/helpers.rb using
> > >   Ruby's check_version() function, that seems to not like version
> > >   numbers with letters at the start, as we can see in the log.
> > >   The compiler version itself comes from the c() function...
> > > - ...that is defined in $WRKSRC/rake.d/config.rb, where the line
> > > 24 is interesting:
> > > 
> > > var   = (ENV[idx_s].nil? ? $config[idx.to_sym] : ENV[idx_s]).to_s 
> > > 
> > > It appears that this 'gcc4' is coming from our default MAKE_ENV:
> > > 
> > > $ make show=MAKE_ENV
> > > [...] COMPILER_VERSION="gcc4" [...] 
> > > (on amd64, it returns COMPILER_VERSION="clang")
> > > 
> > > It did not break on amd64, because with clang, upstream uses the
> > > same compilation flags for all versions, so there is no version
> > > comparison done.

> On Sun, 22 Sep 2019 11:30:49 +0200
> Charlene Wendling wrote:
> 
> > There have been some out of list discussion about it.
> > 
> > COMPILER_VERSION is unused in ports and we have PROPERTIES for the
> > same purpose. jca@ proposed to remove COMPILER_VERSION from MAKE_ENV
> > and test bulk the change. The issue being i can't do a (required)
> > full bulk myself.

Thanks to naddy@, it has been found out that removing COMPILER_VERSION
has no side effect in a amd64 bulk. So i'm proposing to remove it from
bsd.port.mk instead of modifying multimedia/mkvtoolnix.

Comments/feedback are welcome.

Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1514
diff -u -p -r1.1514 bsd.port.mk
--- bsd.port.mk 16 Dec 2019 09:18:27 -  1.1514
+++ bsd.port.mk 12 Jan 2020 17:38:22 -
@@ -843,8 +843,7 @@ COMPILER_LINKS += c++ ${CXX}
 
 
 # copy selected info from bsd.own.mk
-MAKE_ENV += COMPILER_VERSION=${COMPILER_VERSION} \
-   PICFLAG="${PICFLAG}" \
+MAKE_ENV += PICFLAG="${PICFLAG}" \
BINGRP=bin BINOWN=root BINMODE=${BINMODE} NONBINMODE=${NONBINMODE} \
DIRMODE=755 \
INSTALL_COPY=-c INSTALL_STRIP=${INSTALL_STRIP} \




Re: net/litecoin tweaks

2020-01-12 Thread Rafael Sadowski
On Sun Jan 12, 2020 at 02:30:00PM +, Stuart Henderson wrote:
> Is the debug flavour the same thing as debug packages? Often these enable
> extra checks or logging.

Thanks Stuart,

Good point, after grep(1)ing a little bit in the source, it looks like
"--enable-debug" only set the compile flags.

> 
> --
> Sent from a phone, apologies for poor formatting.
> 
> On 12 January 2020 12:21:31 Rafael Sadowski  wrote:
> 
> > espie pointed out two improvements/tweaks in net/litecoin, thanks espie.
> > 
> > - Remove debug FLAVOR, this is no longer necessary and we do not need a
> >  debug FLAVOR/Package.
> > - Add missing FLAVOR description.
> > - Enable no_x11 package build.
> > 
> > OK?
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/Makefile,v
> > retrieving revision 1.1163
> > diff -u -p -r1.1163 Makefile
> > --- Makefile10 Jan 2020 17:37:35 -  1.1163
> > +++ Makefile12 Jan 2020 11:43:44 -
> > @@ -225,7 +225,7 @@
> >  SUBDIR += libupnp
> >  SUBDIR += libupnpp
> >  SUBDIR += libvncserver
> > - SUBDIR += litecoin
> > + SUBDIR += litecoin,no_x11
> >  SUBDIR += livemedia
> >  SUBDIR += lldpd
> >  SUBDIR += lldpd,snmp
> > Index: litecoin/Makefile
> > ===
> > RCS file: /cvs/ports/net/litecoin/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- litecoin/Makefile   2 Jan 2020 14:27:46 -   1.8
> > +++ litecoin/Makefile   12 Jan 2020 11:43:44 -
> > @@ -7,7 +7,7 @@ COMMENT =   P2P payment system
> > GH_ACCOUNT =litecoin-project
> > GH_PROJECT =litecoin
> > GH_TAGNAME =v0.17.1
> > -REVISION = 2
> > +REVISION = 3
> > 
> > SHARED_LIBS +=  bitcoinconsensus  1.0 # 0.0
> > SHARED_LIBS +=  secp256k1 0.0 # 0.0
> > @@ -52,12 +52,8 @@ CXXFLAGS +=  -std=c++11
> > 
> > MAKE_FLAGS =CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" 
> > CXXFLAGS="${CXXFLAGS}"
> > 
> > -FLAVORS =  no_x11 debug
> > +FLAVORS =  no_x11
> > FLAVOR ?=
> > -
> > -.if ${FLAVOR:Mdebug}
> > -CONFIGURE_ARGS +=  --enable-debug
> > -.endif
> > 
> > .if ${FLAVOR:Mno_x11}
> > CONFIGURE_ARGS +=   --without-gui
> > Index: litecoin/pkg/DESCR
> > ===
> > RCS file: /cvs/ports/net/litecoin/pkg/DESCR,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 DESCR
> > --- litecoin/pkg/DESCR  8 Mar 2019 05:52:25 -   1.1.1.1
> > +++ litecoin/pkg/DESCR  12 Jan 2020 11:43:44 -
> > @@ -11,3 +11,7 @@ the same time, on the same hardware used
> > specialized ASICs for Bitcoin, Litecoin continues to satisfy these goals. 
> > It is
> > unlikely for ASIC mining to be developed for Litecoin until the currency is
> > widely used.
> > +
> > +Available flavors:
> > +
> > +  no_x11: Built daemon and CLI tools only, no Qt5 GUI tools
> > Index: litecoin/pkg/PLIST
> > ===
> > RCS file: /cvs/ports/net/litecoin/pkg/PLIST,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 PLIST
> > --- litecoin/pkg/PLIST  8 Mar 2019 05:52:25 -   1.1.1.1
> > +++ litecoin/pkg/PLIST  12 Jan 2020 11:43:44 -
> > @@ -20,13 +20,13 @@ include/bitcoinconsensus.h
> > include/secp256k1.h
> > include/secp256k1_recovery.h
> > include/univalue.h
> > -lib/libbitcoinconsensus.a
> > +@static-lib lib/libbitcoinconsensus.a
> > lib/libbitcoinconsensus.la
> > @lib lib/libbitcoinconsensus.so.${LIBbitcoinconsensus_VERSION}
> > -lib/libsecp256k1.a
> > +@static-lib lib/libsecp256k1.a
> > lib/libsecp256k1.la
> > @lib lib/libsecp256k1.so.${LIBsecp256k1_VERSION}
> > -lib/libunivalue.a
> > +@static-lib lib/libunivalue.a
> > lib/libunivalue.la
> > @lib lib/libunivalue.so.${LIBunivalue_VERSION}
> > lib/pkgconfig/libbitcoinconsensus.pc
> 
> 
> 



UPDATE sqlmap to 1.4

2020-01-12 Thread som nom
hi ports@,

here is a patch to update sqlmap to 1.4

what changed?
best parts of https://github.com/sqlmapproject/sqlmap/compare/1.3.12...1.4
after 2019-12-02:

lots of minor updates
Support IPv6 literals ("[::1]:8080") in the proxy switch.
Subtle (sneaky) bug removed (related to #4051) - False or '' results
with ''

? sqlmap-1.4.patch
Index: Makefile
===
RCS file: /cvs/ports/security/sqlmap/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile	9 Dec 2019 07:39:20 -	1.26
+++ Makefile	12 Jan 2020 15:36:51 -
@@ -4,7 +4,7 @@
 
 GH_ACCOUNT =		sqlmapproject
 GH_PROJECT =		sqlmap
-GH_TAGNAME =		1.3.12
+GH_TAGNAME =		1.4
 
 CATEGORIES =		security
 
Index: distinfo
===
RCS file: /cvs/ports/security/sqlmap/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo	9 Dec 2019 07:39:20 -	1.21
+++ distinfo	12 Jan 2020 15:36:51 -
@@ -1,2 +1,2 @@
-SHA256 (sqlmap-1.3.12.tar.gz) = +YuC+eqa8SkXB705K8l3MglBr3m3njSl5J5pRxICRXA=
-SIZE (sqlmap-1.3.12.tar.gz) = 6699037
+SHA256 (sqlmap-1.4.tar.gz) = qRPRd6OrnmT8bfHXVeOQcyMhS+zrOkj65uqGffHMQ0s=
+SIZE (sqlmap-1.4.tar.gz) = 6699133


Re: UPDATE security/scrypt

2020-01-12 Thread Ted Unangst
Björn Ketelaars wrote:
> On Thu 02/01/2020 06:27, Björn Ketelaars wrote:
> > On Wed 01/01/2020 23:03, Ted Unangst wrote:
> > > Björn Ketelaars wrote:
> > > > - When estimating the amount of available RAM, scrypt ignores
> > > >   RLIMIT_DATA on systems which have mmap.
> > > 
> > > This is wrong on OpenBSD. I sent an email to Colin, but the update should
> > > patch this out in the meantime.
> > 
> > Although I'm not doubting that you are right, I fail to understand why
> > ignoring RLIMIT_DATA on OpenBSD is bad. Could you explain why?
> > 
> > I prepared a patch, which:
> > - addresses ignoring RLIMIT DATA, reverting
> >   
> > https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
> > - fixes compiling on base-gcc archs (found by kmos@)
> > 
> > OK?
> 
> Ping...
> 
> Diff below for your convenience.

oh, patch looks good to me, fwiw.



Re: UPDATE security/scrypt

2020-01-12 Thread Charlene Wendling
On Sun, 12 Jan 2020 15:38:21 +0100
Björn Ketelaars wrote:

> On Thu 02/01/2020 06:27, Björn Ketelaars wrote:
> > On Wed 01/01/2020 23:03, Ted Unangst wrote:
> > > Björn Ketelaars wrote:
> > > > - When estimating the amount of available RAM, scrypt ignores
> > > >   RLIMIT_DATA on systems which have mmap.
> > > 
> > > This is wrong on OpenBSD. I sent an email to Colin, but the
> > > update should patch this out in the meantime.
> > 
> > Although I'm not doubting that you are right, I fail to understand
> > why ignoring RLIMIT_DATA on OpenBSD is bad. Could you explain why?
> > 
> > I prepared a patch, which:
> > - addresses ignoring RLIMIT DATA, reverting
> >   
> > https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
> > - fixes compiling on base-gcc archs (found by kmos@)
> > 
> > OK?

It builds and works fine on powerpc (i tried with low limits as well).

COMPILER_LANGS values are by convention in lowercase. If you wonder,
it's still working fine uppercase :)

OK cwen@ either way

 
> Diff below for your convenience.
> 
> diff --git Makefile Makefile
> index 31dc84c3443..04b73ef02b3 100644
> --- Makefile
> +++ Makefile
> @@ -3,6 +3,7 @@
>  COMMENT =command-line encryption using scrypt key derivation
> function 
>  DISTNAME =   scrypt-1.3.0
> +REVISION =   0
>  
>  SHARED_LIBS +=   scrypt-kdf0.0 # 1.0
>  
> @@ -18,6 +19,9 @@ WANTLIB =   c crypto
>  MASTER_SITES =   ${HOMEPAGE}
>  EXTRACT_SUFX =   .tgz
>  
>
> +COMPILER =   base-clang ports-gcc
> +COMPILER_LANGS = C
> +
>  CONFIGURE_STYLE =gnu
>  CONFIGURE_ARGS = --enable-libscrypt-kdf
>  
> diff --git patches/patch-lib_util_memlimit_c
> patches/patch-lib_util_memlimit_c new file mode 100644
> index 000..788724aa76e
> --- /dev/null
> +++ patches/patch-lib_util_memlimit_c
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +
> +Do not ignore RLIMIT_DATA on OpenBSD. Revert
> +https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
> +
> +Index: lib/util/memlimit.c
> +--- lib/util/memlimit.c.orig
>  lib/util/memlimit.c
> +@@ -167,14 +167,12 @@ memlimit_rlimit(size_t * memlimit)
> + memrlimit = (uint64_t)rl.rlim_cur;
> + #endif
> + 
> +-#ifndef HAVE_MMAP
> +-/* ... RLIMIT_DATA (if we're not using mmap)... */
> ++/* ... RLIMIT_DATA... */
> + if (getrlimit(RLIMIT_DATA, &rl))
> + return (1);
> + if ((rl.rlim_cur != RLIM_INFINITY) &&
> + ((uint64_t)rl.rlim_cur < memrlimit))
> + memrlimit = (uint64_t)rl.rlim_cur;
> +-#endif
> + 
> + /* ... and RLIMIT_RSS. */
> + #ifdef RLIMIT_RSS
> 



[NEW]: misc/ocli

2020-01-12 Thread Jan-Piet Mens

Hello!

This is a new port for ocli(1), a utility which connects to a running 
gpsd(8) and publishes position information in the Open Source OwnTracks 
[1] JSON format [2] to an MQTT broker in order for compatible software 
to process location data.


I am also the author the utility which uses pledge(2) and unveil(2) on 
OpenBSD.


Tested on 6.6-CURRENT

I'm hoping somebody is willing to test this, or even better, just go 
ahead and commit it. :-)


Thank you and best regards,

   -JP

[1] https://owntracks.org
[2] https://owntracks.org/booklet/tech/json/


ocli.tgz
Description: application/tar-gz


Re: UPDATE security/scrypt

2020-01-12 Thread Björn Ketelaars
On Sun 12/01/2020 15:38, Björn Ketelaars wrote:
> On Thu 02/01/2020 06:27, Björn Ketelaars wrote:
> > On Wed 01/01/2020 23:03, Ted Unangst wrote:
> > > Björn Ketelaars wrote:
> > > > - When estimating the amount of available RAM, scrypt ignores
> > > >   RLIMIT_DATA on systems which have mmap.
> > > 
> > > This is wrong on OpenBSD. I sent an email to Colin, but the update should
> > > patch this out in the meantime.
> > 
> > Although I'm not doubting that you are right, I fail to understand why
> > ignoring RLIMIT_DATA on OpenBSD is bad. Could you explain why?
> > 
> > I prepared a patch, which:
> > - addresses ignoring RLIMIT DATA, reverting
> >   
> > https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
> > - fixes compiling on base-gcc archs (found by kmos@)
> > 
> > OK?
> 
> Ping...

Oops, forgot to mention the following:

Following https://github.com/Tarsnap/scrypt/issues/226:

Without patch:

$ ulimit -d 123456
$ scrypt enc -v Makefile Makefile.enc   
 
Please enter passphrase: 
Please confirm passphrase: 
Parameters used: N = 262144; r = 8; p = 1;
This requires at least 268 MB bytes of memory (995 MB available),
and will take approximately 0.4 seconds (limit: 5.0 seconds).
scrypt: Error computing derived key: Cannot allocate memory

With patch:

$ ulimit -d 123456
$ scrypt enc -v Makefile Makefile.enc 
Please enter passphrase: 
Please confirm passphrase: 
Parameters used: N = 8192; r = 8; p = 48;
This requires at least 8.3 MB bytes of memory (15 MB available),
and will take approximately 0.6 seconds (limit: 5.0 seconds).



Re: UPDATE security/scrypt

2020-01-12 Thread Björn Ketelaars
On Thu 02/01/2020 06:27, Björn Ketelaars wrote:
> On Wed 01/01/2020 23:03, Ted Unangst wrote:
> > Björn Ketelaars wrote:
> > > - When estimating the amount of available RAM, scrypt ignores
> > >   RLIMIT_DATA on systems which have mmap.
> > 
> > This is wrong on OpenBSD. I sent an email to Colin, but the update should
> > patch this out in the meantime.
> 
> Although I'm not doubting that you are right, I fail to understand why
> ignoring RLIMIT_DATA on OpenBSD is bad. Could you explain why?
> 
> I prepared a patch, which:
> - addresses ignoring RLIMIT DATA, reverting
>   
> https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
> - fixes compiling on base-gcc archs (found by kmos@)
> 
> OK?

Ping...

Diff below for your convenience.

diff --git Makefile Makefile
index 31dc84c3443..04b73ef02b3 100644
--- Makefile
+++ Makefile
@@ -3,6 +3,7 @@
 COMMENT =  command-line encryption using scrypt key derivation function
 
 DISTNAME = scrypt-1.3.0
+REVISION = 0
 
 SHARED_LIBS += scrypt-kdf0.0 # 1.0
 
@@ -18,6 +19,9 @@ WANTLIB = c crypto
 MASTER_SITES = ${HOMEPAGE}
 EXTRACT_SUFX = .tgz
 
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS =   C
+
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --enable-libscrypt-kdf
 
diff --git patches/patch-lib_util_memlimit_c patches/patch-lib_util_memlimit_c
new file mode 100644
index 000..788724aa76e
--- /dev/null
+++ patches/patch-lib_util_memlimit_c
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Do not ignore RLIMIT_DATA on OpenBSD. Revert
+https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
+
+Index: lib/util/memlimit.c
+--- lib/util/memlimit.c.orig
 lib/util/memlimit.c
+@@ -167,14 +167,12 @@ memlimit_rlimit(size_t * memlimit)
+   memrlimit = (uint64_t)rl.rlim_cur;
+ #endif
+ 
+-#ifndef HAVE_MMAP
+-  /* ... RLIMIT_DATA (if we're not using mmap)... */
++  /* ... RLIMIT_DATA... */
+   if (getrlimit(RLIMIT_DATA, &rl))
+   return (1);
+   if ((rl.rlim_cur != RLIM_INFINITY) &&
+   ((uint64_t)rl.rlim_cur < memrlimit))
+   memrlimit = (uint64_t)rl.rlim_cur;
+-#endif
+ 
+   /* ... and RLIMIT_RSS. */
+ #ifdef RLIMIT_RSS



Re: net/litecoin tweaks

2020-01-12 Thread Stuart Henderson
Is the debug flavour the same thing as debug packages? Often these enable 
extra checks or logging.


--
Sent from a phone, apologies for poor formatting.

On 12 January 2020 12:21:31 Rafael Sadowski  wrote:


espie pointed out two improvements/tweaks in net/litecoin, thanks espie.

- Remove debug FLAVOR, this is no longer necessary and we do not need a
 debug FLAVOR/Package.
- Add missing FLAVOR description.
- Enable no_x11 package build.

OK?

Index: Makefile
===
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1163
diff -u -p -r1.1163 Makefile
--- Makefile10 Jan 2020 17:37:35 -  1.1163
+++ Makefile12 Jan 2020 11:43:44 -
@@ -225,7 +225,7 @@
 SUBDIR += libupnp
 SUBDIR += libupnpp
 SUBDIR += libvncserver
- SUBDIR += litecoin
+ SUBDIR += litecoin,no_x11
 SUBDIR += livemedia
 SUBDIR += lldpd
 SUBDIR += lldpd,snmp
Index: litecoin/Makefile
===
RCS file: /cvs/ports/net/litecoin/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- litecoin/Makefile   2 Jan 2020 14:27:46 -   1.8
+++ litecoin/Makefile   12 Jan 2020 11:43:44 -
@@ -7,7 +7,7 @@ COMMENT =   P2P payment system
GH_ACCOUNT =litecoin-project
GH_PROJECT =litecoin
GH_TAGNAME =v0.17.1
-REVISION = 2
+REVISION = 3

SHARED_LIBS +=  bitcoinconsensus  1.0 # 0.0
SHARED_LIBS +=  secp256k1 0.0 # 0.0
@@ -52,12 +52,8 @@ CXXFLAGS +=  -std=c++11

MAKE_FLAGS =CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" 
CXXFLAGS="${CXXFLAGS}"

-FLAVORS =  no_x11 debug
+FLAVORS =  no_x11
FLAVOR ?=
-
-.if ${FLAVOR:Mdebug}
-CONFIGURE_ARGS +=  --enable-debug
-.endif

.if ${FLAVOR:Mno_x11}
CONFIGURE_ARGS +=   --without-gui
Index: litecoin/pkg/DESCR
===
RCS file: /cvs/ports/net/litecoin/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- litecoin/pkg/DESCR  8 Mar 2019 05:52:25 -   1.1.1.1
+++ litecoin/pkg/DESCR  12 Jan 2020 11:43:44 -
@@ -11,3 +11,7 @@ the same time, on the same hardware used
specialized ASICs for Bitcoin, Litecoin continues to satisfy these goals. It is
unlikely for ASIC mining to be developed for Litecoin until the currency is
widely used.
+
+Available flavors:
+
+  no_x11: Built daemon and CLI tools only, no Qt5 GUI tools
Index: litecoin/pkg/PLIST
===
RCS file: /cvs/ports/net/litecoin/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- litecoin/pkg/PLIST  8 Mar 2019 05:52:25 -   1.1.1.1
+++ litecoin/pkg/PLIST  12 Jan 2020 11:43:44 -
@@ -20,13 +20,13 @@ include/bitcoinconsensus.h
include/secp256k1.h
include/secp256k1_recovery.h
include/univalue.h
-lib/libbitcoinconsensus.a
+@static-lib lib/libbitcoinconsensus.a
lib/libbitcoinconsensus.la
@lib lib/libbitcoinconsensus.so.${LIBbitcoinconsensus_VERSION}
-lib/libsecp256k1.a
+@static-lib lib/libsecp256k1.a
lib/libsecp256k1.la
@lib lib/libsecp256k1.so.${LIBsecp256k1_VERSION}
-lib/libunivalue.a
+@static-lib lib/libunivalue.a
lib/libunivalue.la
@lib lib/libunivalue.so.${LIBunivalue_VERSION}
lib/pkgconfig/libbitcoinconsensus.pc






Re: UPDATE: mail/msmtp 1.6.6p1 -> 1.8.6

2020-01-12 Thread Stuart Henderson
I'd prefer not to be CC'd on ports that I don't have anything to do with,
ports@ is enough.


On 2020/01/12 03:13, Xiyue Deng wrote:
> Friendly ping.
> 
> Xiyue Deng  writes:
> 
> > Friendly ping.  CCing Stuart in case he's interested.
> >
> > Xiyue Deng  writes:
> >
> >> Friendly ping.
> >>
> >> Xiyue Deng  writes:
> >>
> >>> Dear ports maintainers,
> >>>
> >>> I have updated msmtp to the latest version (1.8.6) in ports.  It
> >>> includes the following changes:
> >>>
> >>> * GnuTLS is recommended and deprecated OpenSSL.
> >>>   - So now GnuTLS is part of the build dependencies.
> >>>
> >>> * Use libidn2 instead of the older libidn.
> >>>   - Configure switch remains as "--with-libidn".
> >>>
> >>> * Refreshed patches to apply cleanly.
> >>>
> >>> I also have a few questions when working on this ports:
> >>>
> >>> * Many of the patches just replace "#!/usr/bin/env bash" to
> >>>   "#!/bin/sh".  Now most of scripts are changed to use "#!/usr/bin/env
> >>>   sh" which should now be the same thing.  Should we just drop those
> >>>   patches?
> >>>
> >>> * One of the patches changes the system /etc/msmtprc to provide an
> >>>   "account default" that listens on localhost:25, which will then use
> >>>   smtpd as server by default.  I think the intention is to provide a
> >>>   working configure that works out of the box.  However this may not do
> >>>   what you want because if one try to configure an account in a user
> >>>   configuration and somehow it contains errors (e.g. not properly
> >>>   provide a "from" address), msmtp will just send the mail through smtpd
> >>>   and returns OK which will result in the mail stuck in the system mail
> >>>   queue forever.  So my suggestion is to leave this file untouched so
> >>>   that the system /etc/msmtprc will just provide a fake "account
> >>>   default" and any mail not handled with a user provided account will
> >>>   fail immediately.
> >>>
> >>> Tested on mips64el/loongson on 6.6-stable.  Please let me know what you
> >>> think.  The diff is attached.
> >>>
> >>> Index: Makefile
> >>> ===
> >>> RCS file: /cvs/ports/mail/msmtp/Makefile,v
> >>> retrieving revision 1.47
> >>> diff -u -p -r1.47 Makefile
> >>> --- Makefile  12 Jul 2019 20:47:30 -  1.47
> >>> +++ Makefile  21 Dec 2019 13:54:18 -
> >>> @@ -2,27 +2,27 @@
> >>>  
> >>>  COMMENT =SMTP plugin for MUAs
> >>>  
> >>> -DISTNAME =   msmtp-1.6.6
> >>> +DISTNAME =   msmtp-1.8.6
> >>>  CATEGORIES = mail
> >>> -REVISION =   1
> >>>  
> >>>  HOMEPAGE =   https://marlam.de/msmtp/
> >>>  
> >>>  # GPLv3
> >>>  PERMIT_PACKAGE = Yes
> >>>  
> >>> -WANTLIB =  c crypto iconv idn intl ssl
> >>> +WANTLIB =  c crypto iconv idn2 intl gnutls
> >>>  
> >>>  MASTER_SITES =   https://marlam.de/msmtp/releases/
> >>>  EXTRACT_SUFX =   .tar.xz
> >>>  
> >>> -LIB_DEPENDS =devel/libidn
> >>> +LIB_DEPENDS =devel/libidn2 \
> >>> + security/gnutls
> >>>  
> >>>  SEPARATE_BUILD = Yes
> >>>  CONFIGURE_STYLE =gnu
> >>>  CONFIGURE_ARGS = --with-libgsasl=no \
> >>>   --with-libidn=yes \
> >>> - --with-tls=openssl \
> >>> + --with-tls=gnutls \
> >>>   --without-libsecret
> >>>  
> >>>  post-install:
> >>> Index: distinfo
> >>> ===
> >>> RCS file: /cvs/ports/mail/msmtp/distinfo,v
> >>> retrieving revision 1.30
> >>> diff -u -p -r1.30 distinfo
> >>> --- distinfo  26 Mar 2017 13:34:06 -  1.30
> >>> +++ distinfo  21 Dec 2019 13:54:18 -
> >>> @@ -1,2 +1,2 @@
> >>> -SHA256 (msmtp-1.6.6.tar.xz) = 
> >>> 2hXbH2K9AgH85TEK24nIYYi+kc10W3yztiuBpQHn+14=
> >>> -SIZE (msmtp-1.6.6.tar.xz) = 283744
> >>> +SHA256 (msmtp-1.8.6.tar.xz) = 
> >>> ZiXxR0MMZbqFJ/UsT+XU0zVS08D7bXk7p9+BmjswQuE=
> >>> +SIZE (msmtp-1.8.6.tar.xz) = 339732
> >>> Index: patches/patch-doc_msmtprc-system_example
> >>> ===
> >>> RCS file: /cvs/ports/mail/msmtp/patches/patch-doc_msmtprc-system_example,v
> >>> retrieving revision 1.1
> >>> diff -u -p -r1.1 patch-doc_msmtprc-system_example
> >>> --- patches/patch-doc_msmtprc-system_example  13 Feb 2009 14:59:01 
> >>> -  1.1
> >>> +++ patches/patch-doc_msmtprc-system_example  21 Dec 2019 13:54:18 
> >>> -
> >>> @@ -1,16 +1,25 @@
> >>>  $OpenBSD: patch-doc_msmtprc-system_example,v 1.1 2009/02/13 14:59:01 
> >>> pirofti Exp $
> >>>  doc/msmtprc-system.example.orig  Sat Apr  7 18:20:34 2007
> >>> -+++ doc/msmtprc-system.example   Fri Feb 13 16:53:09 2009
> >>> -@@ -6,10 +6,10 @@
> >>> +--- doc/msmtprc-system.example.orig  Thu Dec 13 00:22:06 2018
> >>>  doc/msmtprc-system.example   Sat Dec 21 01:17:17 2019
> >>> +@@ -6,15 +6,15 @@
> >>>   account default
> >>>   
> >>> - 

net/litecoin tweaks

2020-01-12 Thread Rafael Sadowski
espie pointed out two improvements/tweaks in net/litecoin, thanks espie.

- Remove debug FLAVOR, this is no longer necessary and we do not need a
  debug FLAVOR/Package.
- Add missing FLAVOR description.
- Enable no_x11 package build.

OK?

Index: Makefile
===
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1163
diff -u -p -r1.1163 Makefile
--- Makefile10 Jan 2020 17:37:35 -  1.1163
+++ Makefile12 Jan 2020 11:43:44 -
@@ -225,7 +225,7 @@
  SUBDIR += libupnp
  SUBDIR += libupnpp
  SUBDIR += libvncserver
- SUBDIR += litecoin
+ SUBDIR += litecoin,no_x11
  SUBDIR += livemedia
  SUBDIR += lldpd
  SUBDIR += lldpd,snmp
Index: litecoin/Makefile
===
RCS file: /cvs/ports/net/litecoin/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- litecoin/Makefile   2 Jan 2020 14:27:46 -   1.8
+++ litecoin/Makefile   12 Jan 2020 11:43:44 -
@@ -7,7 +7,7 @@ COMMENT =   P2P payment system
 GH_ACCOUNT =   litecoin-project
 GH_PROJECT =   litecoin
 GH_TAGNAME =   v0.17.1
-REVISION = 2
+REVISION = 3
 
 SHARED_LIBS +=  bitcoinconsensus  1.0 # 0.0
 SHARED_LIBS +=  secp256k1 0.0 # 0.0
@@ -52,12 +52,8 @@ CXXFLAGS +=  -std=c++11
 
 MAKE_FLAGS =   CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" 
CXXFLAGS="${CXXFLAGS}"
 
-FLAVORS =  no_x11 debug
+FLAVORS =  no_x11
 FLAVOR ?=
-
-.if ${FLAVOR:Mdebug}
-CONFIGURE_ARGS +=  --enable-debug
-.endif
 
 .if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS +=  --without-gui
Index: litecoin/pkg/DESCR
===
RCS file: /cvs/ports/net/litecoin/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- litecoin/pkg/DESCR  8 Mar 2019 05:52:25 -   1.1.1.1
+++ litecoin/pkg/DESCR  12 Jan 2020 11:43:44 -
@@ -11,3 +11,7 @@ the same time, on the same hardware used
 specialized ASICs for Bitcoin, Litecoin continues to satisfy these goals. It is
 unlikely for ASIC mining to be developed for Litecoin until the currency is
 widely used.
+
+Available flavors:
+
+  no_x11: Built daemon and CLI tools only, no Qt5 GUI tools
Index: litecoin/pkg/PLIST
===
RCS file: /cvs/ports/net/litecoin/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- litecoin/pkg/PLIST  8 Mar 2019 05:52:25 -   1.1.1.1
+++ litecoin/pkg/PLIST  12 Jan 2020 11:43:44 -
@@ -20,13 +20,13 @@ include/bitcoinconsensus.h
 include/secp256k1.h
 include/secp256k1_recovery.h
 include/univalue.h
-lib/libbitcoinconsensus.a
+@static-lib lib/libbitcoinconsensus.a
 lib/libbitcoinconsensus.la
 @lib lib/libbitcoinconsensus.so.${LIBbitcoinconsensus_VERSION}
-lib/libsecp256k1.a
+@static-lib lib/libsecp256k1.a
 lib/libsecp256k1.la
 @lib lib/libsecp256k1.so.${LIBsecp256k1_VERSION}
-lib/libunivalue.a
+@static-lib lib/libunivalue.a
 lib/libunivalue.la
 @lib lib/libunivalue.so.${LIBunivalue_VERSION}
 lib/pkgconfig/libbitcoinconsensus.pc



[Update] math/matio : Update to 1.5.17

2020-01-12 Thread wen heping
Hi, ports@:

   Here is a patch for math/matio to update to 1.5.17,
It build well and pass all tests on amd64-current system.
   No other ports depends on it.

Cheers,
wen
Index: Makefile
===
RCS file: /cvs/ports/math/matio/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile12 Jul 2019 20:47:42 -  1.16
+++ Makefile12 Jan 2020 12:09:20 -
@@ -2,8 +2,8 @@
 
 COMMENT=   library for reading and writing Matlab MAT files
 
-DISTNAME=  matio-1.5.9
-SHARED_LIBS=   matio   2.0  # 6.0
+DISTNAME=  matio-1.5.17
+SHARED_LIBS=   matio   2.0  # 10.2
 CATEGORIES=math
 
 HOMEPAGE=  http://sourceforge.net/projects/matio/
Index: distinfo
===
RCS file: /cvs/ports/math/matio/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo30 Dec 2016 12:12:28 -  1.5
+++ distinfo12 Jan 2020 12:09:20 -
@@ -1,2 +1,2 @@
-SHA256 (matio-1.5.9.tar.gz) = vrf5ZYMexbTvQ/iDDuHvHBIc2Y4RsPbh2YcT2fhgwFw=
-SIZE (matio-1.5.9.tar.gz) = 8520329
+SHA256 (matio-1.5.17.tar.gz) = XkVVJ9Nwqyl8Sr5aKrTVmck6x8GgyF2EHMXCL4IhxAA=
+SIZE (matio-1.5.17.tar.gz) = 10066268
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/matio/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   30 Dec 2016 12:12:28 -  1.3
+++ pkg/PLIST   12 Jan 2020 12:09:20 -
@@ -8,7 +8,9 @@ lib/libmatio.la
 lib/pkgconfig/matio.pc
 @man man/man3/Mat_Close.3
 @man man/man3/Mat_CreateVer.3
+@man man/man3/Mat_GetDir.3
 @man man/man3/Mat_GetFilename.3
+@man man/man3/Mat_GetHeader.3
 @man man/man3/Mat_GetLibraryVersion.3
 @man man/man3/Mat_GetVersion.3
 @man man/man3/Mat_Open.3
@@ -16,13 +18,17 @@ lib/pkgconfig/matio.pc
 @man man/man3/Mat_VarAddStructField.3
 @man man/man3/Mat_VarCreate.3
 @man man/man3/Mat_VarCreateStruct.3
+@man man/man3/Mat_VarDelete.3
 @man man/man3/Mat_VarFree.3
 @man man/man3/Mat_VarGetNumberOfFields.3
+@man man/man3/Mat_VarGetSize.3
 @man man/man3/Mat_VarGetStructFieldnames.3
 @man man/man3/Mat_VarGetStructs.3
 @man man/man3/Mat_VarGetStructsLinear.3
+@man man/man3/Mat_VarPrint.3
 @man man/man3/Mat_VarRead.3
 @man man/man3/Mat_VarReadInfo.3
 @man man/man3/Mat_VarReadNext.3
 @man man/man3/Mat_VarReadNextInfo.3
 @man man/man3/Mat_VarWrite.3
+@man man/man3/Mat_VarWriteAppend.3


Re: NEW: devel/64tass

2020-01-12 Thread Marcus Glocker
Thanks guys - I'll import it then :-)

On Sat, Jan 11, 2020 at 10:12:15PM +, Stuart Henderson wrote:

> I guess mglocker@ is OK with it ;-)
> 
> On 2020/01/11 21:50, Juan Francisco Cantero Hurtado wrote:
> > Works for me. Any other OK?.
> > 
> > 
> > On Fri, Jan 10, 2020 at 08:18:34PM +0100, Marcus Glocker wrote:
> > > Hi Porters,
> > > 
> > > I'm using Turbo Assembler to write some code for my C64.
> > > But it's more comfortable to write and test this is on a
> > > modern machine initially instead on the real C64 directly ...
> > > 
> > > ***
> > > 
> > > 64tass is a cross-assembler which is nearly 100% compatible with
> > > the original `Turbo Assembler', targeting the 65xx series of micro
> > > processors.  It supports most of the features of the original
> > > `Turbo Assembler Macro'.
> > > 
> > > Features:
> > > - Open source portable C with minimal dependencies.
> > > - Familiar syntax to Omicron TASS and TASM.
> > > - Supports 6502, 65C02, R65C02, W65C02, 65CE02, 65816, DTV, 65EL02,
> > >   4510.
> > > - Arbitrary-precision integers and bit strings, double precision
> > >   floating point numbers.
> > > - Character and byte strings, array arithmetic.
> > > - Handles UTF-8, UTF-16 and 8 bit RAW encoded source files, Unicode
> > >   character strings.
> > > - Supports Unicode identifiers with compatibility normalization and
> > >   optional case insensitivity.
> > > - Built-in "linker" with section support.
> > > - Various memory models, binary targets and text output formats
> > >   (also Hex/S-record).
> > > - Assembly and label listings available for debugging or exporting.
> > > - Conditional compilation, macros, structures, unions, scopes.
> > > 
> > > ***
> > > 
> > > OK?
> > > 
> > > Marcus



Re: UPDATE: mail/msmtp 1.6.6p1 -> 1.8.6

2020-01-12 Thread Xiyue Deng
Friendly ping.

Xiyue Deng  writes:

> Friendly ping.  CCing Stuart in case he's interested.
>
> Xiyue Deng  writes:
>
>> Friendly ping.
>>
>> Xiyue Deng  writes:
>>
>>> Dear ports maintainers,
>>>
>>> I have updated msmtp to the latest version (1.8.6) in ports.  It
>>> includes the following changes:
>>>
>>> * GnuTLS is recommended and deprecated OpenSSL.
>>>   - So now GnuTLS is part of the build dependencies.
>>>
>>> * Use libidn2 instead of the older libidn.
>>>   - Configure switch remains as "--with-libidn".
>>>
>>> * Refreshed patches to apply cleanly.
>>>
>>> I also have a few questions when working on this ports:
>>>
>>> * Many of the patches just replace "#!/usr/bin/env bash" to
>>>   "#!/bin/sh".  Now most of scripts are changed to use "#!/usr/bin/env
>>>   sh" which should now be the same thing.  Should we just drop those
>>>   patches?
>>>
>>> * One of the patches changes the system /etc/msmtprc to provide an
>>>   "account default" that listens on localhost:25, which will then use
>>>   smtpd as server by default.  I think the intention is to provide a
>>>   working configure that works out of the box.  However this may not do
>>>   what you want because if one try to configure an account in a user
>>>   configuration and somehow it contains errors (e.g. not properly
>>>   provide a "from" address), msmtp will just send the mail through smtpd
>>>   and returns OK which will result in the mail stuck in the system mail
>>>   queue forever.  So my suggestion is to leave this file untouched so
>>>   that the system /etc/msmtprc will just provide a fake "account
>>>   default" and any mail not handled with a user provided account will
>>>   fail immediately.
>>>
>>> Tested on mips64el/loongson on 6.6-stable.  Please let me know what you
>>> think.  The diff is attached.
>>>
>>> Index: Makefile
>>> ===
>>> RCS file: /cvs/ports/mail/msmtp/Makefile,v
>>> retrieving revision 1.47
>>> diff -u -p -r1.47 Makefile
>>> --- Makefile12 Jul 2019 20:47:30 -  1.47
>>> +++ Makefile21 Dec 2019 13:54:18 -
>>> @@ -2,27 +2,27 @@
>>>  
>>>  COMMENT =  SMTP plugin for MUAs
>>>  
>>> -DISTNAME = msmtp-1.6.6
>>> +DISTNAME = msmtp-1.8.6
>>>  CATEGORIES =   mail
>>> -REVISION = 1
>>>  
>>>  HOMEPAGE = https://marlam.de/msmtp/
>>>  
>>>  # GPLv3
>>>  PERMIT_PACKAGE =   Yes
>>>  
>>> -WANTLIB =  c crypto iconv idn intl ssl
>>> +WANTLIB =  c crypto iconv idn2 intl gnutls
>>>  
>>>  MASTER_SITES = https://marlam.de/msmtp/releases/
>>>  EXTRACT_SUFX = .tar.xz
>>>  
>>> -LIB_DEPENDS =  devel/libidn
>>> +LIB_DEPENDS =  devel/libidn2 \
>>> +   security/gnutls
>>>  
>>>  SEPARATE_BUILD =   Yes
>>>  CONFIGURE_STYLE =  gnu
>>>  CONFIGURE_ARGS =   --with-libgsasl=no \
>>> --with-libidn=yes \
>>> -   --with-tls=openssl \
>>> +   --with-tls=gnutls \
>>> --without-libsecret
>>>  
>>>  post-install:
>>> Index: distinfo
>>> ===
>>> RCS file: /cvs/ports/mail/msmtp/distinfo,v
>>> retrieving revision 1.30
>>> diff -u -p -r1.30 distinfo
>>> --- distinfo26 Mar 2017 13:34:06 -  1.30
>>> +++ distinfo21 Dec 2019 13:54:18 -
>>> @@ -1,2 +1,2 @@
>>> -SHA256 (msmtp-1.6.6.tar.xz) = 2hXbH2K9AgH85TEK24nIYYi+kc10W3yztiuBpQHn+14=
>>> -SIZE (msmtp-1.6.6.tar.xz) = 283744
>>> +SHA256 (msmtp-1.8.6.tar.xz) = ZiXxR0MMZbqFJ/UsT+XU0zVS08D7bXk7p9+BmjswQuE=
>>> +SIZE (msmtp-1.8.6.tar.xz) = 339732
>>> Index: patches/patch-doc_msmtprc-system_example
>>> ===
>>> RCS file: /cvs/ports/mail/msmtp/patches/patch-doc_msmtprc-system_example,v
>>> retrieving revision 1.1
>>> diff -u -p -r1.1 patch-doc_msmtprc-system_example
>>> --- patches/patch-doc_msmtprc-system_example13 Feb 2009 14:59:01 
>>> -  1.1
>>> +++ patches/patch-doc_msmtprc-system_example21 Dec 2019 13:54:18 
>>> -
>>> @@ -1,16 +1,25 @@
>>>  $OpenBSD: patch-doc_msmtprc-system_example,v 1.1 2009/02/13 14:59:01 
>>> pirofti Exp $
>>>  doc/msmtprc-system.example.origSat Apr  7 18:20:34 2007
>>> -+++ doc/msmtprc-system.example Fri Feb 13 16:53:09 2009
>>> -@@ -6,10 +6,10 @@
>>> +--- doc/msmtprc-system.example.origThu Dec 13 00:22:06 2018
>>>  doc/msmtprc-system.example Sat Dec 21 01:17:17 2019
>>> +@@ -6,15 +6,15 @@
>>>   account default
>>>   
>>> - # The SMTP smarthost.
>>> + # The SMTP smarthost
>>>  -host mailhub.oursite.example
>>>  +host localhost
>>>   
>>> - # Construct envelope-from addresses of the form "user@oursite.example".
>>> +-# Use TLS on port 465
>>> +-port 465
>>> +-tls on
>>> +-tls_starttls off
>>> ++## Use TLS on port 465
>>> ++#port 465
>>> ++#tls on
>>> ++#tls_starttls off
>>> + 
>>> + # Construct en

bsd.port.mk.5: Document unit for *-size targets

2020-01-12 Thread Klemens Nanni
They use `du(1) -ks' and the output looks familiar, but without further
information the line is pretty useless:

$ make show-size
106 /usr/ports/pobj/oicb-1.2.1

While here, be consistent and more specific for `show-size'.

OK?


Index: bsd.port.mk.5
===
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.524
diff -u -p -r1.524 bsd.port.mk.5
--- bsd.port.mk.5   11 Jan 2020 12:43:12 -  1.524
+++ bsd.port.mk.5   12 Jan 2020 10:50:45 -
@@ -720,7 +720,7 @@ port's variables without guessing wrongl
 Displays the information that was generated by
 .Xr build-debug-info 1 .
 .It Cm show-fake-size
-Print the size of ${WRKINST}.
+Print the size of ${WRKINST}, in kilobytes.
 Used by some options of
 .Xr dpb 1 ,
 suitable for
@@ -756,7 +756,7 @@ Exactly like
 .Cm package ,
 but affects only one single subpackage in multi-packages ports.
 .It Cm show-size
-Prints the size of the work directory.
+Prints the size of ${WRKDIR}, in kilobytes.
 Used by some options of
 .Xr dpb 1 ,
 suitable for



Re: enable column metadata in databases/sqlite3

2020-01-12 Thread Rafael Sadowski
On Sun Jan 12, 2020 at 03:05:28AM -0500, Ted Unangst wrote:
> Rafael Sadowski wrote:
> 
> >  # update p5-DBD-SQLite's Makefile.PL if enabling 
> > -DSQLITE_ENABLE_COLUMN_METADATA
> 
> and...? :)

Oh no, it was a trap. I don't want to go into the rabbit hole.



Re: enable column metadata in databases/sqlite3

2020-01-12 Thread Ted Unangst
Rafael Sadowski wrote:

>  # update p5-DBD-SQLite's Makefile.PL if enabling 
> -DSQLITE_ENABLE_COLUMN_METADATA

and...? :)