Re: PORTS_PRIVSEP=Yes and doas install

2020-03-25 Thread Kurt Mosiejczuk
On Thu, Mar 26, 2020 at 03:14:18AM +, Lucas wrote:
> Kurt Mosiejczuk  wrote:
> > Did you just try typing "make install"?

> Yes, that was all I ran. If you read the whole email, you will see
> the doas install in the subject refers to /usr/bin/install and not a
> "typo" of sorts for doas make install, which is, I assume, what you
> think I did.

I did read the whole email. You never explicitly said what command you
were running. There was a whole bunch of rambling information that made
it hard to pin down what problem you were having. I have come across the
mistake of folks saying "doas make install" and not understanding why
their doas.conf didn't work. I figured I'd mention it and save you any
further headache if that was the mistake you'd made.

--Kurt



UPDATE: net/prosody 0.11.5

2020-03-25 Thread Lucas
Hello ports@,

Find a update for prosody-0.11.5. Release notes are small:

 * prosody / mod_posix: Support for command-line flags to override
   daemonize config option
 * mod_websocket: Clear mask bit when reflecting ping frames

The bullet is the responsible for the changes in prosody.rc.

daemonize is removed from the configuration file as it'll be deprecated
in 0.12, according to [0].

Currently deployed and working in my server, new rc script works. Had
to rm /var/run/rc.d/prosody first for changes to be picked up tho. Any
clues?

-Lucas

[0]: https://prosody.im/doc/modules/mod_posix


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.56 2020/03/15 19:04:25 solene Exp $
 
 COMMENT=   communications server for Jabber/XMPP written in Lua
-DISTNAME=  prosody-0.11.4
+DISTNAME=  prosody-0.11.5
 CATEGORIES=net
 MASTER_SITES=  https://prosody.im/downloads/source/
 
Index: distinfo
===
RCS file: /home/cvs/ports/net/prosody/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -1,2 +1,2 @@
-SHA256 (prosody-0.11.4.tar.gz) = tfJvo0PH8y9iQnIdaZHLNfXSoo0r9Z0rwympQFI3BP0=
-SIZE (prosody-0.11.4.tar.gz) = 423518
+SHA256 (prosody-0.11.5.tar.gz) = Vfi9ZdXSr2HMc5vWFk5CBwEeDS0mDN5YMHHJDY2FQIs=
+SIZE (prosody-0.11.5.tar.gz) = 425122
Index: patches/patch-prosody_cfg_lua_dist
===
RCS file: /home/cvs/ports/net/prosody/patches/patch-prosody_cfg_lua_dist,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-prosody_cfg_lua_dist
--- patches/patch-prosody_cfg_lua_dist  7 Feb 2019 19:23:39 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-prosody_cfg_lua_dist,v 1
 Index: prosody.cfg.lua.dist
 --- prosody.cfg.lua.dist.orig
 +++ prosody.cfg.lua.dist
-@@ -23,6 +23,14 @@
+@@ -23,6 +23,13 @@
  -- Example: admins = { "us...@example.com", "us...@example.net" }
  admins = { }
  
@@ -11,13 +11,12 @@ Index: prosody.cfg.lua.dist
 +prosody_group = "_prosody"
 +
 +-- Enable POSIX-only options
-+daemonize = true
 +pidfile = "/var/prosody/prosody.pid"
 +
  -- Enable use of libevent for better performance under high load
  -- For more information see: https://prosody.im/doc/libevent
  --use_libevent = true
-@@ -153,8 +161,8 @@ archive_expires_after = "1w" -- Remove archived messag
+@@ -153,8 +160,8 @@ archive_expires_after = "1w" -- Remove archived messag
  -- Logging configuration
  -- For advanced logging see https://prosody.im/doc/logging
  log = {
Index: patches/patch-util-src_pposix_c
===
RCS file: patches/patch-util-src_pposix_c
diff -N patches/patch-util-src_pposix_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-util-src_pposix_c 15 Feb 2020 17:12:50 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Define _BSD_SOURCE to make initgroups(3) visible
+
+Index: util-src/pposix.c
+--- util-src/pposix.c.orig
 util-src/pposix.c
+@@ -33,6 +33,11 @@
+ #ifndef _POSIX_C_SOURCE
+ #define _POSIX_C_SOURCE 200809L
+ #endif
++#if defined(__OpenBSD__)
++#ifndef _BSD_SOURCE
++#define _BSD_SOURCE
++#endif
++#endif
+ 
+ #include 
+ #include 
Index: pkg/prosody.rc
===
RCS file: /home/cvs/ports/net/prosody/pkg/prosody.rc,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 prosody.rc
--- pkg/prosody.rc  11 Jan 2018 19:27:07 -  1.4
+++ pkg/prosody.rc  26 Mar 2020 02:49:42 -
@@ -2,22 +2,19 @@
 #
 # $OpenBSD: prosody.rc,v 1.4 2018/01/11 19:27:07 rpe Exp $
 
-daemon="${TRUEPREFIX}/sbin/prosodyctl"
-daemon_flags="start"
+daemon="${TRUEPREFIX}/sbin/prosody"
+daemon_flags="-D"
 daemon_user="_prosody"
 
 . /etc/rc.d/rc.subr
 
-rc_reload=NO
+pexp="$(eval echo ${MODLUA_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}})"
+
 rc_usercheck=NO
 
 rc_check() {
# return 1 is needed: prosodyctl returns a higher error code on failure
${TRUEPREFIX}/sbin/prosodyctl status || return 1
-}
-
-rc_stop() {
-   ${TRUEPREFIX}/sbin/prosodyctl stop
 }
 
 rc_cmd $1



Re: PORTS_PRIVSEP=Yes and doas install

2020-03-25 Thread Lucas
Here is patch for the proposed approach. It's two attachments actually,
one for src and one for ports. I think I didn't miss any documentation
spot and did a test build of just one package, but I didn't do a bulk
nor any other stress test.

You can also find attached the script output of said test build. make
update-plist failure seems to be related to a missing bit of
configuration I haven't been able to debug yet (PORTSDIR gets picked
up as /usr/ports instead of /home/cvs/ports).

-Lucas

Index: share/man/man1/dpb.1
===
RCS file: /home/cvs/src/share/man/man1/dpb.1,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 dpb.1
--- share/man/man1/dpb.17 Nov 2019 16:26:07 -   1.19
+++ share/man/man1/dpb.126 Mar 2020 01:13:12 -
@@ -101,6 +101,7 @@ on each machine (shared through NFS or c
 .Pp
 Some directories must be shared:
 .Ev PACKAGE_REPOSITORY ,
+.Ev CACHE_REPOSITORY ,
 .Ev DISTDIR ,
 and
 .Ev PLIST_REPOSITORY .
@@ -935,7 +936,8 @@ It does not need network access.
 .It
 .Ar FETCH_USER
 is used to fetch distfiles and handle corresponding log info.
-It needs write access to ${DISTDIR}, and network access.
+It needs write access to ${DISTDIR}, and ${CACHE_REPOSITORY}.
+It does require network access.
 Thus,
 .Xr ftp 1
 does not happen as root.
Index: share/man/man1/proot.1
===
RCS file: /home/cvs/src/share/man/man1/proot.1,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 proot.1
--- share/man/man1/proot.1  19 Dec 2019 09:38:03 -  1.7
+++ share/man/man1/proot.1  26 Mar 2020 01:30:52 -
@@ -172,6 +172,7 @@ Who to write log as (defaults to
 .It Cm PORTSDIR
 .It Cm DISTDIR
 .It Cm PACKAGE_REPOSITORY
+.It Cm CACHE_REPOSITORY
 .It Cm PLIST_REPOSITORY
 .It Cm LOCKDIR
 .It Cm WRKOBJDIR
@@ -226,7 +227,7 @@ directory containing the base sets.
 All the ports specific sub directories if they are defined,
 namely
 .Cm DISTDIR , WRKOBJDIR , LOGDIR , PACKAGE_REPOSITORY , PLIST_REPOSITORY ,
-.Cm LOCKDIR .
+.Cm LOCKDIR , CACHE_REPOSITORY .
 .It
 The
 .Cm PORTSDIR
@@ -255,6 +256,7 @@ LOCKDIR=/tmp/locks
 PLIST_REPOSITORY=/data/plist
 DISTDIR=/data/distfiles
 PACKAGE_REPOSITORY=/data/packages
+CACHE_REPOSITORY=/data/pcache
 actions=unpopulate_light
copy_ports
 .Ed
Index: share/man/man5/bsd.port.mk.5
===
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.527
diff -u -p -u -p -r1.527 bsd.port.mk.5
--- share/man/man5/bsd.port.mk.56 Mar 2020 15:22:44 -   1.527
+++ share/man/man5/bsd.port.mk.526 Mar 2020 01:31:01 -
@@ -1763,7 +1763,7 @@ Instruct the
 .Cm package
 target to download packages missing from the repository from locations in
 ${PKG_PATH} and place them into
-.Pa ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/cache/ ,
+.Pa ${CACHE_REPOSITORY}/${MACHINE_ARCH}/cache ,
 only building them if no suitable packages are found.
 For instance,
 .Bd -literal -offset indent
@@ -2271,6 +2271,11 @@ Defaults to
 See
 .Cm package
 for details.
+.It Ev CACHE_REPOSITORY
+User settings.
+Location for packages retrieved through the network.
+Defaults to
+.Pa ${PORTSDIR}/pcache .
 .It Ev PARALLEL_MAKE_FLAGS
 Used when
 .Ev DPB_PROPERTIES
@@ -2529,7 +2534,7 @@ must be able to write into
 and
 .Ev FETCH_USER
 must be able to write into
-.Pa ${DISTDIR} .
+.Pa ${DISTDIR} , ${CACHE_REPOSITORY}.
 The directories and permissions can be set correctly using
 .Cm fix-permissions .
 .Pp
@@ -3606,7 +3611,7 @@ Default setup of ${PACKAGE_REPOSITORY}.
 Location of arch-independent packages.
 .It Pa ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all
 Location of all built packages.
-.It Pa ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/cache
+.It Pa ${CACHE_REPOSITORY}/${MACHINE_ARCH}/cache
 Location of packages retrieved through the network.
 .It Pa ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/cksums
 Location of checksums, see
Index: share/man/man7/ports.7
===
RCS file: /home/cvs/src/share/man/man7/ports.7,v
retrieving revision 1.127
diff -u -p -u -p -r1.127 ports.7
--- share/man/man7/ports.7  16 Jun 2019 14:24:42 -  1.127
+++ share/man/man7/ports.7  26 Mar 2020 01:17:16 -
@@ -637,6 +637,7 @@ distfiles repository, and the built pack
 Set
 .Ev WRKOBJDIR ,
 .Ev PACKAGE_REPOSITORY ,
+.Ev CACHE_REPOSITORY ,
 .Ev BULK_COOKIES_DIR ,
 .Ev UPDATE_COOKIES_DIR ,
 .Ev DISTDIR ,
Index: share/man/man8/bulk.8
===
RCS file: /home/cvs/src/share/man/man8/bulk.8,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 bulk.8
--- share/man/man8/bulk.8   27 Jun 2019 17:29:16 -  1.5
+++ share/man/man8/bulk.8   26 Mar 2020 01:18:32 -
@@ -108,8 +108,8 @@ relies on it.
 .Ss 2. Setup chrooted builds on the master
 Populate the initial chroot with
 .Xr proot 1 .
-Po

Re: PORTS_PRIVSEP=Yes and doas install

2020-03-25 Thread Lucas
Kurt Mosiejczuk  wrote:
> Did you just try typing "make install"?

Yes, that was all I ran. If you read the whole email, you will see the
doas install in the subject refers to /usr/bin/install and not a "typo"
of sorts for doas make install, which is, I assume, what you think I
did.

-Lucas



Re: 回复: [NEW] p5-HTML-Selector-XPath for upcoming LedgerSMB port

2020-03-25 Thread Andrew Hewus Fresh
On Tue, Mar 24, 2020 at 11:22:39PM -0400, Chris Bennett wrote:
> On Wed, Mar 25, 2020 at 02:46:32AM +, wen heping wrote:
> > Hi,
> > 
> >It build well and pass all tests.
> >But I have two suggestions:
> > i) sysutils/p5-Capture-Tiny is not needed in TEST_DEPENDS.
> > ii) I would use "CONFIGURE_STYLE = modinst" instead ofBUILD_DEPENDS 
> > = devel/p5-Module-Install.
> > 
> 
> I don't know why, but I gave up on that because of the following error:

It is only a warning and doesn't change the package at all, but it is
sort-of a bug in the module, since it doesn't that it doesn't need those
files if Module::Install isn't using the bundled version.
You can work around it with something like:

pre-configure:
sed -i.orig '/^inc/d' ${WRKSRC}/MANIFEST

In any case, although xt/99-compile.t does use Capture::Tiny, we don't
run the xt tests and so I agree I agree that it is not needed.

Other than those comments, I think this looks good.


> 
> ===> p5-HTML-Selector-XPath-0.25 depends on: p5-Module-Install-* -> 
> p5-Module-Install-1.18
> ===>  Extracting for p5-HTML-Selector-XPath-0.25
> FFLR p5-HTML-Selector-XPath $ MB
> ===>  Patching for p5-HTML-Selector-XPath-0.25
> ===>  Compiler link: clang -> /usr/bin/clang
> ===>  Compiler link: clang++ -> /usr/bin/clang++
> ===>  Compiler link: cc -> /usr/bin/cc
> ===>  Compiler link: c++ -> /usr/bin/c++
> ===>  Generating configure for p5-HTML-Selector-XPath-0.25
> ===>  Configuring for p5-HTML-Selector-XPath-0.25
> Checking if your kit is complete...
> Warning: the following files are missing in your kit:
> inc/Module/Install.pm
> inc/Module/Install/Base.pm
> inc/Module/Install/Can.pm
> inc/Module/Install/Fetch.pm
> inc/Module/Install/Makefile.pm
> inc/Module/Install/Metadata.pm
> inc/Module/Install/Win32.pm
> inc/Module/Install/WriteAll.pm
> Please inform the author.
> Generating a Unix-style Makefile
> -
> Using the BUILD_DEPENDS solves the problem.
> 
> Is this a bug in the port or with ports infrastructure?
> Or a bug with me?
> 
> Yes, you are right. Looking closer I see that the test needing
> Capture-Tiny isn't run. I will look closer for that in the future.
> 
> Thank you.
> -- 
> Chris Bennett
> 
> 
> # $OpenBSD: Makefile.template,v 1.85 2019/09/09 19:19:05 kmos Exp $
> 
> COMMENT = CSS Selector to XPath compiler
> 
> DISTNAME =HTML-Selector-XPath-0.25
> 
> CATEGORIES =  www
> 
> # Perl
> PERMIT_PACKAGE =  Yes
> 
> MODULES = cpan
> 
> BUILD_DEPENDS =   devel/p5-Module-Install
> 
> TEST_DEPENDS =devel/p5-Test-Base
> 
> MAKE_ENV +=   TEST_POD=Yes
> 
> PKG_ARCH =*
> 
> .include 
> 

-- 
andrew - http://afresh1.com

What are the unsurpassable real world weaknesses in OpenBSD, 
that you know of? 
  -- Kevin Chadwick 
Lots of fake people attacking the project on the mailing lists makes 
them a poor resource for users.
  -- Theo de Raadt 



Re: [NEW] p5-Template-Plugin-Latex for upcoming LedgerSMB port

2020-03-25 Thread Andrew Hewus Fresh
On Tue, Mar 24, 2020 at 08:17:56PM -0400, Chris Bennett wrote:
> Comments?

This was how I used to do invoicing when I needed to do that.  Glad to
have given it up.

However, it seems to need Capture::Tiny as a TEST_DEPENDS, but with that
the tests passed.  We do get to run a few more tests if we set
LATEX_TESTING in MAKE_ENV, but since they fail, we won't go for that.

With the necessary TEST_DEPENDS added, OK afresh1@

> 
> Thanks
> -- 
> Chris Bennett
> 
> 



-- 
andrew - http://afresh1.com

The 3 great virtues of a programmer: Laziness, Impatience, and Hubris.
  --Larry Wall



Re: 回复: [NEW] www/p5-Plack-Request-WithEncoding

2020-03-25 Thread Andrew Hewus Fresh
On Wed, Mar 25, 2020 at 12:26:23AM -0400, Chris Bennett wrote:
> On Sat, Feb 15, 2020 at 07:04:27PM -0800, Andrew Hewus Fresh wrote:
> > On Mon, Feb 03, 2020 at 02:41:45PM -0500, Chris Bennett wrote:
> > > On Sun, Jan 26, 2020 at 02:41:24PM -0800, Andrew Hewus Fresh wrote:
> > > > On Mon, Jan 20, 2020 at 02:03:34PM -0500, Chris Bennett wrote:
> > > > > On Sun, Jan 19, 2020 at 12:57:44PM +, wen heping wrote:
> > > > > > 1 BUILD_DEPENDS line is not need, since there is CONFIGURE_STYLE =  
> > > > > >  modbuild
> > > > > > 2 p5-Plack should removed from TEST_DEPENDS since it is RUN_DEPENDS
> > > > > > 3 Better replace pkg/DESCR with the module's DESCRIPTION
> > > > > > 
> > > > > > Cheers !
> > > > > > wen
> > > > > 
> > > > > Attached is with the above suggestions, except that I left out the 
> > > > > last
> > > > > line in the module's DESCRIPTION with the reference to look at link 
> > > > > to a
> > > > > section of the DESCRIPTION in particular.
> > > > > 
> > > > > I appreciate the help. Porting has changed (very much for the better)
> > > > > since I last did ports.
> > > > 
> > > > There are extra tabs in the RUN_DEPENDS continuation, probably from
> > > > portgen (and I think I fixed that bug), although only a small style nit.
> > > > 
> > > > After reading the DESCR, I'm fairly sure the original author is not a
> > > > native English speaker.  Perhaps something more like:
> > > > 
> > > > Plack::Request::WithEncoding is a subclass of Plack::Request that
> > > > supports encoded requests.  It overrides many Plack::Request
> > > > attributes to return decoded values.
> > > > 
> > > > In any case, with a fixed DESCR OK afresh1@
> > > 
> > > OK, I just used your DESCR above. I also took out the tabs in the
> > > RUN_DEPENDS and used multiple spaces instead. The tabs were my fault.
> > > I attached a new copy with both those changes.
> > 
> > 
> > OK afresh1@
> > 
> > 
> 
> Better DESCR?
> 
> Plack::Request::WithEncoding is a subclass of Plack::Request that
> supports encoded requests.  It overrides many Plack::Request
> attributes to return decoded values.
> This feature allows a single application to seamlessly handle a wide
> variety of different language code sets.
> Applications that must be able to handle many different translations
> at once will find this extension able to quickly solve that problem.
>
> 
> Perhaps this is a better description that points out why and when
> someone would find this extension useful?
> Otherwise, it doesn't really call out to anyone's attention who is
> needing to use many languages at once.

I like it a lot, I think you should submit it upstream.

Still OK afresh1@, especially with the replaced DESCR



> 
> Thanks
> -- 
> Chris Bennett
> 
> 

-- 
andrew - http://afresh1.com

The power The nightmares The strange medication



Re: [NEW] p5-Email-Stuffer for upcoming LedgerSMB port

2020-03-25 Thread Andrew Hewus Fresh
On Tue, Mar 24, 2020 at 03:50:27PM -0400, Chris Bennett wrote:
> Simple module for sending emails on top of other Email:: modules.

OK afresh1@



> Comments?
> 
> -- 
> Chris Bennett
> 
> 



-- 
andrew - http://afresh1.com

Beta. Software undergoes beta testing shortly before it's released.
   Beta is Latin for "still doesn't work."



Re: clarification of REVISION and EPOCH documentation.

2020-03-25 Thread Jeremie Courreges-Anglas
On Wed, Mar 25 2020, Paco Esteban  wrote:
> On Sun, 15 Mar 2020, Marc Espie wrote:
>
>> On Sun, Mar 15, 2020 at 12:28:25PM +0100, Paco Esteban wrote:
>> > oh, that did not occur to me ...  You mean that if port foo/bar gets
>> > EPOCH = 0, then all dependent ports should change it's dependencies
>> > declarations from foo/bar>=1.1 to foo/bar>=1.1v0 ??
>> 
>> Yes, that's the main reason that led to introducing PKGSPEC in bsd.port.mk
>> and tweaking _print-metadata, so we didn't hav to change every 
>> dependent port.
>> 
>> You still need to bump REVISION in dependent port when you change PKGSPEC
>> though.
>
> Thanks Marc, I tried to include that too.
> All patches updated and attached again.
>
> Cheers,

Comments inline,

> Index: bsd.port.mk.5
> ===
> RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
> retrieving revision 1.528
> diff -u -p -r1.528 bsd.port.mk.5
> --- bsd.port.mk.5 24 Mar 2020 14:59:52 -  1.528
> +++ bsd.port.mk.5 25 Mar 2020 20:07:07 -
> @@ -1650,6 +1650,10 @@ If set to
>  will not open changed files in an editor.
>  .It Ev EPOCH
>  Epoch number of the current package.
> +Used when the port version is changed but the new version is not regarded by
> +.Xr packages-specs 5

5 -> 7

> +as being newer.
> +Once added, it cannot be removed or go backwards.

otherwise, ok jca@ for this hunk

>  Defaults to empty (no need for numbering changes), then
>  numbering starts at 0.
>  Gets automatically incorporated into
> @@ -1658,6 +1662,12 @@ as
>  .Sq v${EPOCH}
>  to form a full package-name conforming to
>  .Xr packages-specs 7 .
> +If there are dependent packages that use a version spec, this has to be
> +adjusted for each one or
> +.Ev PKGSPEC
> +changed on the affected package and
> +.Ev REVISION
> +bumped for all the dependencies.

Hmm, like Marc said this is not the place to mention PKGSPEC.

>  .It Ev ERRORS
>  List of errors found while parsing the port's Makefile.
>  Display the errors before making any target, and if any error starts with
> 
> [3. text/plain; packages-specs.diff]
> Index: packages-specs.7
> ===
> RCS file: /home/cvs/src/share/man/man7/packages-specs.7,v
> retrieving revision 1.25
> diff -u -p -r1.25 packages-specs.7
> --- packages-specs.7  27 Oct 2014 22:45:30 -  1.25
> +++ packages-specs.7  15 Mar 2020 11:25:27 -
> @@ -144,12 +144,46 @@ then normal version, and finally
>  .El
>  .El
>  .Pp
> -In some rare cases, version numbering changes completely upstream.
> +In some rare cases, a change to a port would cause the version number to
> +compare as older than the previous version.
> +This happens if an update is reverted, if upstream's numbering scheme changes
> +completely, or if their usual scheme does not align with the one used by
> +.Ox .

ok jca@ for this hunk

>  A version style marker, of the form
>  .Sq v0 ,
>  .Sq v1 ...
>  can be appended to the version number (after the patch level)
>  to denote the new numbering scheme.
> +This is added by setting
> +.Ev EPOCH
> +in the port Makefile.
> +Combined with
> +.Ev REVISION ,
> +this leaves the version ordering as follows:
> +.Bl -dash
> +.It
> +"0.1" is older than "0.1p0"
> +.It
> +"0.1p0" (or
> +.Sq p1 ,
> +.Sq p2 ... )
> +is older than "0.2"
> +.It
> +"0.2" is older than "0.1v0" (or any other version number without
> +.Sq v )
> +.It
> +"0.1v0" is older than "0.1p0v0".
> +Just as showed in the first point.
> +.It
> +"0.1p0v0" is older than "0.2v0".
> +The same as the second point.
> +.It
> +"0.2v0" is older than "0.1v1" (or any other version with a lower
> +.Sq v
> +value)
> +.El
> +.El
> +.Pp

I find this a bit too chatty.  Can we find a single sentence that
explains what happens?

  ...
  A version style marker, of the form ‘v0’, ‘v1 ...’ can be appended to the
  version number (after the patch level) to denote the new numbering
  scheme.
 +This marker takes precedence over the regular package version.

Thoughts?

>  See
>  .Ev EPOCH
>  in
> 
> [4. text/plain; ports-guide.diff]
> Index: faq/ports/guide.html
> ===
> RCS file: /home/cvs/www/faq/ports/guide.html,v
> retrieving revision 1.89
> diff -u -p -r1.89 guide.html
> --- faq/ports/guide.html  28 Sep 2019 21:35:05 -  1.89
> +++ faq/ports/guide.html  14 Mar 2020 14:39:36 -
> @@ -1131,6 +1131,8 @@ changes to patches or build flags.
>  If the upstream version has not changed, the package name bump is done
>  by incrementing REVISION if already present, otherwise adding
>  REVISION = 0 towards the top of the Makefile.
> +This will add p${REVISION} to FULLPKGNAME to form 
> a full
> +package-name conforming to packages-specs(7).
>  
>  
>  Version numbers always go forward.
> @@ -1138,6 +1140,8 @@ If something unexpected happens and you 
>  upstream numbering changes completely so that the version number appears
>  to g

Re: [NEW] p5-LaTeX-Table for upcoming LedgerSMB port

2020-03-25 Thread Andrew Hewus Fresh
On Tue, Mar 24, 2020 at 07:37:44PM -0400, Chris Bennett wrote:
> Comments very welcome on this one. 

Rather than the MESSAGE, maybe we should just make those packages
RUN_DEPENDS?  I do see that will pull in texlive/base, but is this
module useful really without that?

I guess I am fine either way.

OK afresh1@

(I nearly ported this long ago as I used to use it, but never got around
to submitting it before I stopped)


> 
> Thanks
> -- 
> Chris Bennett
> 
> 



-- 
andrew - http://afresh1.com

I think I understand, but my stubborn brain refuses to admit it
until I beat it into submission by proof upon proof.
  -- Michael Shiloh 



Re: [NEW-WIP] p5-MooseX-FollowPBP (error question) for upcoming LedgerSMB port

2020-03-25 Thread Andrew Hewus Fresh
On Tue, Mar 24, 2020 at 05:36:18PM -0400, Chris Bennett wrote:
> Attached copy.
> I am getting an error with make package. What is this and does it
> matter?

This also is a warning, it means the NAME section in Attribute.pm POD
doesn't have a short description (stuff after " - "), and turns out it
doesn't.  Not really anything you can do about it.

I don't know whether you're allowed to have parenthesis in a COMMENT,
so hopefully someone else will answer that question, but with that
answered, this is OK afresh1@


$ find /usr/ports/pobj/p5-MooseX-FollowPBP-0.05/MooseX-FollowPBP-0.05/lib/ 
-name '*.pm' -exec grep -h -A2 NAME {} +
=head1 NAME

MooseX::FollowPBP - Name your accessors get_foo() and set_foo()
=head1 NAME

MooseX::FollowPBP::Role::Attribute



> ===>  Building package for p5-MooseX-FollowPBP-0.05
> Create /usr/packages/amd64/no-arch/p5-MooseX-FollowPBP-0.05.tgz
> Creating package p5-MooseX-FollowPBP-0.05
> /usr/obj/pobj/p5-MooseX-FollowPBP-0.05/fake-amd64/usr/local/man/man3p/MooseX::FollowPBP::Role::Attribute.3p:
>  No one-line description, using filename "MooseX::FollowPBP::Role::Attribute"
> Link to /usr/packages/amd64/all/p5-MooseX-FollowPBP-0.05.tgz
> Link to /usr/packages/amd64/ftp/p5-MooseX-FollowPBP-0.05.tgz
> 
> Thanks
> -- 
> Chris Bennett
> 
> 



-- 
andrew - http://afresh1.com

($do || !$do) && undef($try) ;  # Master of Perl, Yoda is.  H?



Re: [Update] devel/p5-Config-IniFiles : Update to 3.000003

2020-03-25 Thread Andrew Hewus Fresh
On Wed, Mar 25, 2020 at 11:49:57AM +, wen heping wrote:
> Hi, ports@:
> 
>   Here is a simple patch for devel/p5-Config-IniFiles to update to 3.03.
>   It build well and pass all tests on amd64-current system.
> 
>   Three ports depend on devel/p5-Config-IniFiles:
>   1) audio/p5-Audio-Scrobbler: build well and pass all tests
>   2) devel/p5-Config-Auto: build well and pass all tests
>   3) net/snmptt: build well and no regression tests defined.
> 
> Cheers !
> wen

OK afresh1@


> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/p5-Config-IniFiles/Makefile,v
> retrieving revision 1.42
> diff -u -p -r1.42 Makefile
> --- Makefile  3 Nov 2019 14:07:41 -   1.42
> +++ Makefile  25 Mar 2020 11:43:18 -
> @@ -2,9 +2,8 @@
>  
>  COMMENT =module for reading .ini-style configuration files
>  
> -DISTNAME =   Config-IniFiles-3.02
> +DISTNAME =   Config-IniFiles-3.03
>  CATEGORIES = devel
> -REVISION=0
>  
>  MODULES =cpan
>  PKG_ARCH =   *
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/p5-Config-IniFiles/distinfo,v
> retrieving revision 1.31
> diff -u -p -r1.31 distinfo
> --- distinfo  8 May 2019 16:27:28 -   1.31
> +++ distinfo  25 Mar 2020 11:43:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (Config-IniFiles-3.02.tar.gz) = 
> 2S7W7S25jVrd9zLJbSqcFdn4eMfos1W7elwWaOP4ugk=
> -SIZE (Config-IniFiles-3.02.tar.gz) = 69941
> +SHA256 (Config-IniFiles-3.03.tar.gz) = 
> PEV7ZdmOX/QL25z4FLDVmD6wxT+4aWvaO6A1rSrNaAI=
> +SIZE (Config-IniFiles-3.03.tar.gz) = 70024


-- 
andrew - http://afresh1.com

I think I understand, but my stubborn brain refuses to admit it
until I beat it into submission by proof upon proof.
  -- Michael Shiloh 



Re: [NEW] p5-TeX-Encode for upcoming LedgerSMB port

2020-03-25 Thread Andrew Hewus Fresh
On Tue, Mar 24, 2020 at 08:53:53PM -0400, Chris Bennett wrote:
> Any comments?

OK afresh1@


> Thanks
> -- 
> Chris Bennett
> 
> 



-- 
andrew - http://afresh1.com

Computer analyst to programmer:
   "You start coding. I'll go find out what they want."



Re: [sparc64/base-gcc/ld.bfd] Fix build of x11/libhandy

2020-03-25 Thread Jeremie Courreges-Anglas
On Tue, Mar 24 2020, Kurt Mosiejczuk  wrote:
> x11/libhandy needs ports-gcc on base-gcc architectures and needs
> -L${X11BASE}/lib added to CFLAGS to build properly on base-gcc 
> architectures.
>
> No REVISION bump since it hasn't built on those other architectures
> before.
>
> (cc maintainer)

Just like for colord-gtk, I suspect it would be cleaner to use LDFLAGS
for this kind of tweak, but that requires adding LDFLAGS to
CONFIGURE_ENV (meson.port.mk doesn't do it).

Also cc'ing Antoine who maintains colord-gtk, it would be good to
discuss this in a single email thread.

> --Kurt
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/libhandy/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile  2 Nov 2019 11:12:35 -   1.4
> +++ Makefile  25 Mar 2020 03:12:09 -
> @@ -16,6 +16,9 @@ MAINTAINER =Jasper Lievisse Adriaanse 
>  # LGPLv2.1
>  PERMIT_PACKAGE = Yes
>  
> +COMPILER =   base-clang ports-gcc
> +COMPILER_LANGS = c
> +
>  MODULES =devel/meson
>  
>  WANTLIB += atk-1.0 cairo gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> @@ -25,6 +28,8 @@ BUILD_DEPENDS = ${RUN_DEPENDS}
>  RUN_DEPENDS =devel/gobject-introspection \
>   lang/vala
>  LIB_DEPENDS =x11/gtk+3
> +
> +CFLAGS +=-L${X11BASE}/lib
>  
>  CONFIGURE_ARGS +=-Dglade_catalog=disabled \
>   -Dexamples=false
>


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Re: [sparc64/base-gcc] Fix build of graphics/colord-gtk

2020-03-25 Thread Jeremie Courreges-Anglas
On Tue, Mar 24 2020, Kurt Mosiejczuk  wrote:
> Adding -L${X11BASE}/lib to CFLAGS fixes the build on sparc64 (And presumably
> other base-gcc architectures).
>
> No revision bump since it hasn't built on sparc64 and shouldn't make
> a difference to non-sparc64.
>
> ok?
>
> (cc maintainer)
>
> --Kurt
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/colord-gtk/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile  10 Jul 2019 21:01:27 -  1.22
> +++ Makefile  25 Mar 2020 02:32:47 -
> @@ -38,4 +38,6 @@ CONFIGURE_ARGS= -Ddocs=false \
>  # XXX require docbook-xsl-nsl
>  CONFIGURE_ARGS +=-Dman=false
>  
> +CFLAGS +=-L${X11BASE}/lib
> +
>  .include 

Looks like you're using CFLAGS because setting LDFLAGS doesn't work.
The diff below also fixed colord-gtk on sparc64, using LDFLAGS (also it
restricts the tweak to ld.bfd archs).

I'm not sure why meson.port.mk doesn't also export LDFLAGS in
MODMESON_CONFIGURE_ENV.  Maybe because gnome.port.mk somehow needs to
own it?

Antoine, thoughts?


Index: Makefile
===
RCS file: /cvs/ports/graphics/colord-gtk/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile10 Jul 2019 21:01:27 -  1.22
+++ Makefile26 Mar 2020 01:25:40 -
@@ -37,5 +37,11 @@ CONFIGURE_ARGS=  -Ddocs=false \
 
 # XXX require docbook-xsl-nsl
 CONFIGURE_ARGS +=  -Dman=false
+CONFIGURE_ENV =LDFLAGS="${LDFLAGS}"
+
+.include 
+.if !${PROPERTIES:Mlld}
+LDFLAGS += -L${X11BASE}/lib
+.endif
 
 .include 

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Re: PORTS_PRIVSEP=Yes and doas install

2020-03-25 Thread Kurt Mosiejczuk
On Thu, Mar 26, 2020 at 12:12:51AM +, Lucas wrote:

> Today I spent a fair amount of time trying to understand why, after
> having set relevant bits of configuration in /etc/doas.conf and
> /etc/mk.conf, `make` was asking me for passwords.

Did you just try typing "make install"?

If you do "doas make install" then all your doas.conf lines mean nothing,
because you are doing the "make install" as root. So when it comes to
using doas in bsd.port.mk, you are root, so it wants root's password,
because you haven't set up anything special for root.

--Kurt



Re: NEW: devel/dwz

2020-03-25 Thread Jeremie Courreges-Anglas
On Mon, Mar 23 2020, Brian Callahan  wrote:
> On 2020-03-23 11:11 AM, Marc Espie wrote:
>> On Mon, Mar 23, 2020 at 11:08:16AM -0400, Brian Callahan wrote:
>>>
>>> On 2020-03-23 10:54 AM, Marc Espie wrote:
 On Fri, Mar 20, 2020 at 03:22:16PM -0400, Brian Callahan wrote:
> Hello ports --
>
> It was hinted at recently that a port of dwz might be desirable. Here is
> one.
>
> ---
> pkg/DESCR:
> dwz is a program that attempts to optimize DWARF debugging information
> contained in ELF shared libraries and ELF executables for size, by
> replacing DWARF information representation with equivalent smaller
> representation where possible and by reducing the amount of duplication
> using techniques from DWARF standard appendix E - creating
> DW_TAG_partial_unit compilation units (CUs) for duplicated information
> and using DW_TAG_imported_unit to import it into each CU that needs it.
> ---
>
> Can verify that it does in fact do something with some test binaries on
> amd64 (diffing the output of `objdump -g' from a newer binutils does show
> substantial differences), but I don't know enough about DWARF symbols to
> authoritatively say anything more than that. Testing on other archs would 
> be
> greatly appreciated.
>
> OK?
 Thanks for the initial work, but you're not thinking straight.

 Here's an updated port.

 You'll notice the dependencies on gmake and xz are gone, which is
 required if we want to use this for DEBUG_PACKAGES eventually ;)
>>> Unless I'm missing something, you sent me back my own port without changes.
>>> I'm fine with switching to the gz tarball and removing the dependency on
>>> gmake. I get why.
>> Oops, bad tarball
>
> Like I said before, this is all fine.
> At some point, perhaps someone should look into making the tests work.
> I have never been able to figure out how to get dejagnu to work so
> I disabled them but that might not be ideal.

I tried to enable the tests but didn't get anywhere.

Here's an unrelated diff: fix endianness checks.  ok?


Index: Makefile
===
RCS file: /d/cvs/ports/devel/dwz/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile24 Mar 2020 17:33:43 -  1.2
+++ Makefile26 Mar 2020 01:11:43 -
@@ -2,6 +2,8 @@
 
 COMMENT =  DWARF optimization and duplicate removal tool
 DISTNAME = dwz-0.13
+REVISION = 0
+
 CATEGORIES =   devel
 
 HOMEPAGE = https://sourceware.org/dwz/
Index: patches/patch-hashtab_c
===
RCS file: patches/patch-hashtab_c
diff -N patches/patch-hashtab_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-hashtab_c 26 Mar 2020 01:12:27 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+More portable endianness check
+https://www.austingroupbugs.net/view.php?id=162#c665
+
+Index: hashtab.c
+--- hashtab.c.orig
 hashtab.c
+@@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA.  */
+ #include "hashtab.h"
+ 
+ #include 
+-#if __BYTE_ORDER == __BIG_ENDIAN
++#if BYTE_ORDER == BIG_ENDIAN
+ # define WORDS_BIGENDIAN 1
+ #endif
+ 
Index: patches/patch-sha1_c
===
RCS file: patches/patch-sha1_c
diff -N patches/patch-sha1_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-sha1_c26 Mar 2020 01:12:17 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+More portable endianness check
+https://www.austingroupbugs.net/view.php?id=162#c665
+
+Index: sha1.c
+--- sha1.c.orig
 sha1.c
+@@ -29,7 +29,7 @@
+ #include 
+ #include 
+ 
+-#if __BYTE_ORDER == __BIG_ENDIAN
++#if BYTE_ORDER == BIG_ENDIAN
+ # define SWAP(n) (n)
+ #else
+ # define SWAP(n) \


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Re: [new] Puppet 6

2020-03-25 Thread Arthur Barton
Hi Ports

Has anyone had a chance to review?

Cheers,
Arthur

-- 
Arthur Barton
arth...@igniferous.net

On Fri, Mar 20, 2020, at 14:33, Arthur Barton wrote:
> Hi,
> 
> Attached is a puppet 6 port, it re-uses the existing patches for puppet5.
> Confirmed working on amd64, only tested on a very minimal master-less setup
> 
> Index: sysutils/ruby-puppet/Makefile
> ===
> RCS file: /cvs/ports/sysutils/ruby-puppet/Makefile,v
> retrieving revision 1.59
> diff -u -p -r1.59 Makefile
> --- sysutils/ruby-puppet/Makefile 9 Jul 2018 06:56:42 - 1.59
> +++ sysutils/ruby-puppet/Makefile 20 Mar 2020 03:07:23 -
> @@ -3,5 +3,6 @@
>  SUBDIR =
>  SUBDIR += 4
>  SUBDIR += 5
> + SUBDIR += 6
> 
> .include 
> Index: sysutils/ruby-puppet/Makefile.inc
> ===
> RCS file: /cvs/ports/sysutils/ruby-puppet/Makefile.inc,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile.inc
> --- sysutils/ruby-puppet/Makefile.inc 12 Jul 2019 20:49:50 - 1.46
> +++ sysutils/ruby-puppet/Makefile.inc 20 Mar 2020 03:07:23 -
> @@ -30,6 +30,10 @@ SUBST_VARS += RUBY
> # databases/puppetdb4
> # databases/ruby-hiera3
> # sysutils/facter
> +# Puppet 6:
> +# devel/ruby-concurrent-ruby
> +# devel/ruby-semantic_puppet
> +# sysutils/facter
> 
> MODULES += lang/ruby
> 
> 
> --
> Arthur Barton
> arth...@igniferous.net
> 
> 
> Attachments:
> * 6.tar



PORTS_PRIVSEP=Yes and doas install

2020-03-25 Thread Lucas
Hello ports@,

Today I spent a fair amount of time trying to understand why, after
having set relevant bits of configuration in /etc/doas.conf and
/etc/mk.conf, `make` was asking me for passwords.

Setup
=

/etc/doas.conf:
permit persist lucas as root
permit nopass keepenv lucas as _pbuild
permit nopass keepenv lucas as _pfetch
permit nopass lucas cmd /usr/bin/touch
permit nopass setenv { TRUSTED_PKG_PATH TERM } \
lucas cmd /usr/sbin/pkg_add
permit nopass setenv { TERM } lucas cmd /usr/sbin/pkg_delete

/etc/mk.conf:
DISTDIR=/var/ports/distfiles
FETCH_PACKAGES=
PACKAGE_REPOSITORY=/var/ports/packages
PORTSDIR=/home/cvs/ports
PORTS_PRIVSEP=Yes
SUDO=doas
WRKOBJDIR=/var/ports/pobj

Ports tree is OPENBSD_6_6 and not -current, as I want a build machine
to backport some updates, to ease testing of ports updates (as in
packaging net/prosody 0.11.5 for testing it in my server which runs
-stable)

Note that I use some "unusual" paths. Reason for this is the machine
not being originally purposed to build packages, so I picked parts of
the filesystems that had spare space.

Debugging / solution proposals
==

After asking `ps auxww`, turns out the guilty is

doas install -d -o _pfetch -g 56 \
/var/ports/packages/amd64/cache/

which gets called at line 2084 of ports/infrastructure/mk/bsd.port.mk,
in some dependency chain (tbh, bsd.port.mk is a beast and I tried my
best to follow stuff).

So, first option would be adding another recommended line for
/etc/doas.conf in bsd.port.mk(5), in the same vein of the lines already
present in there.

Now, I don't feel to comfortable suggesting to add

permit nopass solene cmd install

to it. Instead, I'd prefer using full path, but that would require
changing that precise invocation of install to full path, or creating
a INSTALL_PROG variable, much like PKG_ADD and friends, defaulting to
/usr/bin/install. This will require, for consistency, changing all the
calls to install among all the makefiles to ${INSTALL_PROG}, which
seems quite invasive.

If we take a look at why that install gets called with doas, it happens 
because PORTS_PRIVSEP is set to Yes, and so, the .if in line 133 of
ports/infrastructure/mk/pkgpath.mk sets _INSTALL_CACHE_REPO to escalate
privileges, in line 144. This call creates a directory owned by
${FETCH_USER}:${FETCH_USER}. This *could* be replace with

_INSTALL_CACHE_REPO = ${_PFETCH} install -d \
${PACKAGE_REPOSITORY_MODE}

which worked in my case, but I guess it's done with ${SUDO} because
${FETCH_USER} could not have write permissions in the directory where
the package cache gets created.

Which takes to the final alternative: ${_INSTALL_CACHE_REPO} is called
in only one place, line 2084 of bsd.port.mk. It's called with
${_CACHE_REPO}, assigned *unconditionally* at line 961 as

_CACHE_REPO = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/cache/

As such, I'd suggest having a new user variable in mk.conf(5),
CACHE_REPOSITORY, and set

_CACHE_REPO = ${CACHE_REPOSITORY}/${MACHINE_ARCH}/cache/

This way, we can replace _INSTALL_CACHE_REPO as suggested above and
require CACHE_REPOSITORY to be owned by ${FETCH_USER} if PORTS_PRIVSEP
is Yes. We can also make fix-permissions handle the creation too.

Comments? Opinions? IMO introducing CACHE_REPOSITORY is quite clean and
the least invasive approach. I can prepare a patch for that.

-Lucas



[UPDATED] net/wiresep 0.9.0 -> 0.10.1

2020-03-25 Thread Tim Kuijsten
Here is WireSep version 0.10.1. I've upstreamed both patches and incorporated
some feedback I got from Klemens Nannie and Janne Johansson, big thanks!

-Tim


wiresep-0.10.1.tgz
Description: GNU Zip compressed data


Re: clarification of REVISION and EPOCH documentation.

2020-03-25 Thread Marc Espie
On Wed, Mar 25, 2020 at 09:11:14PM +0100, Paco Esteban wrote:
> On Sun, 15 Mar 2020, Marc Espie wrote:
> 
> > On Sun, Mar 15, 2020 at 12:28:25PM +0100, Paco Esteban wrote:
> > > oh, that did not occur to me ...  You mean that if port foo/bar gets
> > > EPOCH = 0, then all dependent ports should change it's dependencies
> > > declarations from foo/bar>=1.1 to foo/bar>=1.1v0 ??
> > 
> > Yes, that's the main reason that led to introducing PKGSPEC in bsd.port.mk
> > and tweaking _print-metadata, so we didn't hav to change every 
> > dependent port.
> > 
> > You still need to bump REVISION in dependent port when you change PKGSPEC
> > though.
> 
> Thanks Marc, I tried to include that too.
> All patches updated and attached again.

Oh sorry, I only intended to explain the history of things.

I think that PKGSPEC is too much detail in the documentation. It's 
still supposed to be a reference manual, this does not belong in the man 
page, possibly in the web page, but this will turn people away from 
the manpage.



Re: [update patch] py-eyed3 0.8.12 -> 0.9.4

2020-03-25 Thread Stuart Henderson
AFAIK from the update notes it shouldn't need py-magic any more.
(I didn't do the update myself because I don't have time to shepherd
new ports atm :)


On 2020/03/25 10:31, Martin Ziemer wrote:
> This patch updates py-eyed3 from 0.8.12 to 0.9.4.
> 
> Since there was no maintainer, i added myself.
> 
> There are two new dependencies for this version:
> py-deprecation and py-filetype. For those i attached new ports as
> .tgz-files based on /usr/ports/devel. 
> If another format as .tgz is preferred for new ports, please tell me, 
> which one. (This is the first time i submit a new port)
> 
> Tested the new version on three amd64-systems by tagging one cd and
> reading those tags, as well as changed the genre afterwards.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/py-eyed3/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- Makefile  29 Feb 2020 15:54:33 -  1.21
> +++ Makefile  23 Mar 2020 13:45:38 -
> @@ -2,12 +2,14 @@
>  
>  COMMENT= module and program for processing ID3 tags
>  
> -MODPY_EGG_VERSION=   0.8.12
> +MODPY_EGG_VERSION=   0.9.4
>  DISTNAME=eyeD3-${MODPY_EGG_VERSION}
>  CATEGORIES=  audio
>  
>  HOMEPAGE=http://eyed3.nicfit.net/
>  
> +MAINTAINER = Martin Ziemer 
> +
>  # GPLv2+
>  PERMIT_PACKAGE=  Yes
>  
> @@ -17,7 +19,9 @@ MODULES=lang/python
>  # standalone software - intentionally no py-* prefix/FLAVOR.
>  MODPY_VERSION=   ${MODPY_DEFAULT_VERSION_3}
>  RUN_DEPENDS= devel/py-magic${MODPY_FLAVOR} \
> - devel/py-six${MODPY_FLAVOR}
> + devel/py-six${MODPY_FLAVOR} \
> + devel/py-filetype${MODPY_FLAVOR} \
> + devel/py-deprecation${MODPY_FLAVOR}
>  
>  MODPY_SETUPTOOLS=Yes
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/py-eyed3/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  28 Dec 2019 15:13:25 -  1.8
> +++ distinfo  23 Mar 2020 13:45:38 -
> @@ -1,2 +1,2 @@
> -SHA256 (eyeD3-0.8.12.tar.gz) = 5U7sCgP7jn6ei1CVRsbZLvvIcep1l2Ef4sFvA+HJS20=
> -SIZE (eyeD3-0.8.12.tar.gz) = 214073
> +SHA256 (eyeD3-0.9.4.tar.gz) = EQmUZOQ4wRodcB5yOlBlwVVvtZh4rZ3OKfkk2sOgepY=
> +SIZE (eyeD3-0.9.4.tar.gz) = 222818
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/audio/py-eyed3/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 28 Dec 2019 15:13:26 -  1.5
> +++ pkg/PLIST 23 Mar 2020 13:45:38 -
> @@ -14,10 +14,9 @@ lib/python${MODPY_VERSION}/site-packages
>  
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}/
>  
> lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__about__.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/eyed3/compat.py
> +lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}mimetype.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/eyed3/core.py
>  lib/python${MODPY_VERSION}/site-packages/eyed3/id3/
>  lib/python${MODPY_VERSION}/site-packages/eyed3/id3/__init__.py
> @@ -32,6 +31,7 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/eyed3/id3/headers.py
>  lib/python${MODPY_VERSION}/site-packages/eyed3/id3/tag.py
>  lib/python${MODPY_VERSION}/site-packages/eyed3/main.py
> +lib/python${MODPY_VERSION}/site-packages/eyed3/mimetype.py
>  lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/
>  lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/__init__.py
>  
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/${MODPY_PYCACHE}/
> @@ -46,28 +46,36 @@ lib/python${MODPY_VERSION}/site-packages
>  
> lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}art.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}classic.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}display.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}extract.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}fixup.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}genres.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/

Re: clarification of REVISION and EPOCH documentation.

2020-03-25 Thread Paco Esteban
On Sun, 15 Mar 2020, Marc Espie wrote:

> On Sun, Mar 15, 2020 at 12:28:25PM +0100, Paco Esteban wrote:
> > oh, that did not occur to me ...  You mean that if port foo/bar gets
> > EPOCH = 0, then all dependent ports should change it's dependencies
> > declarations from foo/bar>=1.1 to foo/bar>=1.1v0 ??
> 
> Yes, that's the main reason that led to introducing PKGSPEC in bsd.port.mk
> and tweaking _print-metadata, so we didn't hav to change every 
> dependent port.
> 
> You still need to bump REVISION in dependent port when you change PKGSPEC
> though.

Thanks Marc, I tried to include that too.
All patches updated and attached again.

Cheers,

-- 
Paco Esteban.
0x5818130B8A6DBC03
Index: bsd.port.mk.5
===
RCS file: /home/cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.528
diff -u -p -r1.528 bsd.port.mk.5
--- bsd.port.mk.5   24 Mar 2020 14:59:52 -  1.528
+++ bsd.port.mk.5   25 Mar 2020 20:07:07 -
@@ -1650,6 +1650,10 @@ If set to
 will not open changed files in an editor.
 .It Ev EPOCH
 Epoch number of the current package.
+Used when the port version is changed but the new version is not regarded by
+.Xr packages-specs 5
+as being newer.
+Once added, it cannot be removed or go backwards.
 Defaults to empty (no need for numbering changes), then
 numbering starts at 0.
 Gets automatically incorporated into
@@ -1658,6 +1662,12 @@ as
 .Sq v${EPOCH}
 to form a full package-name conforming to
 .Xr packages-specs 7 .
+If there are dependent packages that use a version spec, this has to be
+adjusted for each one or
+.Ev PKGSPEC
+changed on the affected package and
+.Ev REVISION
+bumped for all the dependencies.
 .It Ev ERRORS
 List of errors found while parsing the port's Makefile.
 Display the errors before making any target, and if any error starts with
Index: packages-specs.7
===
RCS file: /home/cvs/src/share/man/man7/packages-specs.7,v
retrieving revision 1.25
diff -u -p -r1.25 packages-specs.7
--- packages-specs.727 Oct 2014 22:45:30 -  1.25
+++ packages-specs.715 Mar 2020 11:25:27 -
@@ -144,12 +144,46 @@ then normal version, and finally
 .El
 .El
 .Pp
-In some rare cases, version numbering changes completely upstream.
+In some rare cases, a change to a port would cause the version number to
+compare as older than the previous version.
+This happens if an update is reverted, if upstream's numbering scheme changes
+completely, or if their usual scheme does not align with the one used by
+.Ox .
 A version style marker, of the form
 .Sq v0 ,
 .Sq v1 ...
 can be appended to the version number (after the patch level)
 to denote the new numbering scheme.
+This is added by setting
+.Ev EPOCH
+in the port Makefile.
+Combined with
+.Ev REVISION ,
+this leaves the version ordering as follows:
+.Bl -dash
+.It
+"0.1" is older than "0.1p0"
+.It
+"0.1p0" (or
+.Sq p1 ,
+.Sq p2 ... )
+is older than "0.2"
+.It
+"0.2" is older than "0.1v0" (or any other version number without
+.Sq v )
+.It
+"0.1v0" is older than "0.1p0v0".
+Just as showed in the first point.
+.It
+"0.1p0v0" is older than "0.2v0".
+The same as the second point.
+.It
+"0.2v0" is older than "0.1v1" (or any other version with a lower
+.Sq v
+value)
+.El
+.El
+.Pp
 See
 .Ev EPOCH
 in
Index: faq/ports/guide.html
===
RCS file: /home/cvs/www/faq/ports/guide.html,v
retrieving revision 1.89
diff -u -p -r1.89 guide.html
--- faq/ports/guide.html28 Sep 2019 21:35:05 -  1.89
+++ faq/ports/guide.html14 Mar 2020 14:39:36 -
@@ -1131,6 +1131,8 @@ changes to patches or build flags.
 If the upstream version has not changed, the package name bump is done
 by incrementing REVISION if already present, otherwise adding
 REVISION = 0 towards the top of the Makefile.
+This will add p${REVISION} to FULLPKGNAME to form a 
full
+package-name conforming to packages-specs(7).
 
 
 Version numbers always go forward.
@@ -1138,6 +1140,8 @@ If something unexpected happens and you 
 upstream numbering changes completely so that the version number appears
 to go backwards, you must use EPOCH to make sure pkg_add(1) sees
 the package as a newer package.
+This will add v${EPOCH} to FULLPKGNAME to form a full
+package-name conforming to packages-specs(7).
 
 
 If the package does not build, no bump is needed: changes to restore a port
@@ -1153,6 +1157,11 @@ The package system uses a signature mech
 is fully identified by its package names, plus the dependencies against
 which it was built, plus the version numbers of all shared libraries it
 contains.
+
+
+The version comparison ordering can be summarized as:
+0.1 < 0.1p0 < 0.2 < 0.1v0 < 0.1p0v0 < 0.2v0 < 
0.1v1.
+Check packages-specs(7) for more detailed information.
 
 
 Part of the work will happen before the update itself.


Update lang/jruby 9.2.11.0 -> 9.2.11.1

2020-03-25 Thread Jeremy Evans
Simple update to the latest version of JRuby to fix an issue with
Kernel#sprintf that could have security implications.  See
https://www.jruby.org/2020/03/25/jruby-9-2-11-1.html for details.

Tested on amd64, the only supported arch.  Will be committing in a
couple days unless I hear objections.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- Makefile5 Mar 2020 15:29:13 -   1.84
+++ Makefile25 Mar 2020 19:34:43 -
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS = amd64
 
 COMMENT =  pure-Java implementation of the Ruby language
 
-V =9.2.11.0
+V =9.2.11.1
 DISTNAME = jruby-dist-${V}-bin
 PKGNAME =  jruby-${V}
 CATEGORIES =   lang lang/ruby
Index: distinfo
===
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.53
diff -u -p -r1.53 distinfo
--- distinfo5 Mar 2020 15:29:13 -   1.53
+++ distinfo25 Mar 2020 19:34:43 -
@@ -1,6 +1,6 @@
 SHA256 (jffi-1.2.18.tar.gz) = BTJsmFFT5MhkSblzLLqjnHVw8HnNDxJ2wvXfQOusvZI=
-SHA256 (jruby-dist-9.2.11.0-bin.tar.gz) = 
iugtoaJlgZLBRFyWETR3Usa/+twoTsDcBhXja7W63wc=
+SHA256 (jruby-dist-9.2.11.1-bin.tar.gz) = 
8QRJyCVnEzkI5eGsB2Q4MHp/CRb2F/QPoxS3iHOhldw=
 SHA256 (jruby-launcher-1.1.9-java.gem) = 
9prnUcy0VqolcmXSsZR5HWWWrFr2cNZVZyH3DHQcEdU=
 SIZE (jffi-1.2.18.tar.gz) = 2210133
-SIZE (jruby-dist-9.2.11.0-bin.tar.gz) = 25548555
+SIZE (jruby-dist-9.2.11.1-bin.tar.gz) = 25547815
 SIZE (jruby-launcher-1.1.9-java.gem) = 65024



Re: net/telegram-purple: mark NOT_FOR_ARCHS = ${BE_ARCHS}

2020-03-25 Thread Kurt Mosiejczuk
On Wed, Mar 25, 2020 at 12:04:46PM +0100, Theo Buehler wrote:
> kmos asked me to take a look at the net/telegram-purple build failure [1]
> on sparc64.  This also occurs in mips64 [2] and macppc (marked broken):

> assertion "get_int () == TLS_SCHEMA_V2" failed: file "generate.c", line 2831, 
> function "parse_tlo_file"

> It's obviously an endianness issue:

> get_int () returns 0xe29b2f3a
> TLS_SCHEMA_V2 is   0x3a2f9be2

> This will take a non-trivial effort to fix, so mark it as
> NOT_FOR_ARCHS = ${BE_ARCHS}.

> [1]: 
> http://build-failures.rhaalovely.net/sparc64/2020-03-21/net/telegram-purple.log
> [2]: 
> http://build-failures.rhaalovely.net/mips64/2020-03-08/net/telegram-purple.log

ok kmos

--Kurt

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/telegram-purple/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile  12 Jul 2019 20:48:50 -  1.6
> +++ Makefile  25 Mar 2020 09:47:26 -
> @@ -1,6 +1,7 @@
>  # $OpenBSD: Makefile,v 1.6 2019/07/12 20:48:50 sthen Exp $
>  
> -BROKEN-powerpc = assertion "get_int () == TLS_SCHEMA_V2" failed: file 
> "generate.c", line 2831, function "parse_tlo_file"
> +# assertion "get_int () == TLS_SCHEMA_V2" failed: file "generate.c", line 
> 2831, function "parse_tlo_file"
> +NOT_FOR_ARCHS =  ${BE_ARCHS}
>  
>  V =  1.3.1
>  REVISION =   2
> 



Re: Kernel relink and disable ulpt in kernel - cups printing

2020-03-25 Thread Chris Bennett
On Wed, Mar 25, 2020 at 02:23:48PM +, Mikolaj Kucharski wrote:
> On Sat, Mar 21, 2020 at 08:04:35PM +, Mikolaj Kucharski wrote:
> > On Thu, Mar 19, 2020 at 08:08:10AM +0100, Antoine Jacoutot wrote:
> > > > - How do you handle kernel modifications via config(8) with kernel
> > > >   relinking in a more automated way?
> > > 
> > > $ cat /etc/rc.shutdown 
> > > printf 'disable ulpt\nq\n' | config -ef /bsd
> > > sha256 /bsd >/var/db/kernel.SHA256
> > 
> > Neat, simple and straightforward. I like it, thanks Antoine.
> 
> It has one disadvantage. It doesn't integrate well with sysupgrade(8)
> and need one additional reboot, to get desired kernel configuration. For
> me it's easy to forget this one additional reboot.
> 

Actually, not.
When rebooting the first time, use boot -c
Then disable ulpt
quit 

Which is what the above does for later reboots.
Which I am now thrilled to use for disable amdgpu.
I can now skip using boot -c

Boot -c is often used to enable or disable things to allow successful
booting at all.

-- 
Chris Bennett




[patch] net/mautrix-whatsapp

2020-03-25 Thread Renaud Allard

Hello,

This small diff to make mautrix-whatsapp example config listen to 
127.0.0.1 by default instead of 0.0.0.0


Regards
Index: Makefile
===
RCS file: /cvs/ports/net/mautrix-whatsapp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile	14 Mar 2020 16:17:39 -	1.1.1.1
+++ Makefile	25 Mar 2020 14:17:08 -
@@ -4,6 +4,7 @@ COMMENT =	matrix-WhatsApp puppeting brid
 
 V =		20200225
 DISTNAME =	mautrix-whatsapp-${V}
+REVISION =	1
 
 CATEGORIES =	net
 
Index: patches/patch-example-config_yaml
===
RCS file: patches/patch-example-config_yaml
diff -N patches/patch-example-config_yaml
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-example-config_yaml	25 Mar 2020 14:17:08 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: example-config.yaml
+--- example-config.yaml.orig
 example-config.yaml
+@@ -12,7 +12,7 @@ appservice:
+ address: http://localhost:29318
+ 
+ # The hostname and port where this appservice should listen.
+-hostname: 0.0.0.0
++hostname: 127.0.0.1
+ port: 29318
+ 
+ # Database config.


smime.p7s
Description: S/MIME Cryptographic Signature


Re: UPDATE: Tor Browser 9.0.7

2020-03-25 Thread Chris Bennett
If you do upgrade to -current and wish to use ports, which isn't
actually useful for anything unless you are either working on NEW or
UPDATED ports, You will have to keep /usr/ports in sync with whatever
-current you are running. DO NOT update to ports that do not match
exactly which -current you are running!
This is because ports which are compiled need to match what the system
is running.
OpenBSD runs as a unit, not a collection such as Linux does.
Running as a single unit makes for a huge security and bug improvement.

The other reason to use ports is for a few ports that are not available
in packages, such as msttcorefonts.

-- 
Chris Bennett




Re: Kernel relink and disable ulpt in kernel - cups printing

2020-03-25 Thread Mikolaj Kucharski
On Sat, Mar 21, 2020 at 08:04:35PM +, Mikolaj Kucharski wrote:
> On Thu, Mar 19, 2020 at 08:08:10AM +0100, Antoine Jacoutot wrote:
> > > - How do you handle kernel modifications via config(8) with kernel
> > >   relinking in a more automated way?
> > 
> > $ cat /etc/rc.shutdown 
> > printf 'disable ulpt\nq\n' | config -ef /bsd
> > sha256 /bsd >/var/db/kernel.SHA256
> 
> Neat, simple and straightforward. I like it, thanks Antoine.

It has one disadvantage. It doesn't integrate well with sysupgrade(8)
and need one additional reboot, to get desired kernel configuration. For
me it's easy to forget this one additional reboot.

-- 
Regards,
 Mikolaj



Re: UPDATE: Tor Browser 9.0.7

2020-03-25 Thread Chris Bennett
On Wed, Mar 25, 2020 at 11:23:14AM +0530, putridsou...@gmail.com wrote:
> Is there a way to push this
> update to the -stable branch
> Or does the -stable package
> version stays constant?
> Because the 8.0.9 version 
> doesn't work. Not in pkg_add
> nor in the ports.
> 

You will need to move to -current then.
Depending on your exact situation, you might be able to test -current
first by installing it on external media first. -current also is
changing continuously.

I have some sort of problem with my laptop. It won't run -current, but
6.6-stable is fine. Which is on a USB flash drive.
I also have a USB hard drive for the extra storage I need. Works nice.

I'm running -current on each of my two servers to let me do porting,
which requires -current.
If -current today doesn't work, then report the problems using sendbug
which sends an email to b...@openbsd.org. Or report problems to
b...@openbsd.org, with dmesg + Xorg.log.0 + etc. See sendbug which you
can also CC to yourself locally to then send to bugs@ from another
computer if necessary by copying the file sent to your local email.

Running -current may make your life much better and always is great for
OpenBSD!


Good luck!
-- 
Chris Bennett




dwz vs xul

2020-03-25 Thread Marc Espie
Haven't had time to investigate, but it seems libxul might have
issues.

Errors show up in all 3 ports (www/firefox-esr, www/mozilla-firefox
and mail/thunderbird)

Looks like:
> Extracting debug info from lib/thunderbird/libxul.so.34.0
dwz: lib/thunderbird/.debug/libxul.so.34.0.dbg: Couldn't find DIE referenced by 
DW_AT_abstract_origin


I've found a small tool called dwarf-check on github (in go... well)

hub$ dwarf-check libxul.so.34.0
error initializing dwarf state examiner: malformed dwarf at offset 450264449: 
nstack underflow

so both info seem to point at a bug in clang/lld

Quick&dirty port of dwarf-check attached


dwarf-check.tgz
Description: dwarf-check.tgz


[Update] devel/p5-Config-IniFiles : Update to 3.000003

2020-03-25 Thread wen heping
Hi, ports@:

  Here is a simple patch for devel/p5-Config-IniFiles to update to 3.03.
  It build well and pass all tests on amd64-current system.

  Three ports depend on devel/p5-Config-IniFiles:
  1) audio/p5-Audio-Scrobbler: build well and pass all tests
  2) devel/p5-Config-Auto: build well and pass all tests
  3) net/snmptt: build well and no regression tests defined.

Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Config-IniFiles/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile3 Nov 2019 14:07:41 -   1.42
+++ Makefile25 Mar 2020 11:43:18 -
@@ -2,9 +2,8 @@
 
 COMMENT =  module for reading .ini-style configuration files
 
-DISTNAME = Config-IniFiles-3.02
+DISTNAME = Config-IniFiles-3.03
 CATEGORIES =   devel
-REVISION=  0
 
 MODULES =  cpan
 PKG_ARCH = *
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Config-IniFiles/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo8 May 2019 16:27:28 -   1.31
+++ distinfo25 Mar 2020 11:43:18 -
@@ -1,2 +1,2 @@
-SHA256 (Config-IniFiles-3.02.tar.gz) = 
2S7W7S25jVrd9zLJbSqcFdn4eMfos1W7elwWaOP4ugk=
-SIZE (Config-IniFiles-3.02.tar.gz) = 69941
+SHA256 (Config-IniFiles-3.03.tar.gz) = 
PEV7ZdmOX/QL25z4FLDVmD6wxT+4aWvaO6A1rSrNaAI=
+SIZE (Config-IniFiles-3.03.tar.gz) = 70024


net/telegram-purple: mark NOT_FOR_ARCHS = ${BE_ARCHS}

2020-03-25 Thread Theo Buehler
kmos asked me to take a look at the net/telegram-purple build failure [1]
on sparc64.  This also occurs in mips64 [2] and macppc (marked broken):

assertion "get_int () == TLS_SCHEMA_V2" failed: file "generate.c", line 2831, 
function "parse_tlo_file"

It's obviously an endianness issue:

get_int () returns 0xe29b2f3a
TLS_SCHEMA_V2 is   0x3a2f9be2

This will take a non-trivial effort to fix, so mark it as
NOT_FOR_ARCHS = ${BE_ARCHS}.

[1]: 
http://build-failures.rhaalovely.net/sparc64/2020-03-21/net/telegram-purple.log
[2]: 
http://build-failures.rhaalovely.net/mips64/2020-03-08/net/telegram-purple.log

Index: Makefile
===
RCS file: /cvs/ports/net/telegram-purple/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:48:50 -  1.6
+++ Makefile25 Mar 2020 09:47:26 -
@@ -1,6 +1,7 @@
 # $OpenBSD: Makefile,v 1.6 2019/07/12 20:48:50 sthen Exp $
 
-BROKEN-powerpc =   assertion "get_int () == TLS_SCHEMA_V2" failed: file 
"generate.c", line 2831, function "parse_tlo_file"
+# assertion "get_int () == TLS_SCHEMA_V2" failed: file "generate.c", line 
2831, function "parse_tlo_file"
+NOT_FOR_ARCHS =${BE_ARCHS}
 
 V =1.3.1
 REVISION = 2



Re: REVISION: devel/py-jedi and devel/py-parso to python3 only

2020-03-25 Thread Paco Esteban
On Tue, 24 Mar 2020, Elias M. Mariani wrote:

> The only consumers of py-jedi are:
> - devel/spyder/spyder,python3
> - x11/gnome/builder
> 
> Both using devel/py-jedi,python3, moving to py3-jedi only.
> 
> Then the only consumer of devel/py-parso becomes:
> devel/py-jedi,python3
> 
> Also moving to py3-parso only.
> 
> diff missing quirks and Makefile unhooks, will do when committing.
> I'm not updating them for now, we should check for compatibility with
> spyder and gnome-builder for that.
> 
> OK?

They build and install ok for me.  I did not test consumers, but this
should not have an impact, as there's not version update.

Good luck testing devel/spyder/spyder if you updte py-jedi :-P

ok paco.

-- 
Paco Esteban.
0x5818130B8A6DBC03



[update patch] py-eyed3 0.8.12 -> 0.9.4

2020-03-25 Thread Martin Ziemer
This patch updates py-eyed3 from 0.8.12 to 0.9.4.

Since there was no maintainer, i added myself.

There are two new dependencies for this version:
py-deprecation and py-filetype. For those i attached new ports as
.tgz-files based on /usr/ports/devel. 
If another format as .tgz is preferred for new ports, please tell me, 
which one. (This is the first time i submit a new port)

Tested the new version on three amd64-systems by tagging one cd and
reading those tags, as well as changed the genre afterwards.

Index: Makefile
===
RCS file: /cvs/ports/audio/py-eyed3/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile29 Feb 2020 15:54:33 -  1.21
+++ Makefile23 Mar 2020 13:45:38 -
@@ -2,12 +2,14 @@
 
 COMMENT=   module and program for processing ID3 tags
 
-MODPY_EGG_VERSION= 0.8.12
+MODPY_EGG_VERSION= 0.9.4
 DISTNAME=  eyeD3-${MODPY_EGG_VERSION}
 CATEGORIES=audio
 
 HOMEPAGE=  http://eyed3.nicfit.net/
 
+MAINTAINER =   Martin Ziemer 
+
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
@@ -17,7 +19,9 @@ MODULES=  lang/python
 # standalone software - intentionally no py-* prefix/FLAVOR.
 MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
 RUN_DEPENDS=   devel/py-magic${MODPY_FLAVOR} \
-   devel/py-six${MODPY_FLAVOR}
+   devel/py-six${MODPY_FLAVOR} \
+   devel/py-filetype${MODPY_FLAVOR} \
+   devel/py-deprecation${MODPY_FLAVOR}
 
 MODPY_SETUPTOOLS=  Yes
 
Index: distinfo
===
RCS file: /cvs/ports/audio/py-eyed3/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo28 Dec 2019 15:13:25 -  1.8
+++ distinfo23 Mar 2020 13:45:38 -
@@ -1,2 +1,2 @@
-SHA256 (eyeD3-0.8.12.tar.gz) = 5U7sCgP7jn6ei1CVRsbZLvvIcep1l2Ef4sFvA+HJS20=
-SIZE (eyeD3-0.8.12.tar.gz) = 214073
+SHA256 (eyeD3-0.9.4.tar.gz) = EQmUZOQ4wRodcB5yOlBlwVVvtZh4rZ3OKfkk2sOgepY=
+SIZE (eyeD3-0.9.4.tar.gz) = 222818
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/py-eyed3/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   28 Dec 2019 15:13:26 -  1.5
+++ pkg/PLIST   23 Mar 2020 13:45:38 -
@@ -14,10 +14,9 @@ lib/python${MODPY_VERSION}/site-packages
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__about__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/eyed3/compat.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/${MODPY_PYCACHE}mimetype.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/eyed3/core.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/__init__.py
@@ -32,6 +31,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/headers.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/id3/tag.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/main.py
+lib/python${MODPY_VERSION}/site-packages/eyed3/mimetype.py
 lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/
 lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/eyed3/mp3/${MODPY_PYCACHE}/
@@ -46,28 +46,36 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}art.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}classic.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}display.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}extract.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}fixup.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}genres.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}itunes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}jsontag.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}lameinfo.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/eyed3/plugins/${MODPY_PYCACHE}lastfm.${MODPY_PYC_MA

UPDATE: net/qbittorrent 4.2.1 to 4.2.2

2020-03-25 Thread Elias M. Mariani
Update for net/qbittorrent/qbittorrent and net/qbittorrent/qbittorrent-nox

Changelog:
https://github.com/qbittorrent/qBittorrent/blob/release-4.2.2/Changelog

Important change:
- SEARCH: Drop python2 support

So jumping from lang/python/2.7 to lang/python/3.7, this is only a
RUN_DEPENDS for the search plugins.

Tested OK on amd64.

Taking MAINTAINER (again...)

OKs?

Cheers.
Elias mariani@


qbittorrent-4.2.2.diff
Description: Binary data