CVS: cvs.openbsd.org: ports

[Patrick Wildt]

CVSROOT:/cvs
Module name:ports
Changes by: patr...@cvs.openbsd.org 2018/02/23 00:45:07

Modified files:
sysutils/firmware/intel: Makefile 
sysutils/firmware/intel/pkg: PLIST 

Log message:
Loading the microcode earlier has apparently fixed naddy@'s issues
on the Skylake-based build servers.  Re-enable and ship the Skylake
microcode updates again.

Requested by naddy@
>From and ok sthen@

Re: [New] DiffUtilTcl

[Stuart Cassoff]

Here's the updated port.
Personally I didn't like the way the gh stuff looked at the top of the 
Makefile, but I'm starting to get used to it.

At 80 cols the line wraps like this which I'm not crazy about either but 
*shrug*.
"A Tcl extension that provides utilities for comparisons of strings, lists and
files."

Also thanks for the heads-up about GH_ * vs HOMEPAGE.

Stu

> -- Original Message --
> From: Stuart Henderson 
> Date: February 22, 2018 at 1:29 PM
> 
> 
> Please move GH_* up with DISTNAME like is done in other ports and
> Makefile.template, and drop the explicit HOMEPAGE which is nearly
> the same (except http instead of https) as the default for ports
> using GH_*.
> 
> DESCR doesn't need -w 72. Please wrap the >80 column line at the
> start but the rest is ok.
> 
> 
> 
> On 2018/02/22 12:52, Stuart Cassoff wrote:
> > Thanks for having a look!
> > 
> > Yes, the pkg/DESCR is a bit long on a few lines.
> > I ended up doing it like that on purpose in order to get nice descriptive 
> > lines that aren't chopped in awkward places; I find it reads better.
> > 
> > Compare:
> > 
> > A Tcl extension that provides utilities for comparisons of strings, lists 
> > and files.
> > 
> > The base comparison is a Longest Common Substring algorithm based on
> > J. W. Hunt and M. D. McIlroy, "An algorithm for differential file 
> > comparison,"
> > Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories (1976).
> > Available on the Web at the second author's personal site:
> > http://www.cs.dartmouth.edu/~doug/
> > 
> > It is basically an LCS diff algorithm implemented in C on top of Tcl's API,
> > thus giving full Unicode and VFS support.
> > 
> > 
> > With (fmt -w 72):
> > 
> > 
> > A Tcl extension that provides utilities for comparisons of strings,
> > lists and files.
> > 
> > The base comparison is a Longest Common Substring algorithm based on J.
> > W. Hunt and M. D. McIlroy, "An algorithm for differential file
> > comparison," Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories
> > (1976).  Available on the Web at the second author's personal site:
> > http://www.cs.dartmouth.edu/~doug/
> > 
> > It is basically an LCS diff algorithm implemented in C on top of Tcl's
> > API, thus giving full Unicode and VFS support.
> > 
> > 
> > If it's really a problem I can live with what I feel is less-than-ideal 
> > formatting.
> > 
> > 
> > Stu
> > 
> > 
> > 
> > > -- Original Message --
> > > From: Ryan Freeman 
> > > Date: February 22, 2018 at 11:58 AM
> > > 
> > > 
> > > On Tue, Feb 20, 2018 at 05:56:50PM -0500, Stuart Cassoff wrote:
> > > > > > > > -- Original Message --
> > > > > > > > From: Stuart Cassoff <3...@bell.net>
> > > > > > > > Date: December 9, 2017 at 11:27 AM
> > > > > > > > 
> > > > > > > > 
> > > > > > > > Comment:
> > > > > > > > diff functions for Tcl
> > > > > > > > 
> > > > > > > > Description:
> > > > > > > > A Tcl extension that provides utilities for comparisons of 
> > > > > > > > strings, lists and files.
> > > > > > > > 
> > > > > > > > The base comparison is a Longest Common Substring algorithm 
> > > > > > > > based on
> > > > > > > > J. W. Hunt and M. D. McIlroy, "An algorithm for differential 
> > > > > > > > file comparison,"
> > > > > > > > Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories (1976).
> > > > > > > > Available on the Web at the second author's personal site:
> > > > > > > > http://www.cs.dartmouth.edu/~doug/
> > > > > > > > 
> > > > > > > > It is basically an LCS diff algorithm implemented in C on top 
> > > > > > > > of Tcl's API,
> > > > > > > > thus giving full Unicode and VFS support.
> > > > > > > > 
> > > > > > > > 
> > > > > > > > OK?
> > > 
> > > Hey Stuart,
> > > 
> > > I use Tcl regularly so I thought I should give this a test for you.
> > > The port builds/packages fine here on amd64.  The only thing portcheck
> > > complained about was line lengths on pkg/DESCR, so a 'fmt -w 72' is
> > > needed there.
> > > 
> > > I loaded the module in tclsh8.6 interpreter and tested that I could reach
> > > the commands it provides, all seems good. 
> > > 
> > > $ tclsh8.6
> > > % package require DiffUtil
> > > 0.4.0
> > > % DiffUtil::diffFiles
> > > wrong # args: should be "DiffUtil::diffFiles ?opts? file1 file2"
> > > % DiffUtil::diffStrings
> > > wrong # args: should be "DiffUtil::diffStrings ?opts? line1 line2"
> > > 
> > > Thanks for the port!
> > > -ryan
> >


diffutiltcl-0.4.0-port.tar.gz
Description: application/gzip

Re: burp - experience and 2.1 version

[Jiri B]

On Thu, Feb 22, 2018 at 08:08:02PM -0500, Jiri B wrote:
> On Thu, Feb 22, 2018 at 12:05:00PM +, Stuart Henderson wrote:
> > On 2018/02/22 04:59, Jiri B wrote:
> > > On Thu, Feb 22, 2018 at 10:21:54AM +0100, Landry Breuil wrote:
> > > > As for the update itself, i have no opinion. You decided to use 2.1 on
> > > > your clients, you assume the choice...
> > > 
> > > Do you want to keep old stable? Should I create new 'branch'
> > > for 2.1.x or just update current port?
> > 
> > Since a client may be stuck with an old server that is difficult to get
> > updated, carrying multiple branches might be useful. And since this is
> > unlikely to be a build dep of other ports, there should be no requirement
> > to avoid a conflict between the two.
> 
> I have no idea how to solve this - no conflict, thus one could have
> old server and would like to install new client or vice-versa.
> What to do with configuration files? I have no opinion.
> 
> Anyway, here's my current diff.
> 
> - I did not touch old port, just move it and made branches
> - 2.1.28 does not need some old patches and it uses autoconf/automake
>   now
> 
> 
> (I'm still learning, so please apologize my mistakes.)

Too many mistakes, please ignore it, I'll send new one later.

Jiri

Re: burp - experience and 2.1 version

[Jiri B]

On Thu, Feb 22, 2018 at 12:05:00PM +, Stuart Henderson wrote:
> On 2018/02/22 04:59, Jiri B wrote:
> > On Thu, Feb 22, 2018 at 10:21:54AM +0100, Landry Breuil wrote:
> > > As for the update itself, i have no opinion. You decided to use 2.1 on
> > > your clients, you assume the choice...
> > 
> > Do you want to keep old stable? Should I create new 'branch'
> > for 2.1.x or just update current port?
> 
> Since a client may be stuck with an old server that is difficult to get
> updated, carrying multiple branches might be useful. And since this is
> unlikely to be a build dep of other ports, there should be no requirement
> to avoid a conflict between the two.

I have no idea how to solve this - no conflict, thus one could have
old server and would like to install new client or vice-versa.
What to do with configuration files? I have no opinion.

Anyway, here's my current diff.

- I did not touch old port, just move it and made branches
- 2.1.28 does not need some old patches and it uses autoconf/automake
  now


(I'm still learning, so please apologize my mistakes.)

Jiri

diff --git sysutils/burp/2.0/Makefile sysutils/burp/2.0/Makefile
new file mode 100644
index 000..329384ba03f
--- /dev/null
+++ sysutils/burp/2.0/Makefile
@@ -0,0 +1,13 @@
+# $OpenBSD: Makefile,v 1.3 2018/02/09 10:41:45 nigel Exp $
+
+GH_TAGNAME =   2.0.54
+REVISION = 1
+
+post-patch:
+   ${SUBST_CMD} ${WRKSRC}/src/client/monitor/status_client_ncurses.c
+
+post-install:
+   @rm -Rf ${WRKINST}/${SYSCONFDIR}/burp/autoupgrade
+   @mv ${WRKINST}/${SYSCONFDIR}/burp ${PREFIX}/share/examples/burp
+
+.include 
diff --git sysutils/burp/2.0/distinfo sysutils/burp/2.0/distinfo
new file mode 100644
index 000..8261a2d01ba
--- /dev/null
+++ sysutils/burp/2.0/distinfo
@@ -0,0 +1,2 @@
+SHA256 (burp-2.0.54.tar.bz2) = rhBHBYbx/uRVbqrls8UreM/A6sQQn0uCU8VJ5/8ADYY=
+SIZE (burp-2.0.54.tar.bz2) = 754566
diff --git sysutils/burp/2.0/patches/patch-Makefile_in 
sysutils/burp/2.0/patches/patch-Makefile_in
new file mode 100644
index 000..045e0419c45
--- /dev/null
+++ sysutils/burp/2.0/patches/patch-Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-Makefile_in,v 1.1.1.1 2017/11/03 11:31:01 landry Exp $
+
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -625,7 +625,7 @@ sbindir = @sbindir@
+ scriptdir = @scriptdir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+-sysconfdir = @sysconfdir@
++sysconfdir = @sysconfdir@/burp
+ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
diff --git sysutils/burp/2.0/patches/patch-configs_client_burp_conf_in 
sysutils/burp/2.0/patches/patch-configs_client_burp_conf_in
new file mode 100644
index 000..4b0fe24292f
--- /dev/null
+++ sysutils/burp/2.0/patches/patch-configs_client_burp_conf_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-configs_client_burp_conf_in,v 1.1.1.1 2017/11/03 11:31:01 
landry Exp $
+
+Index: configs/client/burp.conf.in
+--- configs/client/burp.conf.in.orig
 configs/client/burp.conf.in
+@@ -11,7 +11,7 @@ cname = testclient
+ # with a pseudo mirrored storage on the server and optional rsync). 2 forces
+ # protocol2 mode (inline deduplication with variable length blocks).
+ # protocol = 0
+-pidfile = @runstatedir@/burp.client.pid
++pidfile = @runstatedir@/burp/client.pid
+ syslog = 0
+ stdout = 1
+ progress_counter = 1
diff --git sysutils/burp/2.0/patches/patch-configs_server_burp_conf_in 
sysutils/burp/2.0/patches/patch-configs_server_burp_conf_in
new file mode 100644
index 000..e40588384a1
--- /dev/null
+++ sysutils/burp/2.0/patches/patch-configs_server_burp_conf_in
@@ -0,0 +1,26 @@
+$OpenBSD: patch-configs_server_burp_conf_in,v 1.1.1.1 2017/11/03 11:31:01 
landry Exp $
+
+Index: configs/server/burp.conf.in
+--- configs/server/burp.conf.in.orig
 configs/server/burp.conf.in
+@@ -22,7 +22,7 @@ clientconfdir = @sysconfdir@/clientconfdir
+ # Like many other settings, this can be set per client in the clientconfdir
+ # files.
+ # protocol = 0
+-pidfile = @runstatedir@/burp.server.pid
++pidfile = @runstatedir@/burp/server.pid
+ hardlinked_archive = 0
+ working_dir_recovery_method = delete
+ max_children = 5
+@@ -68,8 +68,9 @@ keep = 7
+ # keep = 6
+ 
+ # Run as different user/group.
+-# user=graham
+-# group=nogroup
++user=_burp
++group=_burp
++dedup_group=_burp
+ 
+ # CA options.
+ # If you want your server to be a certificate authority and generate its own
diff --git sysutils/burp/2.0/patches/patch-configs_server_timer_script 
sysutils/burp/2.0/patches/patch-configs_server_timer_script
new file mode 100644
index 000..1b1d569ea9f
--- /dev/null
+++ sysutils/burp/2.0/patches/patch-configs_server_timer_script
@@ -0,0 +1,42 @@
+$OpenBSD: patch-configs_server_timer_script,v 1.1.1.1 2017/11/03 11:31:01 
landry Exp $
+
+https://github.com/grke/burp/issues/627
+
+Index: configs/server/timer_script
+--- configs/server/timer_script.orig
 configs/server/timer_script
+@@ -77,29 +77,12 @@ 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/22 16:03:12

Added files:
lang/python/2.7/patches: patch-Modules__ssl_c 
lang/python/3.6/patches: patch-Modules__ssl_c 

Log message:
unbreak following libressl additions - we have X509_OBJECT_get0_X509,
BIO_up_ref, X509_STORE_get0_objects but not X509_NAME_ENTRY_set,
SSL_CTX_get_default_passwd_cb, X509_OBJECT_get_type,
SSL_CTX_get_default_passwd_cb_userdata, X509_STORE_get0_param,
SSL_SESSION_has_ticket, SSL_SESSION_get_ticket_lifetime_hint

while there: don't override TLS_*method with macros

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/22 14:35:11

Modified files:
lang/ruby/2.4/patches: patch-ext_openssl_openssl_missing_h 
lang/ruby/2.5/patches: patch-ext_openssl_openssl_missing_h 
Added files:
lang/ruby/2.3/patches: patch-ext_openssl_openssl_missing_h 

Log message:
quick fix for X509_STORE_set_ex_data to let this package/run; config checking
sets HAVE_X509_STORE_SET_EX_DATA though we don't actually have it yet, causing
undefined symbol when running ruby as part of "make fake" to generate docs.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/22 12:36:04

Modified files:
lang/ruby/2.4/patches: patch-ext_openssl_openssl_missing_h 
lang/ruby/2.5/patches: patch-ext_openssl_openssl_missing_h 

Log message:
unbreak, now we have DH_get0_engine()

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/22 11:49:16

Modified files:
security/py-cryptography/patches: 
  
patch-src__cffi_src_openssl_x509_vfy_py 

Log message:
const changes needed for X509_OBJECT_get0_X509

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/02/22 11:31:11

Removed files:
security/xca/patches: patch-lib_openssl_compat_h 

Log message:
remove patch, no longer needed

Re: [New] DiffUtilTcl

[Stuart Henderson]

Please move GH_* up with DISTNAME like is done in other ports and
Makefile.template, and drop the explicit HOMEPAGE which is nearly
the same (except http instead of https) as the default for ports
using GH_*.

DESCR doesn't need -w 72. Please wrap the >80 column line at the
start but the rest is ok.



On 2018/02/22 12:52, Stuart Cassoff wrote:
> Thanks for having a look!
> 
> Yes, the pkg/DESCR is a bit long on a few lines.
> I ended up doing it like that on purpose in order to get nice descriptive 
> lines that aren't chopped in awkward places; I find it reads better.
> 
> Compare:
> 
> A Tcl extension that provides utilities for comparisons of strings, lists and 
> files.
> 
> The base comparison is a Longest Common Substring algorithm based on
> J. W. Hunt and M. D. McIlroy, "An algorithm for differential file comparison,"
> Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories (1976).
> Available on the Web at the second author's personal site:
> http://www.cs.dartmouth.edu/~doug/
> 
> It is basically an LCS diff algorithm implemented in C on top of Tcl's API,
> thus giving full Unicode and VFS support.
> 
> 
> With (fmt -w 72):
> 
> 
> A Tcl extension that provides utilities for comparisons of strings,
> lists and files.
> 
> The base comparison is a Longest Common Substring algorithm based on J.
> W. Hunt and M. D. McIlroy, "An algorithm for differential file
> comparison," Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories
> (1976).  Available on the Web at the second author's personal site:
> http://www.cs.dartmouth.edu/~doug/
> 
> It is basically an LCS diff algorithm implemented in C on top of Tcl's
> API, thus giving full Unicode and VFS support.
> 
> 
> If it's really a problem I can live with what I feel is less-than-ideal 
> formatting.
> 
> 
> Stu
> 
> 
> 
> > -- Original Message --
> > From: Ryan Freeman 
> > Date: February 22, 2018 at 11:58 AM
> > 
> > 
> > On Tue, Feb 20, 2018 at 05:56:50PM -0500, Stuart Cassoff wrote:
> > > > > > > -- Original Message --
> > > > > > > From: Stuart Cassoff <3...@bell.net>
> > > > > > > Date: December 9, 2017 at 11:27 AM
> > > > > > > 
> > > > > > > 
> > > > > > > Comment:
> > > > > > > diff functions for Tcl
> > > > > > > 
> > > > > > > Description:
> > > > > > > A Tcl extension that provides utilities for comparisons of 
> > > > > > > strings, lists and files.
> > > > > > > 
> > > > > > > The base comparison is a Longest Common Substring algorithm based 
> > > > > > > on
> > > > > > > J. W. Hunt and M. D. McIlroy, "An algorithm for differential file 
> > > > > > > comparison,"
> > > > > > > Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories (1976).
> > > > > > > Available on the Web at the second author's personal site:
> > > > > > > http://www.cs.dartmouth.edu/~doug/
> > > > > > > 
> > > > > > > It is basically an LCS diff algorithm implemented in C on top of 
> > > > > > > Tcl's API,
> > > > > > > thus giving full Unicode and VFS support.
> > > > > > > 
> > > > > > > 
> > > > > > > OK?
> > 
> > Hey Stuart,
> > 
> > I use Tcl regularly so I thought I should give this a test for you.
> > The port builds/packages fine here on amd64.  The only thing portcheck
> > complained about was line lengths on pkg/DESCR, so a 'fmt -w 72' is
> > needed there.
> > 
> > I loaded the module in tclsh8.6 interpreter and tested that I could reach
> > the commands it provides, all seems good. 
> > 
> > $ tclsh8.6
> > % package require DiffUtil
> > 0.4.0
> > % DiffUtil::diffFiles
> > wrong # args: should be "DiffUtil::diffFiles ?opts? file1 file2"
> > % DiffUtil::diffStrings
> > wrong # args: should be "DiffUtil::diffStrings ?opts? line1 line2"
> > 
> > Thanks for the port!
> > -ryan
> 

Re: [New] DiffUtilTcl

[Stuart Cassoff]

Thanks for having a look!

Yes, the pkg/DESCR is a bit long on a few lines.
I ended up doing it like that on purpose in order to get nice descriptive lines 
that aren't chopped in awkward places; I find it reads better.

Compare:

A Tcl extension that provides utilities for comparisons of strings, lists and 
files.

The base comparison is a Longest Common Substring algorithm based on
J. W. Hunt and M. D. McIlroy, "An algorithm for differential file comparison,"
Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories (1976).
Available on the Web at the second author's personal site:
http://www.cs.dartmouth.edu/~doug/

It is basically an LCS diff algorithm implemented in C on top of Tcl's API,
thus giving full Unicode and VFS support.


With (fmt -w 72):


A Tcl extension that provides utilities for comparisons of strings,
lists and files.

The base comparison is a Longest Common Substring algorithm based on J.
W. Hunt and M. D. McIlroy, "An algorithm for differential file
comparison," Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories
(1976).  Available on the Web at the second author's personal site:
http://www.cs.dartmouth.edu/~doug/

It is basically an LCS diff algorithm implemented in C on top of Tcl's
API, thus giving full Unicode and VFS support.


If it's really a problem I can live with what I feel is less-than-ideal 
formatting.


Stu



> -- Original Message --
> From: Ryan Freeman 
> Date: February 22, 2018 at 11:58 AM
> 
> 
> On Tue, Feb 20, 2018 at 05:56:50PM -0500, Stuart Cassoff wrote:
> > > > > > -- Original Message --
> > > > > > From: Stuart Cassoff <3...@bell.net>
> > > > > > Date: December 9, 2017 at 11:27 AM
> > > > > > 
> > > > > > 
> > > > > > Comment:
> > > > > > diff functions for Tcl
> > > > > > 
> > > > > > Description:
> > > > > > A Tcl extension that provides utilities for comparisons of strings, 
> > > > > > lists and files.
> > > > > > 
> > > > > > The base comparison is a Longest Common Substring algorithm based on
> > > > > > J. W. Hunt and M. D. McIlroy, "An algorithm for differential file 
> > > > > > comparison,"
> > > > > > Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories (1976).
> > > > > > Available on the Web at the second author's personal site:
> > > > > > http://www.cs.dartmouth.edu/~doug/
> > > > > > 
> > > > > > It is basically an LCS diff algorithm implemented in C on top of 
> > > > > > Tcl's API,
> > > > > > thus giving full Unicode and VFS support.
> > > > > > 
> > > > > > 
> > > > > > OK?
> 
> Hey Stuart,
> 
> I use Tcl regularly so I thought I should give this a test for you.
> The port builds/packages fine here on amd64.  The only thing portcheck
> complained about was line lengths on pkg/DESCR, so a 'fmt -w 72' is
> needed there.
> 
> I loaded the module in tclsh8.6 interpreter and tested that I could reach
> the commands it provides, all seems good. 
> 
> $ tclsh8.6
> % package require DiffUtil
> 0.4.0
> % DiffUtil::diffFiles
> wrong # args: should be "DiffUtil::diffFiles ?opts? file1 file2"
> % DiffUtil::diffStrings
> wrong # args: should be "DiffUtil::diffStrings ?opts? line1 line2"
> 
> Thanks for the port!
> -ryan

Re: [New] DiffUtilTcl

[Ryan Freeman]

On Tue, Feb 20, 2018 at 05:56:50PM -0500, Stuart Cassoff wrote:
> > > > > -- Original Message --
> > > > > From: Stuart Cassoff <3...@bell.net>
> > > > > Date: December 9, 2017 at 11:27 AM
> > > > > 
> > > > > 
> > > > > Comment:
> > > > > diff functions for Tcl
> > > > > 
> > > > > Description:
> > > > > A Tcl extension that provides utilities for comparisons of strings, 
> > > > > lists and files.
> > > > > 
> > > > > The base comparison is a Longest Common Substring algorithm based on
> > > > > J. W. Hunt and M. D. McIlroy, "An algorithm for differential file 
> > > > > comparison,"
> > > > > Comp. Sci. Tech. Rep. #41, Bell Telephone Laboratories (1976).
> > > > > Available on the Web at the second author's personal site:
> > > > > http://www.cs.dartmouth.edu/~doug/
> > > > > 
> > > > > It is basically an LCS diff algorithm implemented in C on top of 
> > > > > Tcl's API,
> > > > > thus giving full Unicode and VFS support.
> > > > > 
> > > > > 
> > > > > OK?

Hey Stuart,

I use Tcl regularly so I thought I should give this a test for you.
The port builds/packages fine here on amd64.  The only thing portcheck
complained about was line lengths on pkg/DESCR, so a 'fmt -w 72' is
needed there.

I loaded the module in tclsh8.6 interpreter and tested that I could reach
the commands it provides, all seems good. 

$ tclsh8.6
% package require DiffUtil
0.4.0
% DiffUtil::diffFiles
wrong # args: should be "DiffUtil::diffFiles ?opts? file1 file2"
% DiffUtil::diffStrings
wrong # args: should be "DiffUtil::diffStrings ?opts? line1 line2"

Thanks for the port!
-ryan

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2018/02/22 09:51:50

Modified files:
sysutils/ranger: Makefile distinfo 
sysutils/ranger/patches: patch-doc_ranger_1 
 patch-ranger_ext_img_display_py 
sysutils/ranger/pkg: PLIST 
Removed files:
sysutils/ranger/patches: patch-Makefile 
 patch-ranger_data_scope_sh 
 patch-setup_py 

Log message:
Update to ranger 1.9.1, take MAINTAINER

OK sthen

Re: UPDATE: sysutils/ranger 1.7.2 -> 1.9.1

[Klemens Nanni]

On Fri, Feb 02, 2018 at 06:38:52PM +0100, Klemens Nanni wrote:
> On Thu, Jan 25, 2018 at 04:07:21AM +0100, Klemens Nanni wrote:
> > On Wed, Jan 24, 2018 at 10:10:55PM +0100, Rafael Sadowski wrote:
> > > On Tue Jan 23, 2018 at 12:43:36AM +0100, Klemens Nanni wrote:
> > > > +
> > > >  # libarchive (bsdtar) used as an alternative to atool; see scope.sh 
> > > > patch
> > > >  RUN_DEPENDS =  archivers/libarchive \
> > > > -   textproc/py-chardet
> > > > +   devel/desktop-file-utils \
> > > 
> > > [...]
> > > 
> > > > +@exec %D/bin/update-desktop-database
> > > > +@unexec-delete %D/bin/update-desktop-database
> > > > 
> > > 
> > > Please don't pull that in for a console file manager.
> > Those came in for completeness (portcheck also complains without them)
> > but I can see why one would rather ignore it.
> > 
> > Updated diff below.
> 1.9.0 is out, updated diff below. Things keep working fine.
> 
> All tests except the new linting ones fail, this is because devel/pylint
> and devel/py-astroid are (heavily) outdated. I have a proper, working
> diff for astroid now pylint fails even harder.
> 
> I contacted the maintainer of those two ports, we'll see.
> 
> Since this is a temporary issue concerning only some of the tests,
> here's ranger-1.9.0 I'd really like to get in.
> 
> Add bash as missing RDEP due to the scope.sh script using bashims.
> 
> patch-setup_py moved into simpler post-install.
> 
> We can drop the s,grep,ggrep, as it works without, I already contacted
> upstream about the newly introduced issue with find(1)'s non-POSIX `-not'
> usage.
Updated diff below for 1.9.1 from today. My Makefile patch got merged
upstream so drop it.

Ranger works for me and all tests pass except for the new pylint ones
that require a pylint update (in my queue).

OK?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/ranger/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile11 Jun 2017 09:02:43 -  1.6
+++ Makefile22 Feb 2018 15:53:40 -
@@ -2,13 +2,14 @@
 
 COMMENT =  minimalistic console file manager
 
-MODPY_EGG_VERSION = 1.7.2
+MODPY_EGG_VERSION =1.9.1
 DISTNAME = ranger-${MODPY_EGG_VERSION}
-REVISION = 0
 
 CATEGORIES =   sysutils misc
 
-HOMEPAGE = http://www.nongnu.org/ranger/
+HOMEPAGE = https://ranger.github.io/
+
+MAINTAINER =   Klemens Nanni 
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM =  Yes
@@ -16,18 +17,29 @@ PERMIT_PACKAGE_CDROM =   Yes
 MASTER_SITES = ${HOMEPAGE}
 
 MODULES =  lang/python
-# libarchive (bsdtar) used as an alternative to atool; see scope.sh patch
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+
+# libarchive (bsdtar) used as an alternative to atool
 RUN_DEPENDS =  archivers/libarchive \
-   textproc/py-chardet
+   shells/bash \
+   textproc/py-chardet${MODPY_FLAVOR}
+TEST_DEPENDS = devel/flake8 \
+   devel/pylint${MODPY_FLAVOR} \
+   devel/py-test${MODPY_FLAVOR}
 
-TEST_DEPENDS = devel/gmake \
-   sysutils/ggrep
+TEST_ENV = PYTHON=${MODPY_BIN}
 
 pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/doc/ranger.1 \
-   ${WRKSRC}/ranger/ext/img_display.py
+   ${SUBST_CMD} ${WRKSRC}/{doc/ranger.1,ranger/ext/img_display.py}
 
-do-test:
-   cd ${WRKSRC}; PYTHON=${MODPY_BIN} gmake test
+pre-test:
+.for _p in py.test pylint
+   ln -sf ${LOCALBASE}/bin/${_p}${MODPY_BIN_SUFFIX} \
+   ${WRKDIR}/bin/${_p}
+.endfor
+
+post-install:
+   mv ${PREFIX}/{share/man/man1,man}
+   mv ${PREFIX}/share/{doc/ranger/examples,examples/ranger}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ranger/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo19 Nov 2015 19:13:35 -  1.3
+++ distinfo22 Feb 2018 15:53:40 -
@@ -1,2 +1,2 @@
-SHA256 (ranger-1.7.2.tar.gz) = lPbjQtruREXxXbWnRAoRE4SHxJzCXaDEc7vxuJePW3k=
-SIZE (ranger-1.7.2.tar.gz) = 269713
+SHA256 (ranger-1.9.1.tar.gz) = QEEbDdCLCr0mMjmXUbERNZeGrl8ebfBH9JZTy3qe39I=
+SIZE (ranger-1.9.1.tar.gz) = 245872
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile  19 Nov 2015 19:13:35 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2015/11/19 19:13:35 jasper Exp $
 Makefile.orig  Sun Oct  4 01:46:45 2015
-+++ Makefile   Thu Nov 19 20:09:28 2015
-@@ -61,7 +61,7 @@ doc: cleandoc
-   find . -name \*.html -exec sed -i 's|'"$(CWD)"'|../..|g' -- {} \;
- 
- test:
--  @for FILE in $(shell grep -IHm 1 doctest -r ranger | grep $(FILTER) | 
cut -d: -f1); do \
-+  @for FILE in $(shell ggrep -IHm 1 doctest -r ranger | grep $(FILTER) | 
cut -d: -f1); do \
-   echo 

Re: UPDATE fonts/junicode

[George Rosamond]

Bryan Linton:
> On 2018-02-19 16:13:00, George Rosamond  wrote:
>> George Rosamond:
>>> portroach seems to have missed the jump from 0.7.8 to 1.001, which also
>>> simplifies the Makefile a bit. https only works for sourceforge.net but
>>> not subdomains.
>>>
>>
>> ping.
>>
> 
> patch(1) wasn't able to find[1] pkg/PLIST and prompted me to enter it
> manually.  Could this possibly be because of the double slashes
> between "junicode" and "pkg"?  

Fixed.  Thanks.

Index: Makefile
===
RCS file: /cvs/ports/fonts/junicode/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile25 Sep 2015 12:50:08 -  1.2
+++ Makefile22 Feb 2018 15:17:47 -
@@ -3,9 +3,7 @@
 PKG_ARCH = *

 COMMENT =  advanced Unicode font for medievalists
-DISTNAME = junicode-0-7-8
-PKGNAME =  junicode-0.7.8
-REVISION = 0
+DISTNAME = junicode-1.001
 EXTRACT_SUFX = .zip
 CATEGORIES =   fonts

@@ -20,14 +18,12 @@ MASTER_SITES =  ${MASTER_SITE_SOURCEFORG
 NO_BUILD = Yes
 NO_TEST =  Yes

-WRKDIST =  ${WRKDIR}/junicode
 FONTDIR =  ${PREFIX}/share/fonts/junicode
 DOCDIR =   ${PREFIX}/share/doc/junicode

 do-install:
${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR}
-   ${INSTALL_DATA} ${WRKDIST}/fonts/*.ttf ${FONTDIR}
-   ${INSTALL_DATA} ${WRKDIST}/doc/* ${DOCDIR}
-   ${INSTALL_DATA} ${WRKDIST}/util/* ${DOCDIR}
+   ${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTDIR}
+   ${INSTALL_DATA} ${WRKDIR}/doc/* ${DOCDIR}

 .include 
Index: distinfo
===
RCS file: /cvs/ports/fonts/junicode/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo28 Aug 2015 17:51:18 -  1.1.1.1
+++ distinfo22 Feb 2018 15:17:47 -
@@ -1,2 +1,2 @@
-SHA256 (junicode-0-7-8.zip) = dCfDKpOD3RzkhdIC9HZ7O6p51Orjp0uP8qEMLYqE89E=
-SIZE (junicode-0-7-8.zip) = 1640500
+SHA256 (junicode-1.001.zip) = ZBKCKWeND+GubyiXUzkyARr3383uuk0RSORajG5DmVM=
+SIZE (junicode-1.001.zip) = 1463324
Index: pkg/PLIST
===
RCS file: /cvs/ports/fonts/junicode/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   28 Aug 2015 17:51:18 -  1.1.1.1
+++ pkg/PLIST   22 Feb 2018 15:17:47 -
@@ -1,14 +1,11 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2015/08/28 17:51:18 jca Exp $
 share/doc/junicode/
 share/doc/junicode/Junicode.pdf
-share/doc/junicode/Junicode.tex
 share/doc/junicode/aelfric_job.pdf
-share/doc/junicode/aelfric_job.tex
 share/doc/junicode/homer_sample.pdf
-share/doc/junicode/homer_sample.tex
-share/doc/junicode/mt-Junicode.cfg
 share/fonts/
 @fontdir share/fonts/junicode/
+share/fonts/junicode/FoulisGreek.ttf
 share/fonts/junicode/Junicode-Bold.ttf
 share/fonts/junicode/Junicode-BoldItalic.ttf
 share/fonts/junicode/Junicode-Italic.ttf

Re: UPDATE fonts/junicode

[Bryan Linton]

On 2018-02-19 16:13:00, George Rosamond  wrote:
> George Rosamond:
> > portroach seems to have missed the jump from 0.7.8 to 1.001, which also
> > simplifies the Makefile a bit. https only works for sourceforge.net but
> > not subdomains.
> > 
> 
> ping.
> 

patch(1) wasn't able to find[1] pkg/PLIST and prompted me to enter it
manually.  Could this possibly be because of the double slashes
between "junicode" and "pkg"?  

---8<---
   VV
> > Index: junicode//Makefile
> > ===
   VV
> > Index: junicode//distinfo
> > ===
   VV
> > Index: junicode//pkg/PLIST
> > ===

---8<---

Other than that, after manually entering the path, everything seems
to work fine when I set Firefox's default font to junicode and go
to the test page here: http://junicode.sourceforge.net/juntest.html


[1]

% patch < ~/patches/junicode-1.001.diff 
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|portroach seems to have missed the jump from 0.7.8 to 1.001, which also
|simplifies the Makefile a bit. https only works for sourceforge.net but
|not subdomains.
|
|Index: junicode//Makefile
|===
|RCS file: /cvs/ports/fonts/junicode/Makefile,v
|retrieving revision 1.2
|diff -u -p -r1.2 Makefile
|--- junicode//Makefile 25 Sep 2015 12:50:08 -  1.2
|+++ junicode//Makefile 13 Feb 2018 20:16:32 -
--
Patching file Makefile using Plan A...
Hunk #1 succeeded at 3.
Hunk #2 succeeded at 18.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--
|Index: junicode//distinfo
|===
|RCS file: /cvs/ports/fonts/junicode/distinfo,v
|retrieving revision 1.1.1.1
|diff -u -p -r1.1.1.1 distinfo
|--- junicode//distinfo 28 Aug 2015 17:51:18 -  1.1.1.1
|+++ junicode//distinfo 13 Feb 2018 20:16:32 -
--
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--
|Index: junicode//pkg/PLIST
|===
|RCS file: /cvs/ports/fonts/junicode/pkg/PLIST,v
|retrieving revision 1.1.1.1
|diff -u -p -r1.1.1.1 PLIST
|--- junicode//pkg/PLIST28 Aug 2015 17:51:18 -
1.1.1.1
|+++ junicode//pkg/PLIST13 Feb 2018 20:16:32 -
--
File to patch: pkg/PLIST
Patching file pkg/PLIST using Plan A...
Hunk #1 succeeded at 1.
Hmm...  Ignoring the trailing garbage.
done

-- 
Bryan

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/22 06:59:09

Modified files:
x11/gnome  : gnome.port.mk 

Log message:
Better comment.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/22 06:57:47

Modified files:
devel/meson: Makefile distinfo meson.port.mk 
devel/meson/patches: patch-mesonbuild_backend_ninjabackend_py 
 patch-mesonbuild_mesonlib_py 

Log message:
Update to meson-0.44.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/22 05:53:31

Modified files:
x11/gnome/libgepub: Makefile 
x11/gnome/devhelp: Makefile 

Log message:
Fix comment.

Re: burp - experience and 2.1 version

[Stuart Henderson]

On 2018/02/22 04:59, Jiri B wrote:
> On Thu, Feb 22, 2018 at 10:21:54AM +0100, Landry Breuil wrote:
> > As for the update itself, i have no opinion. You decided to use 2.1 on
> > your clients, you assume the choice...
> 
> Do you want to keep old stable? Should I create new 'branch'
> for 2.1.x or just update current port?

Since a client may be stuck with an old server that is difficult to get
updated, carrying multiple branches might be useful. And since this is
unlikely to be a build dep of other ports, there should be no requirement
to avoid a conflict between the two.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/22 04:05:38

Modified files:
www/owncloud   : Tag: OPENBSD_6_2 Makefile distinfo 
www/owncloud/patches: Tag: OPENBSD_6_2 patch-version_php 

Log message:
Update to owncloud-10.0.7.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/02/22 04:03:30

Modified files:
www/owncloud   : Makefile distinfo 
www/owncloud/patches: patch-version_php 

Log message:
Update to owncloud-10.0.7.

UPDATE net/qsynctray

[Björn Ketelaars]

Enclosed a diff for bringing net/qsyncthingtray to 0.5.8, which fixes
some bugs. Passed diff (+ diff for net/syncthing) to edd@ (MAINTAINER)
who replied with "They are good to be committed. And are OK awolk@.
Please go ahead."

OK?


Index: Makefile
===
RCS file: /cvs/ports/net/qsyncthingtray/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile30 Jul 2017 14:54:28 -  1.5
+++ Makefile15 Feb 2018 20:07:09 -
@@ -4,9 +4,8 @@ COMMENT =   system tray app for Syncthing
 
 GH_ACCOUNT =   sieren
 GH_PROJECT =   QSyncthingTray
-GH_TAGNAME =   0.5.5rc1
+GH_TAGNAME =   0.5.8
 PKGNAME =  qsyncthingtray-${GH_TAGNAME}
-REVISION = 2
 
 CATEGORIES =   net x11
 HOMEPAGE = https://github.com/sieren/QSyncthingTray
Index: distinfo
===
RCS file: /cvs/ports/net/qsyncthingtray/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo17 Nov 2016 14:16:28 -  1.2
+++ distinfo15 Feb 2018 20:07:09 -
@@ -1,2 +1,2 @@
-SHA256 (QSyncthingTray-0.5.5rc1.tar.gz) = 
ekh1IP/RfI+7groisSjGkn44RDasKB2G1PGJoLDauzw=
-SIZE (QSyncthingTray-0.5.5rc1.tar.gz) = 11079327
+SHA256 (QSyncthingTray-0.5.8.tar.gz) = 
/0KKxaCeXfe949cQRAYt4QSmyxeikYrjFwYfWtE5RIA=
+SIZE (QSyncthingTray-0.5.8.tar.gz) = 11132689

UPDATE net/syncthing

[Björn Ketelaars]

Please find enclosed a diff for bringing net/syncthing to the latest
version. Passed diff to edd@ (MAINTAINER) whoe replied with "They are
good to be committed. And are OK awolk@. Please go ahead."

OK?


Index: Makefile
===
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile5 Feb 2018 11:53:03 -   1.19
+++ Makefile15 Feb 2018 20:08:00 -
@@ -2,7 +2,7 @@
 
 COMMENT =  open decentralized synchronization utility
 
-V =0.14.43
+V =0.14.44
 DISTNAME = syncthing-${V}
 DISTFILES =syncthing-source-v${V}${EXTRACT_SUFX}
 
Index: distinfo
===
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo5 Feb 2018 11:53:03 -   1.12
+++ distinfo15 Feb 2018 20:08:00 -
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.14.43.tar.gz) = 
uwJQ4Lr85pCozj9D8KuDSYdKwcjzzcIk7V0BEAmbvZw=
-SIZE (syncthing-source-v0.14.43.tar.gz) = 9762513
+SHA256 (syncthing-source-v0.14.44.tar.gz) = 
ITbve97DBfAf2ee96S2QS7khXh5jKHA7EqmAFbgouDs=
+SIZE (syncthing-source-v0.14.44.tar.gz) = 10447240
Index: patches/patch-build_go
===
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.5
diff -u -p -r1.5 patch-build_go
--- patches/patch-build_go  5 Feb 2018 11:53:03 -   1.5
+++ patches/patch-build_go  15 Feb 2018 20:08:00 -
@@ -2,21 +2,12 @@ $OpenBSD: patch-build_go,v 1.5 2018/02/0
 Index: build.go
 --- build.go.orig
 +++ build.go
-@@ -419,7 +419,7 @@ func install(target target, tags []string) {
-   log.Fatal(err)
-   }
-   os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
--  args := []string{"install", "-v", "-ldflags", ldflags()}
-+  args := []string{"install", "-v", "-x", "-ldflags", ldflags()}
-   if pkgdir != "" {
-   args = append(args, "-pkgdir", pkgdir)
-   }
-@@ -445,7 +445,7 @@ func build(target target, tags []string) {
-   tags = append(target.tags, tags...)
+@@ -461,7 +461,7 @@ func appendParameters(args []string, tags []string, ta
  
-   rmr(target.BinaryName())
--  args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
-+  args := []string{"build", "-i", "-v", "-x", "-ldflags", ldflags()}
-   if pkgdir != "" {
-   args = append(args, "-pkgdir", pkgdir)
-   }
+   if !debugBinary {
+   // Regular binaries get version tagged and skip some debug 
symbols
+-  args = append(args, "-ldflags", ldflags())
++  args = append(args, "-x", "-ldflags", ldflags())
+   } else {
+   // -gcflags to disable optimizations and inlining. Skip -ldflags
+   // because `Could not launch program: decoding dwarf section 
info at

Re: burp - experience and 2.1 version

[Jiri B]

On Thu, Feb 22, 2018 at 10:21:54AM +0100, Landry Breuil wrote:
> As for the update itself, i have no opinion. You decided to use 2.1 on
> your clients, you assume the choice...

Do you want to keep old stable? Should I create new 'branch'
for 2.1.x or just update current port?

Jiri

Re: burp - experience and 2.1 version

[Landry Breuil]

On Thu, Feb 22, 2018 at 04:07:37AM -0500, Jiri B wrote:
> On Thu, Feb 22, 2018 at 08:20:15AM +0100, Landry Breuil wrote:
> > The 2.1 branch was only declared stable recently, and this discussion
> > already happened in https://marc.info/?t=15181794432=1=2
> > 
> > Landry
> 
> I'll send my diff for update the port because of this issue:
> https://github.com/grke/burp/issues/691
> 
> Is it worth to make it as "static" binary?

You can try making it a flavor, but given that burp uses a bunch of
external scripts and *wants* a config file, you'll need more than just
the binary to run it from single user.

As for the update itself, i have no opinion. You decided to use 2.1 on
your clients, you assume the choice...

Landry

Re: burp - experience and 2.1 version

[Jiri B]

On Thu, Feb 22, 2018 at 08:20:15AM +0100, Landry Breuil wrote:
> The 2.1 branch was only declared stable recently, and this discussion
> already happened in https://marc.info/?t=15181794432=1=2
> 
> Landry

I'll send my diff for update the port because of this issue:
https://github.com/grke/burp/issues/691

Is it worth to make it as "static" binary?

I finished my burp/WinPE quick test and I'm thinking to have
burp either on ramdisk or downloadable via NFS and using it
inside ramdisk env for disaster recovery.

Jiri

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2018/02/22 01:49:54

Modified files:
misc/rpm   : Makefile 

Log message:
fix MASTER_SITES

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2018/02/22 01:12:20

Modified files:
sysutils/logstalgia: Makefile distinfo 
sysutils/logstalgia/patches: patch-src_logstalgia_cpp 

Log message:
Update for Logstalgia to 1.1.1

OK benoit@