CVS: cvs.openbsd.org: ports

[Kent R . Spillner]

CVSROOT:/cvs
Module name:ports
Changes by: kspill...@cvs.openbsd.org   2018/05/28 22:11:54

Modified files:
infrastructure/db: user.list 
productivity/taskd: Makefile 
productivity/taskd/pkg: PLIST 

Log message:
Reserve uid 734 for _taskd, and make uid & gid match.  Also tweak
MASTER_SITES and remove unnecessary CONFIGURE_ENV while here.  Reported by
espie@ & viq, with suggestions from kn@ and sthen@.

ok sthen@

Re: [NEW] devel/py-pandas

[Elias M. Mariani]

Decided to change the way in witch the regression test is performed.
New version attached.

2018-05-27 14:31 GMT-03:00 Elias M. Mariani :
> pandas is a Python package providing fast, flexible, and expressive
> data structures designed to make working with "relational" or
> "labeled" data both easy and intuitive. It aims to be the fundamental
> high-level building block for doing practical, real world data
> analysis in Python. Additionally, it has the broader goal of becoming
> the most powerful and flexible open source data analysis /
> manipulation tool available in any language. It is already well on its
> way toward this goal.
>
> Here is the result of a fast pytest test:
>  7 failed, 23637 passed, 2470 skipped, 77 xfailed, 22 xpassed, 4
> warnings in 17223.28 seconds
>
> I added some dependencies to TEST_DEPENDS to avoid some of the skipped
> tests (it takes to long to run a full test suite, but the code is
> clearly working).
>
> The only problem that I encountered is that the "make test" should be
> done after "make fake", against the fake directory, because the port
> builds some C libraries that are needed in place, if this is a big
> problem (clearly at least an ugly one...) I can make a test flavor to
> do a different kind of "in place" build to allow the test to be done
> without the fake framework but mixing this with the python3 flavor
> seems adding complexity for nothing in my opinion.
> if you run:
> make fake
> make test
> The tests run fine and return the results without a problem if you
> need to see the regression tests in an interactive way.
> I do not know if the test are done in bulk or something that might be
> a problem with this.
>
> Beside that the fails are minor and it tests A LOT of thinks that 7
> failures are because timezone in the test machine is not set to UTC
> and for the lack of some test dependencies that I already added
> (py-html5lib) for example... the documentation about the test suite is
> kind of lacking in the project buy it covers pretty everything.
>
> Looking for opinions, OKs and someone to commit.
> :)
>
> Attached and available in openbsd-wip if someone else want to see/edit
> the files online.
>
> Cheers.
> Elias.


py-pandas.tar.gz
Description: GNU Zip compressed data

[NEW] devel/py-test-timeout

[Elias M. Mariani]

Is a plugin which will terminate tests after a certain timeout.
When doing so it will show a stack dump of all threads running at
the time. This is useful when running tests under a continuous
integration server or simply if you don't know why the test suite
hangs.

Done tests in python 2.7 and 3.6:
test_pytest_timeout.py ...   [100%]
31 passed in 67.49 seconds

Looking for OK and someone to commit to CVS.
Needed for other test suites that require pytest-timeout.

Thanks.
Elias.


py-test-timeout.tar.gz
Description: GNU Zip compressed data

Re: [update] davical & awl [was: www/awl needs update to work with PHP 7, breaks productivity/davical]

[Nigel Taylor]

Somewhere along with the various updates, something slightly different
has ended up going into CVS for www/awl and is broken. Fix to bring back
to what I think was intended - GITLAB_PROJECT is no longer defined.

$ cvs -R -q diff -uNp
Index: Makefile
===
RCS file: /home/cvs/ports/www/awl/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile28 May 2018 20:19:41 -  1.12
+++ Makefile29 May 2018 00:12:32 -
@@ -15,8 +15,7 @@ MASTER_SITES =https://www.davical.org/d

 WRKSRC =   ${WRKDIR}
 PREFIX =   ${VARBASE}/www
-WRKDIST =  ${WRKDIR}/${GITLAB_PROJECT}.git
-INSTDIR =  ${PREFIX}/${GITLAB_PROJECT}
+INSTDIR =  ${PREFIX}/awl
 SUBST_VARS =   INSTDIR
 NO_BUILD = Yes
 NO_TEST =  Yes


On 05/28/18 12:54, Stuart Henderson wrote:
> On 2018/05/28 12:26, viq wrote:
>> On Sun, 27 May 2018, 22:17 Landry Breuil,  wrote:
>>
>>> On Sun, May 27, 2018 at 10:01:22PM +0200, Landry Breuil wrote:
 On Sun, May 27, 2018 at 09:56:25PM +0200, Landry Breuil wrote:
> On Sun, May 27, 2018 at 09:41:26PM +0200, viq wrote:
>> On Sun, May 27, 2018 at 10:19 AM, Landry Breuil 
>>> wrote:
>>
>>> On Sun, May 27, 2018 at 09:59:49AM +0200, viq wrote:
 Currently davical is broken with PHP 7 due to old version of AWL
>>> that
 doesn't work there.
 I'll try and cook up an update, but feel free to beat me to it ;)
>>>
>>> Per https://gitlab.com/davical-project/awl/blob/master/ChangeLog
>>> there's
>>> been some php7 changes, how 'broken' is davical ?
>>>
>>
>> Getting 408 and following error:
>> PHP message: PHP Fatal error:  'break' not in the 'loop' or 'switch'
>> context in /awl/inc/AwlQuery.php on line 261
>> and sync clients don't work, so "very".
>>
>>
>>> https://gitlab.com/davical-project/awl/issues/11 ? one of
>>> https://gitlab.com/davical-project/awl/issues ?
>>
>>
>> This specific error seems to be addressed by
>> https://gitlab.com/davical-project/awl/merge_requests/6
>
> Good, so a first shot would be to update to 0.56 as it contains this
>>> MR,
> and then eventually updating awk & davical together in a second time.

 Oh well according to

>>> https://gitlab.com/davical-project/davical/commit/348532e13b8a8377aa069bdd1cb98eb5d9f00da9
 davical needs an update too to work with php7. Blarf.
>>>
>>> So here are two quick diffs, totally untested yet, but cant be worse
>>> than being broken with php 7.
>>>
>>
>> I may have gotten rusty, but those diffs fail to apply for me.
>>
>>>
> 
> Ha, how old was the tree you diffed from Landry?! :-)
> 
> Here it is rebased against -current
> 
> 
> Index: productivity/davical/Makefile
> ===
> RCS file: /cvs/ports/productivity/davical/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- productivity/davical/Makefile 22 May 2018 08:18:08 -  1.20
> +++ productivity/davical/Makefile 28 May 2018 11:54:02 -
> @@ -1,38 +1,36 @@
> -# $OpenBSD: Makefile,v 1.20 2018/05/22 08:18:08 sthen Exp $
> +# $OpenBSD: Makefile,v 1.19 2017/03/24 18:29:37 landry Exp $
>  
>  COMMENT =CalDAV/CardDav calendar/contacts server
>  
> -GITLAB_PROJECT = davical
> -GITLAB_ACCOUNT = davical-project
> -GITLAB_TAG = r1.1.3.1
> -DISTNAME =   ${GITLAB_PROJECT}-${GITLAB_TAG:S/r//}
> +DISTNAME =   davical_1.1.7.orig
> +PKGNAME =davical-1.1.7
> +EXTRACT_SUFX =   .tar.xz
>  CATEGORIES = productivity net
> -REVISION =   4
>  
>  HOMEPAGE =   http://www.davical.org/
> +MASTER_SITES =   https://www.davical.org/downloads/
>  
>  MAINTAINER = Landry Breuil 
>  
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -MASTER_SITES =   https://rhaalovely.net/stuff/
> -
> +WRKSRC=  ${WRKDIR}
>  MODULES =lang/php
>  PREFIX = ${VARBASE}/www
>  INSTDIR =${PREFIX}/davical
> -WRKDIST =${WRKDIR}/${GITLAB_PROJECT}.git
>  TINSTDIR =   ${TRUEPREFIX}/davical
>  
>  SUBST_VARS = TINSTDIR
>  
>  RUN_DEPENDS +=   lang/php/${MODPHP_VERSION},-curl \
>   lang/php/${MODPHP_VERSION},-pdo_pgsql \
> - www/awl>=0.55 \
> + www/awl>=0.59 \
>   devel/p5-YAML \
>   databases/p5-DBD-Pg
>  
>  NO_BUILD =   Yes
> +# some tests but makefile need patching
>  NO_TEST =Yes
>  PKG_ARCH =   *
>  
> Index: productivity/davical/distinfo
> ===
> RCS file: /cvs/ports/productivity/davical/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- productivity/davical/distinfo 23 Nov 2014 08:48:27 -  1.3
> +++ productivity/davical/distinfo 28 May 2018 11:54:02 -
> @@ -1,2 +1,2 @@
> -SHA256 (davical-1.1.3.1.tar.gz) = 
> RDnC3wBSJBtlxh608LEMQG2Tr9ZaXMa1I7WXwKewXBU=
> -SIZE (davical-1.1.3.1.tar.gz) = 3031220
> +SHA256 

Re: portimport: reminder to commit db/user.list

[Vadim Zhukov]

2018-05-29 0:54 GMT+03:00 Stuart Henderson :
> On 2018/05/28 19:22, Vadim Zhukov wrote:
>> 28 мая 2018 г. 15:39:29 GMT+03:00, Stuart Henderson  
>> пишет:
>> >Does anyone have a port to import with a new uid/gid they could test
>> >this with please? :-)
>> >
>> >Index: portimport
>> >===
>> >RCS file: /cvs/ports/infrastructure/bin/portimport,v
>> >retrieving revision 1.5
>> >diff -u -p -r1.5 portimport
>> >--- portimport   9 Feb 2014 15:10:49 -   1.5
>> >+++ portimport   28 May 2018 12:38:36 -
>> >@@ -62,6 +62,7 @@ cvs -n -d$cvsroot import ports/$pkgpath
>> > read ans?'Does this look correct? [y/n] '
>> > if [[ $ans == +(y|Y) ]]; then
>> > cvs -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp
>> >+grep -q "^@new" pkg/P* && echo "New users/groups, remember to commit
>> >infrastructure/db/user.list!"
>> > cd "$portsdir/${pkgpath%/*}"
>> > cvs -d$cvsroot update -AdP ${pkgpath##*/}
>> > echo "Don't forget to commit the ${pkgpath%/*}/Makefile when you're
>> >done!"
>>
>> This looks like more a job for portcheck, which is run by portimport anyway. 
>> I'll cook a tweak ASAP.
>> --
>>   WBR,
>> Vadim Zhukov
>
> The presence is checked in ports tools now, this is just a reminder to
> actually commit it. portcheck is the wrong place for that, it wants to
> be right at the end with the "commit the makefile" reminderso it's
> not forgotten.

I've got your point, thanks. Please disregard the portcheck diff on
ports@ then, and sorry for the noise.

--
  WBR,
  Vadim Zhukov

Re: portimport: reminder to commit db/user.list

[Stuart Henderson]

On 2018/05/28 19:22, Vadim Zhukov wrote:
> 28 мая 2018 г. 15:39:29 GMT+03:00, Stuart Henderson  
> пишет:
> >Does anyone have a port to import with a new uid/gid they could test
> >this with please? :-)
> >
> >Index: portimport
> >===
> >RCS file: /cvs/ports/infrastructure/bin/portimport,v
> >retrieving revision 1.5
> >diff -u -p -r1.5 portimport
> >--- portimport   9 Feb 2014 15:10:49 -   1.5
> >+++ portimport   28 May 2018 12:38:36 -
> >@@ -62,6 +62,7 @@ cvs -n -d$cvsroot import ports/$pkgpath 
> > read ans?'Does this look correct? [y/n] '
> > if [[ $ans == +(y|Y) ]]; then
> > cvs -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp
> >+grep -q "^@new" pkg/P* && echo "New users/groups, remember to commit
> >infrastructure/db/user.list!"
> > cd "$portsdir/${pkgpath%/*}"
> > cvs -d$cvsroot update -AdP ${pkgpath##*/}
> > echo "Don't forget to commit the ${pkgpath%/*}/Makefile when you're
> >done!"
> 
> This looks like more a job for portcheck, which is run by portimport anyway. 
> I'll cook a tweak ASAP.
> -- 
>   WBR,
> Vadim Zhukov

The presence is checked in ports tools now, this is just a reminder to
actually commit it. portcheck is the wrong place for that, it wants to
be right at the end with the "commit the makefile" reminderso it's
not forgotten.

Re: About regression tests

[Stuart Henderson]

On 2018/05/28 17:14, Elias M. Mariani wrote:
> I'm working on several python ports that make use of py-test, for now:
> - py-test-timeout
> - py-pandas
> 
> pytest-timeout uses itself as a test (duh...) but when calling "pytest
> --timeout 1" for example, pytest does not recognizes the "--timeout 1"
> option from the timeout plugin because is not installed (even when it
> recognizes the plugin because it prints: "plugins: timeout".
> If I install the plugin and then run the test it runs with 0 errors.
> I would like to know what uses are given to the test part of the ports
> tree, if its only for check updates of the port I could add
> pytest-timeout as a test dependency of itself and a bizarre workflow
> of:
> fetch-build-test-install-test would happen.
> Or I could just mark the plugin as "NO_TEST".
> 
> py-pandas case is explained in a previous mail:
> https://marc.info/?l=openbsd-ports=152744244418530
> 
> Cheers.
> Elias.
> 

TEST_DEPENDS on the current port is fine, it's not particularly unusual,
especially with python things.

Re: portimport: reminder to commit db/user.list

[Antoine Jacoutot]

On Mon, May 28, 2018 at 07:22:29PM +0300, Vadim Zhukov wrote:
> 28 мая 2018 г. 15:39:29 GMT+03:00, Stuart Henderson  
> пишет:
> >Does anyone have a port to import with a new uid/gid they could test
> >this with please? :-)
> >
> >Index: portimport
> >===
> >RCS file: /cvs/ports/infrastructure/bin/portimport,v
> >retrieving revision 1.5
> >diff -u -p -r1.5 portimport
> >--- portimport   9 Feb 2014 15:10:49 -   1.5
> >+++ portimport   28 May 2018 12:38:36 -
> >@@ -62,6 +62,7 @@ cvs -n -d$cvsroot import ports/$pkgpath 
> > read ans?'Does this look correct? [y/n] '
> > if [[ $ans == +(y|Y) ]]; then
> > cvs -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp
> >+grep -q "^@new" pkg/P* && echo "New users/groups, remember to commit
> >infrastructure/db/user.list!"
> > cd "$portsdir/${pkgpath%/*}"
> > cvs -d$cvsroot update -AdP ${pkgpath##*/}
> > echo "Don't forget to commit the ${pkgpath%/*}/Makefile when you're
> >done!"
> 
> This looks like more a job for portcheck, which is run by portimport anyway. 
> I'll cook a tweak ASAP.

Well, I've never used either portcheck nor portimport but from my understanding
it makes more sense to have this in portimport because that's a reminder for a
commit, not a syntaxt or whatever issue.

-- 
Antoine

Update lang/sbcl to 1.4.8

[Josh Elsasser]

This updates sbcl to 1.4.8 and removes patches which have been
upstreamed. Tests look good on i386 and amd64, macppc is still
running.

I removed the egcc dependency on i386. It was originally added to
prevent a C stack alignment test failure, but this apparently hasn't
worked since base switched to clang. Might as well build with base
clang now since egcc no longer helps. Also belatedly update the nearby
sed command to use sed -i

Note that this adds and removes patch files.

Index: Makefile
===
RCS file: /cvs/ports/lang/sbcl/Makefile,v
retrieving revision 1.37
diff -u -u -r1.37 Makefile
--- Makefile27 Apr 2018 16:25:12 -  1.37
+++ Makefile28 May 2018 19:50:23 -
@@ -6,7 +6,7 @@
 
 COMMENT=   compiler and runtime system for ANSI Common Lisp
 
-V =1.4.6
+V =1.4.8
 DISTNAME=  sbcl-${V}-source
 PKGNAME=   sbcl-${V}
 WRKDIST=   ${WRKDIR}/sbcl-${V}
@@ -21,10 +21,6 @@
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=sbcl/}
 
-MODULES=   gcc4
-MODGCC4_ARCHS= i386
-MODGCC4_LANGS= c
-
 WANTLIB=   c m util
 
 PSEUDO_FLAVORS=native_bootstrap
@@ -66,10 +62,7 @@
 VERSION_FILE = ${WRKSRC}/version.lisp-expr
 
 pre-configure:
-   sed 's/^"\([0-9.]*\)"$$/"\1.${LOCAL_VERSION}"/' \
-   < ${VERSION_FILE} > ${VERSION_FILE}.new
-   mv ${VERSION_FILE}.new ${VERSION_FILE}
-   sed -i 's,egcc,${CC},g' ${WRKSRC}/src/runtime/Config.*-openbsd
+   sed -i 's/^"\([0-9.]*\)"$$/"\1.${LOCAL_VERSION}"/' ${VERSION_FILE}
 
 do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} /bin/sh make.sh \
Index: distinfo
===
RCS file: /cvs/ports/lang/sbcl/distinfo,v
retrieving revision 1.15
diff -u -u -r1.15 distinfo
--- distinfo27 Apr 2018 16:25:12 -  1.15
+++ distinfo28 May 2018 19:50:23 -
@@ -1,2 +1,2 @@
-SHA256 (sbcl-1.4.6-source.tar.bz2) = 
RBGwEynU3VMcigy0A2Ri+0/V9uer4tUhxqoqOt77hng=
-SIZE (sbcl-1.4.6-source.tar.bz2) = 6025790
+SHA256 (sbcl-1.4.8-source.tar.bz2) = 
ziS2K4hIJiHCKKT9bIAjUDMLYmPhsbmEYO60qB1/szU=
+SIZE (sbcl-1.4.8-source.tar.bz2) = 6040563
Index: patches/patch-src_code_x86-64-vm_lisp
===
RCS file: patches/patch-src_code_x86-64-vm_lisp
diff -N patches/patch-src_code_x86-64-vm_lisp
--- patches/patch-src_code_x86-64-vm_lisp   8 Mar 2018 15:17:39 -   
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,42 +0,0 @@
-$OpenBSD: patch-src_code_x86-64-vm_lisp,v 1.1 2018/03/08 15:17:39 sthen Exp $
-
-Index: src/code/x86-64-vm.lisp
 src/code/x86-64-vm.lisp.orig
-+++ src/code/x86-64-vm.lisp
-@@ -72,7 +72,7 @@
-(if (eq kind :relative) :relative
-   nil) ; non-immobile-space builds never record code fixups
- 
--#!+(or darwin linux win32)
-+#!+(or darwin linux openbsd win32)
- (define-alien-routine ("os_context_float_register_addr" 
context-float-register-addr)
-   (* unsigned) (context (* os-context-t)) (index int))
- 
-@@ -81,11 +81,11 @@
- 
- (defun context-float-register (context index format)
-   (declare (ignorable context index))
--  #!-(or darwin linux win32)
-+  #!-(or darwin linux openbsd win32)
-   (progn
- (warn "stub CONTEXT-FLOAT-REGISTER")
- (coerce 0 format))
--  #!+(or darwin linux win32)
-+  #!+(or darwin linux openbsd win32)
-   (let ((sap (alien-sap (context-float-register-addr context index
- (ecase format
-   (single-float
-@@ -101,11 +101,11 @@
- 
- (defun %set-context-float-register (context index format value)
-   (declare (ignorable context index format))
--  #!-(or linux win32)
-+  #!-(or linux openbsd win32)
-   (progn
- (warn "stub %SET-CONTEXT-FLOAT-REGISTER")
- value)
--  #!+(or linux win32)
-+  #!+(or linux openbsd win32)
-   (let ((sap (alien-sap (context-float-register-addr context index
- (ecase format
-   (single-float
Index: patches/patch-src_runtime_Config_x86-openbsd
===
RCS file: patches/patch-src_runtime_Config_x86-openbsd
diff -N patches/patch-src_runtime_Config_x86-openbsd
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_runtime_Config_x86-openbsd28 May 2018 19:50:23 
-
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: src/runtime/Config.x86-openbsd
+--- src/runtime/Config.x86-openbsd.orig
 src/runtime/Config.x86-openbsd
+@@ -14,10 +14,9 @@ include Config.generic-openbsd
+ 
+ ASSEM_SRC += ldso-stubs.S
+ 
+-CC = egcc
+ 
+ # The -Z linker flag conflicts with the default address space
+ # locations used. If you wish to link the runtime using -Z option then
+ # please see the comments in src/compiler/x86/parms.lisp
+ 
+-CFLAGS += -fno-omit-frame-pointer -mpreferred-stack-boundary=2
++CFLAGS += -fno-omit-frame-pointer
Index: 

About regression tests

[Elias M. Mariani]

I'm working on several python ports that make use of py-test, for now:
- py-test-timeout
- py-pandas

pytest-timeout uses itself as a test (duh...) but when calling "pytest
--timeout 1" for example, pytest does not recognizes the "--timeout 1"
option from the timeout plugin because is not installed (even when it
recognizes the plugin because it prints: "plugins: timeout".
If I install the plugin and then run the test it runs with 0 errors.
I would like to know what uses are given to the test part of the ports
tree, if its only for check updates of the port I could add
pytest-timeout as a test dependency of itself and a bizarre workflow
of:
fetch-build-test-install-test would happen.
Or I could just mark the plugin as "NO_TEST".

py-pandas case is explained in a previous mail:
https://marc.info/?l=openbsd-ports=152744244418530

Cheers.
Elias.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/05/28 14:19:41

Modified files:
www/awl: Makefile distinfo 
www/awl/pkg: PLIST 

Log message:
Unbreak with php 7 by updating to 0.59.

Re: [update] davical & awl [was: www/awl needs update to work with PHP 7, breaks productivity/davical]

[viq]

On 18-05-28 12:54:43, Stuart Henderson wrote:
> On 2018/05/28 12:26, viq wrote:
> > On Sun, 27 May 2018, 22:17 Landry Breuil,  wrote:
> > 
> > > On Sun, May 27, 2018 at 10:01:22PM +0200, Landry Breuil wrote:
> > > > On Sun, May 27, 2018 at 09:56:25PM +0200, Landry Breuil wrote:
> > > > > On Sun, May 27, 2018 at 09:41:26PM +0200, viq wrote:
> > > > > > On Sun, May 27, 2018 at 10:19 AM, Landry Breuil 
> > > wrote:
> > > > > >
> > > > > > > On Sun, May 27, 2018 at 09:59:49AM +0200, viq wrote:
> > > > > > > > Currently davical is broken with PHP 7 due to old version of AWL
> > > that
> > > > > > > > doesn't work there.
> > > > > > > > I'll try and cook up an update, but feel free to beat me to it 
> > > > > > > > ;)
> > > > > > >
> > > > > > > Per https://gitlab.com/davical-project/awl/blob/master/ChangeLog
> > > there's
> > > > > > > been some php7 changes, how 'broken' is davical ?
> > > > > > >
> > > > > >
> > > > > > Getting 408 and following error:
> > > > > > PHP message: PHP Fatal error:  'break' not in the 'loop' or 'switch'
> > > > > > context in /awl/inc/AwlQuery.php on line 261
> > > > > > and sync clients don't work, so "very".
> > > > > >
> > > > > >
> > > > > > > https://gitlab.com/davical-project/awl/issues/11 ? one of
> > > > > > > https://gitlab.com/davical-project/awl/issues ?
> > > > > >
> > > > > >
> > > > > > This specific error seems to be addressed by
> > > > > > https://gitlab.com/davical-project/awl/merge_requests/6
> > > > >
> > > > > Good, so a first shot would be to update to 0.56 as it contains this
> > > MR,
> > > > > and then eventually updating awk & davical together in a second time.
> > > >
> > > > Oh well according to
> > > >
> > > https://gitlab.com/davical-project/davical/commit/348532e13b8a8377aa069bdd1cb98eb5d9f00da9
> > > > davical needs an update too to work with php7. Blarf.
> > >
> > > So here are two quick diffs, totally untested yet, but cant be worse
> > > than being broken with php 7.
> > >
> > 
> > I may have gotten rusty, but those diffs fail to apply for me.
> > 
> > >
> 
> Ha, how old was the tree you diffed from Landry?! :-)
> 
> Here it is rebased against -current
 
This applies, builds and updates. Calendar programs (gnome-calendar,
DAVdriod) seem to sync.

It wanted to update schema, took me a moment to figure out that I need
to run again
psql -U davical_dba -f /var/www/davical/dba/davical.sql davical
before running the /var/www/davical/dba/update-davical-database script.

One rather unrelated but puzzling issue is that I keep getting 404 for
all web resources (css, js) with following httpd config:
server "cal.example.com" {
listen on $ext_addr port 80
block return 301 "https://cal.example.com$REQUEST_URI;
location "/.well-known/acme-challenge/*" {
root "/acme"
root strip 2
pass
}
}

server "cal.example.com" {
listen on $ext_addr tls port 443

tls certificate "/etc/ssl/cal.example.com.fullchain.pem"
tls key "/etc/ssl/private/cal.example.com.key"
hsts

log { access "davical-access.log", error "davical-error.log" }

connection { max requests 500, timeout 3600 }
location "/" { directory index index.php }
location "/*.php*" {
fastcgi socket "/run/php-fpm.sock"
root "/davical/htdocs"
}
}

 
> Index: productivity/davical/Makefile
> ===
> RCS file: /cvs/ports/productivity/davical/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- productivity/davical/Makefile 22 May 2018 08:18:08 -  1.20
> +++ productivity/davical/Makefile 28 May 2018 11:54:02 -
> @@ -1,38 +1,36 @@
> -# $OpenBSD: Makefile,v 1.20 2018/05/22 08:18:08 sthen Exp $
> +# $OpenBSD: Makefile,v 1.19 2017/03/24 18:29:37 landry Exp $
>  
>  COMMENT =CalDAV/CardDav calendar/contacts server
>  
> -GITLAB_PROJECT = davical
> -GITLAB_ACCOUNT = davical-project
> -GITLAB_TAG = r1.1.3.1
> -DISTNAME =   ${GITLAB_PROJECT}-${GITLAB_TAG:S/r//}
> +DISTNAME =   davical_1.1.7.orig
> +PKGNAME =davical-1.1.7
> +EXTRACT_SUFX =   .tar.xz
>  CATEGORIES = productivity net
> -REVISION =   4
>  
>  HOMEPAGE =   http://www.davical.org/
> +MASTER_SITES =   https://www.davical.org/downloads/
>  
>  MAINTAINER = Landry Breuil 
>  
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -MASTER_SITES =   https://rhaalovely.net/stuff/
> -
> +WRKSRC=  ${WRKDIR}
>  MODULES =lang/php
>  PREFIX = ${VARBASE}/www
>  INSTDIR =${PREFIX}/davical
> -WRKDIST =${WRKDIR}/${GITLAB_PROJECT}.git
>  TINSTDIR =   ${TRUEPREFIX}/davical
>  
>  SUBST_VARS = TINSTDIR
>  
>  RUN_DEPENDS +=   lang/php/${MODPHP_VERSION},-curl \
>   lang/php/${MODPHP_VERSION},-pdo_pgsql \
> - www/awl>=0.55 \
> + www/awl>=0.59 \
>   devel/p5-YAML \
>   databases/p5-DBD-Pg
>  
>  NO_BUILD =   Yes
> +# some tests but makefile need patching
>  NO_TEST =Yes
>  PKG_ARCH =   *
>  
> 

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/05/28 14:20:46

Modified files:
productivity/davical: Makefile distinfo 
productivity/davical/pkg: PLIST 

Log message:
Unbreak with php 7 by updating to 1.1.7.

Tested with php 7 on 6.3, syncing events between thunderbird and davdroid.

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/05/28 13:21:24

Modified files:
devel/p5-Class-Date: Makefile distinfo 
devel/p5-Class-Date/patches: patch-lib_Class_Date_pm 
devel/p5-Class-Date/pkg: PLIST 
Removed files:
devel/p5-Class-Date/patches: patch-MANIFEST 

Log message:
update p5-Class-Date to 1.1.16

Re: devel/jdk: compile unsafe module with reduced optimization level

[Mike Belopuhov]

On Fri, May 25, 2018 at 14:07 -0400, Kurt Miller wrote:
> > Hi,
> > 
> > This appears to be the same issue as described here:
> > 
> >   https://bugs.openjdk.java.net/browse/JDK-8022407
> > 
> > that I can trigger with the following test case (SIGSEGV on a null
> > pointer):
> > 
> >   https://gist.github.com/mbelop/6ebb11d7e583562279abfb2e3b733fa5
> > 
> > Regards,
> > Mike
> 
> Thank Mike for the investigation, test case and patch!
> 
> I'm testing update 172b11 now with a slightly different version of the
> patch. I will commit this upstream and update the port this weekend.
>

Thanks, your work is greatly appreciated.

Your patch works for me as well.  I'm not certain about hardcoding
a Clang 6.0 version but I'll leave it to your discretion.

Cheers,
Mike

> -Kurt
> 
> diff -r 749852fe39a6 make/bsd/makefiles/gcc.make
> --- a/make/bsd/makefiles/gcc.make   Sat May 19 23:14:15 2018 -0700
> +++ b/make/bsd/makefiles/gcc.make   Fri May 25 13:56:03 2018 -0400
> @@ -328,6 +328,9 @@
>  OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
>  OPT_CFLAGS/unsafe.o += -O1
>    endif
> +  ifeq ($(shell expr $(CC_VER_MAJOR) = 6 \& $(CC_VER_MINOR) = 0), 1)
> +OPT_CFLAGS/unsafe.o += -O1
> +  endif
>  else
>    # 6835796. Problem in GCC 4.3.0 with mulnode.o optimized
> compilation.
>    ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1)
> 
> 

Re: productivity/taskd

[Marc Espie]

On Mon, May 28, 2018 at 12:48:23PM +0100, Stuart Henderson wrote:
> Up to 807 now. It's getting to the point we should probably start
> thinking what to do with uids when we approach 1000 as well (or a bit
> less..unless I'm the only one who works down from 1000 for for non-ports
> things that aren't real users :)

That's a dangerous way to do things.

I would probably use much higher uids myself.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/05/28 12:53:19

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
Stop checking if the package is already installed when installing a package.

This was useless since the introduction of INSTALL_COOKIE some years
ago, and lead to a situation where you couldnt install a package with a
flavor when the unflavored package was already installed, even if they
explicitely didnt conflict.

Found out while working on qwt.. might speed up package installs a bit
during bulks, who knows.

went in a bulk without fallout, thanks aja@
ok espie@

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/05/28 12:48:22

Modified files:
geo/qgis   : Makefile 

Log message:
Bump REVISION and fix WANTLIB after qwt split.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/05/28 12:47:45

Modified files:
x11/kde4/smokeqt: Makefile 
x11/kde4/plasma-addons: Makefile 

Log message:
Bump REVISION after qwt split.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/05/28 12:47:00

Modified files:
x11/qwt: Makefile 
Added files:
x11/qwt/patches: patch-designer_designer_pro patch-qwt_prf 
 patch-src_src_pro 
 patch-textengines_textengines_pri 
x11/qwt/pkg: DESCR-common DESCR-main PFRAG.no-qt5-main 
 PFRAG.qt5-main PLIST-common PLIST-main 
Removed files:
x11/qwt/pkg: DESCR PLIST 

Log message:
Rework qwt so that qt4 and qt5 versions can coexist.

Take inspiration from debian and append -qt5 suffix to the library name
for the qt5 FLAVOR.

Split the common headers/manpages/doc into a separate subpackage, put
the library/qt files in another subpackage that depende on the latter
(and that doesnt conflict with 'the other flavor', and finally add the
correct @conflict/@pkgpath markers for proper upgrade path.

Most of the work done by rsadowski@, i just did the polishing with help
from espie@

ok rsadowski@

Add @newuser/@newgroup checks to portcheck

[Vadim Zhukov]

This adds @newuser/@newgroup validation to portcheck, based on user.list.

While the first check (about user/group being registered) should be okay,
the second one probably needs some bikeshedding: now complex ports like
net/icinga will start spewing warnings because, in case of icinga, both
net/icinga/core and net/icinga/core2 install same user/group.

So what way do you want this: with or without pkgpath checking?

--
WBR,
  Vadim Zhukov


Index: portcheck
===
RCS file: /cvs/ports/infrastructure/bin/portcheck,v
retrieving revision 1.117
diff -u -p -r1.117 portcheck
--- portcheck   22 Dec 2017 22:59:53 -  1.117
+++ portcheck   28 May 2018 17:25:08 -
@@ -733,11 +733,12 @@ check_port_dir() {
fi
fi
 
+   pkgpath=${pkgpath:-"$pkgpath_this"}
+
for _s in $multi_packages; do
sub_checks "$dir" "$_s" "${check_flavors[@]}"
done
 
-   pkgpath=${pkgpath:-"$pkgpath_this"}
last_subst_cmd="$subst_cmd"
 }
 
@@ -1014,7 +1015,7 @@ check_plist() {
local readme_seen=false
 
# Temporary ones
-   local app l theme varname py
+   local app l theme varname py id who userline
 
while read -pr l; do
case "$l" in
@@ -1216,6 +1217,21 @@ check_plist() {
;;
"@man "*.gz)
err "${portref}compressed $l"
+   ;;
+
+   # N.B.: The user.list could miss either user or group part
+   "@newuser "*|"@newgroup "*)
+   who=$l
+   who=${l#*[[:space:]]}
+   id=${who#*:}
+   id=${id%%:*}
+   who=${who%%:*}
+   userline="$(awk "/^$id[[:space:]]/ && \$2 == \"$who\"" 
$portsdir/infrastructure/db/user.list)"
+   if [ -z "$userline" ]; then
+   err "${portref}$l is not registered in 
db/user.list"
+   elif [ "${pkgpath%%,*}" != "${userline##*[[:space:]]}" 
]; then
+   err "${portref}$l pkgpath mismatch in 
db/user.list"
+   fi
;;
 
@owner)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/05/28 11:29:01

Modified files:
infrastructure/db: user.list 
net/openvpn_bsdauth: Makefile 
net/openvpn_bsdauth/pkg: PLIST 

Log message:
fix GID for _openvpnusers

Re: fix build mail/mimetic on aarch64 and armv7

[Jeremie Courreges-Anglas]

On Sun, May 27 2018, Markus Hennecke  wrote:
> Fixes the signed/unsigned char problem. Patch tested on amd64, all tests 
> passed on all three archs:

Committed, thanks.  I added a REVISION bump just to be safe; powerpc
also uses unsigned char, but doesn't use clang.

> Index: patches/patch-mimetic_codec_base64_cxx
> ===
> RCS file: patches/patch-mimetic_codec_base64_cxx
> diff -N patches/patch-mimetic_codec_base64_cxx
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-mimetic_codec_base64_cxx27 May 2018 06:11:42 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: mimetic/codec/base64.cxx
> +--- mimetic/codec/base64.cxx.orig
>  mimetic/codec/base64.cxx
> +@@ -13,7 +13,7 @@ const char Base64::sEncTable[] = 
> + "abcdefghijklmnopqrstuvwxyz"
> + "0123456789+/=";
> + 
> +-const char Base64::sDecTable[] = {
> ++const signed char Base64::sDecTable[] = {
> + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
> + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
> + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
> Index: patches/patch-mimetic_codec_base64_h
> ===
> RCS file: patches/patch-mimetic_codec_base64_h
> diff -N patches/patch-mimetic_codec_base64_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-mimetic_codec_base64_h  27 May 2018 06:11:42 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: mimetic/codec/base64.h
> +--- mimetic/codec/base64.h.orig
>  mimetic/codec/base64.h
> +@@ -20,7 +20,7 @@ class Base64
> + enum { default_maxlen = 76 };
> + enum { eq_sign = 100 };
> + static const char sEncTable[];
> +-static const char sDecTable[];
> ++static const signed char sDecTable[];
> + static const int sDecTableSz;
> + public:
> + class Encoder; class Decoder;
>

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

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/05/28 10:46:14

Modified files:
mail/mimetic   : Makefile 
Added files:
mail/mimetic/patches: patch-mimetic_codec_base64_cxx 
  patch-mimetic_codec_base64_h 

Log message:
Unbreak on armv7/arm64, clang + char unsigned by default

from Markus Hennecke

Re: portimport: reminder to commit db/user.list

[Vadim Zhukov]

28 мая 2018 г. 15:39:29 GMT+03:00, Stuart Henderson  
пишет:
>Does anyone have a port to import with a new uid/gid they could test
>this with please? :-)
>
>Index: portimport
>===
>RCS file: /cvs/ports/infrastructure/bin/portimport,v
>retrieving revision 1.5
>diff -u -p -r1.5 portimport
>--- portimport 9 Feb 2014 15:10:49 -   1.5
>+++ portimport 28 May 2018 12:38:36 -
>@@ -62,6 +62,7 @@ cvs -n -d$cvsroot import ports/$pkgpath 
> read ans?'Does this look correct? [y/n] '
> if [[ $ans == +(y|Y) ]]; then
>   cvs -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp
>+  grep -q "^@new" pkg/P* && echo "New users/groups, remember to commit
>infrastructure/db/user.list!"
>   cd "$portsdir/${pkgpath%/*}"
>   cvs -d$cvsroot update -AdP ${pkgpath##*/}
>   echo "Don't forget to commit the ${pkgpath%/*}/Makefile when you're
>done!"

This looks like more a job for portcheck, which is run by portimport anyway. 
I'll cook a tweak ASAP.
-- 
  WBR,
Vadim Zhukov

lang/rust: update to 1.26.1

[Sebastien Marie]

Hi,

rust will have a new 1.26.1 release on 2018-05-29.
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1261-2018-05-29

The following diff update the port (and the PLISTs).

Thanks.
-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile22 May 2018 06:04:33 -  1.68
+++ Makefile28 May 2018 13:11:07 -
@@ -12,7 +12,7 @@ DPB_PROPERTIES =  parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.26.0
+V =1.26.1
 CARGO_V =  0.27.0
 DISTNAME = rustc-${V}-src
 
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo22 May 2018 06:04:33 -  1.35
+++ distinfo28 May 2018 13:11:07 -
@@ -1,8 +1,8 @@
-SHA256 (rust/rustc-1.26.0-src.tar.xz) = 
kDtHJ60MB+Dt+eJ9WWLG5vB/Dzwy4GwPk3vHmgh6Mq8=
+SHA256 (rust/rustc-1.26.1-src.tar.xz) = 
XtIeTC+5LCTPJw5qA4KwAZflsgWdOZ6VKNSLkkVTq2k=
 SHA256 (rust/rustc-bootstrap-aarch64-1.26.0-20180518.tar.xz) = 
zakj9bWFnY6WTfUaov5nz4y3k/6nW5W/mY7Mpd1cNRc=
 SHA256 (rust/rustc-bootstrap-amd64-1.26.0-20180508.tar.xz) = 
zLG8iaYTVbN/7chCkUC+pCuNl6u0YVNd5XEchVOMKYQ=
 SHA256 (rust/rustc-bootstrap-i386-1.26.0-20180509.tar.xz) = 
AFGnEZ5KRPiJFPWPrx8JIb84PHXqISOUQHe959ErYzc=
-SIZE (rust/rustc-1.26.0-src.tar.xz) = 54613664
+SIZE (rust/rustc-1.26.1-src.tar.xz) = 54604108
 SIZE (rust/rustc-bootstrap-aarch64-1.26.0-20180518.tar.xz) = 61904032
 SIZE (rust/rustc-bootstrap-amd64-1.26.0-20180508.tar.xz) = 6671
 SIZE (rust/rustc-bootstrap-i386-1.26.0-20180509.tar.xz) = 67845872
Index: pkg/PFRAG.aarch64-main
===
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.aarch64-main,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.aarch64-main
--- pkg/PFRAG.aarch64-main  22 May 2018 06:04:33 -  1.1
+++ pkg/PFRAG.aarch64-main  28 May 2018 13:11:12 -
@@ -1,117 +1,117 @@
 @comment $OpenBSD: PFRAG.aarch64-main,v 1.1 2018/05/22 06:04:33 landry Exp $
-lib/libarena-b1e006156cb33a16.so
-lib/libfmt_macros-8b5bc4c3304d2c23.so
-lib/libgraphviz-b6ed4d01708543ea.so
-lib/libproc_macro-26d2313606aba707.so
-lib/librustc-fb86fa3c3c2a6219.so
-lib/librustc_allocator-f9c9fa2c36a4e9ed.so
-lib/librustc_back-a397106ed5e5a08f.so
-lib/librustc_borrowck-c3ba13bf88efc13c.so
-lib/librustc_const_math-8badd7619eaeaf4d.so
-lib/librustc_cratesio_shim-bbb926d7cf269dff.so
-lib/librustc_data_structures-d47be38057e0dc8f.so
-lib/librustc_driver-351e906f1f0e969b.so
-lib/librustc_errors-d3c52bdd3a30daec.so
-lib/librustc_incremental-c7b867cbe543dfb7.so
-lib/librustc_lint-3d0da39d2238c094.so
-lib/librustc_metadata-09da9be1328ecd90.so
-lib/librustc_mir-d71325ccbb5613d8.so
-lib/librustc_passes-ec39ae5dda68fe61.so
-lib/librustc_platform_intrinsics-feb7f4800073e433.so
-lib/librustc_plugin-5d45db9ef9857882.so
-lib/librustc_privacy-52fd3591c94f43c6.so
-lib/librustc_resolve-9f54d0d611d47849.so
-lib/librustc_save_analysis-d042944e280260f3.so
-lib/librustc_traits-9a203a9de47d6fae.so
-lib/librustc_trans_utils-4abf45fde42557fa.so
-lib/librustc_typeck-f3a8fcaec9851549.so
-lib/libserialize-44288352d34c3fe5.so
-lib/libstd-911d174ba81e.so
-lib/libsyntax-f98c7cdcabe1794a.so
-lib/libsyntax_ext-40a6b8d9e8cb0527.so
-lib/libsyntax_pos-d0c8ea2f79602468.so
-lib/libterm-52123b2a3420b586.so
-lib/libtest-2b1c1b5ab117683f.so
+lib/libarena-a05d32ee855a0f48.so
+lib/libfmt_macros-845ea9e348fd239e.so
+lib/libgraphviz-6add5380c35bd69f.so
+lib/libproc_macro-edb2bb543516e8dd.so
+lib/librustc-1468eae8f8156ca1.so
+lib/librustc_allocator-6fead7c0ee66b6ec.so
+lib/librustc_back-e754f35d5246908c.so
+lib/librustc_borrowck-fdbf60aa39cb343e.so
+lib/librustc_const_math-ec40b79e0938056c.so
+lib/librustc_cratesio_shim-298443c0050df0b5.so
+lib/librustc_data_structures-f41f54d543ca0c6c.so
+lib/librustc_driver-1e2d8fea70295af8.so
+lib/librustc_errors-27526f31cf70db34.so
+lib/librustc_incremental-df58371ff4b398c2.so
+lib/librustc_lint-1a6334774d9218c9.so
+lib/librustc_metadata-845a78129669dacd.so
+lib/librustc_mir-55878739bb08f0cb.so
+lib/librustc_passes-ebd1b64d312d54c8.so
+lib/librustc_platform_intrinsics-3239fa70c7515a0e.so
+lib/librustc_plugin-3fb93b9057e93b1c.so
+lib/librustc_privacy-c72cdb22e5a935bb.so
+lib/librustc_resolve-b969dbe22b5f07e2.so
+lib/librustc_save_analysis-a4ef8babb83c12df.so
+lib/librustc_traits-263ae7756e01b7a0.so
+lib/librustc_trans_utils-bd2dada968da129a.so
+lib/librustc_typeck-cf9148d140a73356.so
+lib/libserialize-530f1e558062578e.so
+lib/libstd-0b30fd8530287a87.so
+lib/libsyntax-32fc1fbbddff27e7.so
+lib/libsyntax_ext-9f89425456ee79cf.so
+lib/libsyntax_pos-c960f651ca9da17e.so
+lib/libterm-b56c3d40677efb8f.so

Re: New port - lv2 (LADSPA V2)

[Ken M]

So in moving the port over to an i386 install to test I found a problem I am not
sure how to fix.

The port is looking for /usr/local/bin/python which on the machine I set up is a
symlink to /usr/local/bin/python2.  In short I need to tweak this to look for
python2 specifically and not count on that symlink.

How can I make the MODPY_BIN look for that instead. Just hard code it earlier.
That seems fragile to me.

Sorry I am a beginner at this but trying to get myself up to speed.

Ken

On Thu, May 24, 2018 at 11:04:29PM -0400, Ken M wrote:
> First time submitting a port, and pretty new to it all anyway.
> 
> I have tested/built this on amd64 only. It is a pre-requisite to getting some
> other audio software ported over. So call it baby step #1.
> 
> Ken

Re: portimport: reminder to commit db/user.list

[Antoine Jacoutot]

On Mon, May 28, 2018 at 01:39:29PM +0100, Stuart Henderson wrote:
> Does anyone have a port to import with a new uid/gid they could test
> this with please? :-)
> 
> Index: portimport
> ===
> RCS file: /cvs/ports/infrastructure/bin/portimport,v
> retrieving revision 1.5
> diff -u -p -r1.5 portimport
> --- portimport9 Feb 2014 15:10:49 -   1.5
> +++ portimport28 May 2018 12:38:36 -
> @@ -62,6 +62,7 @@ cvs -n -d$cvsroot import ports/$pkgpath 
>  read ans?'Does this look correct? [y/n] '
>  if [[ $ans == +(y|Y) ]]; then
>   cvs -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp
> + grep -q "^@new" pkg/P* && echo "New users/groups, remember to commit 
> infrastructure/db/user.list!"

Maybe this instead? In case another @newfoobar is introduced at some point.

grep -E "^@new(user|group)" pkg/P*

>   cd "$portsdir/${pkgpath%/*}"
>   cvs -d$cvsroot update -AdP ${pkgpath##*/}
>   echo "Don't forget to commit the ${pkgpath%/*}/Makefile when you're 
> done!"
> 

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/05/28 06:44:30

Modified files:
security/nss/patches: patch-nss_lib_freebl_unix_urandom_c 

Log message:
add link to upstream commit

portimport: reminder to commit db/user.list

[Stuart Henderson]

Does anyone have a port to import with a new uid/gid they could test
this with please? :-)

Index: portimport
===
RCS file: /cvs/ports/infrastructure/bin/portimport,v
retrieving revision 1.5
diff -u -p -r1.5 portimport
--- portimport  9 Feb 2014 15:10:49 -   1.5
+++ portimport  28 May 2018 12:38:36 -
@@ -62,6 +62,7 @@ cvs -n -d$cvsroot import ports/$pkgpath 
 read ans?'Does this look correct? [y/n] '
 if [[ $ans == +(y|Y) ]]; then
cvs -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp
+   grep -q "^@new" pkg/P* && echo "New users/groups, remember to commit 
infrastructure/db/user.list!"
cd "$portsdir/${pkgpath%/*}"
cvs -d$cvsroot update -AdP ${pkgpath##*/}
echo "Don't forget to commit the ${pkgpath%/*}/Makefile when you're 
done!"

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2018/05/28 06:27:41

Added files:
audio/adplug/patches: patch-src_herad_cpp patch-src_herad_h 

Log message:
Remove UTF-8 BOM from src/herad.{cpp,h}.

This fixes build on GCC arches, as GCC 4.2.1 chokes on it otherwise.

>From Donovan Watteau, thanks!

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/05/28 06:25:20

Modified files:
infrastructure/db: user.list 
news/sabnzbd   : Makefile 
news/sabnzbd/pkg: PLIST 

Log message:
fix UID for news/sabnzbd, spotted by espie
regen PLIST

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/05/28 06:17:12

Modified files:
infrastructure/db: user.list 
net/ntopng : Makefile 
net/ntopng/pkg : PLIST 

Log message:
fix UID for net/ntopng, spotted by espie
regen PLIST

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/05/28 06:01:57

Modified files:
infrastructure/db: user.list 
multimedia/motion: Makefile 
multimedia/motion/pkg: DESCR PLIST 

Log message:
fix uid for multimedia/motion, spotted by espie
regen PLIST
zap old line from DESCR

Re: [update] davical & awl [was: www/awl needs update to work with PHP 7, breaks productivity/davical]

[Stuart Henderson]

On 2018/05/28 12:26, viq wrote:
> On Sun, 27 May 2018, 22:17 Landry Breuil,  wrote:
> 
> > On Sun, May 27, 2018 at 10:01:22PM +0200, Landry Breuil wrote:
> > > On Sun, May 27, 2018 at 09:56:25PM +0200, Landry Breuil wrote:
> > > > On Sun, May 27, 2018 at 09:41:26PM +0200, viq wrote:
> > > > > On Sun, May 27, 2018 at 10:19 AM, Landry Breuil 
> > wrote:
> > > > >
> > > > > > On Sun, May 27, 2018 at 09:59:49AM +0200, viq wrote:
> > > > > > > Currently davical is broken with PHP 7 due to old version of AWL
> > that
> > > > > > > doesn't work there.
> > > > > > > I'll try and cook up an update, but feel free to beat me to it ;)
> > > > > >
> > > > > > Per https://gitlab.com/davical-project/awl/blob/master/ChangeLog
> > there's
> > > > > > been some php7 changes, how 'broken' is davical ?
> > > > > >
> > > > >
> > > > > Getting 408 and following error:
> > > > > PHP message: PHP Fatal error:  'break' not in the 'loop' or 'switch'
> > > > > context in /awl/inc/AwlQuery.php on line 261
> > > > > and sync clients don't work, so "very".
> > > > >
> > > > >
> > > > > > https://gitlab.com/davical-project/awl/issues/11 ? one of
> > > > > > https://gitlab.com/davical-project/awl/issues ?
> > > > >
> > > > >
> > > > > This specific error seems to be addressed by
> > > > > https://gitlab.com/davical-project/awl/merge_requests/6
> > > >
> > > > Good, so a first shot would be to update to 0.56 as it contains this
> > MR,
> > > > and then eventually updating awk & davical together in a second time.
> > >
> > > Oh well according to
> > >
> > https://gitlab.com/davical-project/davical/commit/348532e13b8a8377aa069bdd1cb98eb5d9f00da9
> > > davical needs an update too to work with php7. Blarf.
> >
> > So here are two quick diffs, totally untested yet, but cant be worse
> > than being broken with php 7.
> >
> 
> I may have gotten rusty, but those diffs fail to apply for me.
> 
> >

Ha, how old was the tree you diffed from Landry?! :-)

Here it is rebased against -current


Index: productivity/davical/Makefile
===
RCS file: /cvs/ports/productivity/davical/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- productivity/davical/Makefile   22 May 2018 08:18:08 -  1.20
+++ productivity/davical/Makefile   28 May 2018 11:54:02 -
@@ -1,38 +1,36 @@
-# $OpenBSD: Makefile,v 1.20 2018/05/22 08:18:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2017/03/24 18:29:37 landry Exp $
 
 COMMENT =  CalDAV/CardDav calendar/contacts server
 
-GITLAB_PROJECT = davical
-GITLAB_ACCOUNT = davical-project
-GITLAB_TAG =   r1.1.3.1
-DISTNAME = ${GITLAB_PROJECT}-${GITLAB_TAG:S/r//}
+DISTNAME = davical_1.1.7.orig
+PKGNAME =  davical-1.1.7
+EXTRACT_SUFX = .tar.xz
 CATEGORIES =   productivity net
-REVISION = 4
 
 HOMEPAGE = http://www.davical.org/
+MASTER_SITES = https://www.davical.org/downloads/
 
 MAINTAINER =   Landry Breuil 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES = https://rhaalovely.net/stuff/
-
+WRKSRC=${WRKDIR}
 MODULES =  lang/php
 PREFIX =   ${VARBASE}/www
 INSTDIR =  ${PREFIX}/davical
-WRKDIST =  ${WRKDIR}/${GITLAB_PROJECT}.git
 TINSTDIR = ${TRUEPREFIX}/davical
 
 SUBST_VARS =   TINSTDIR
 
 RUN_DEPENDS += lang/php/${MODPHP_VERSION},-curl \
lang/php/${MODPHP_VERSION},-pdo_pgsql \
-   www/awl>=0.55 \
+   www/awl>=0.59 \
devel/p5-YAML \
databases/p5-DBD-Pg
 
 NO_BUILD = Yes
+# some tests but makefile need patching
 NO_TEST =  Yes
 PKG_ARCH = *
 
Index: productivity/davical/distinfo
===
RCS file: /cvs/ports/productivity/davical/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- productivity/davical/distinfo   23 Nov 2014 08:48:27 -  1.3
+++ productivity/davical/distinfo   28 May 2018 11:54:02 -
@@ -1,2 +1,2 @@
-SHA256 (davical-1.1.3.1.tar.gz) = RDnC3wBSJBtlxh608LEMQG2Tr9ZaXMa1I7WXwKewXBU=
-SIZE (davical-1.1.3.1.tar.gz) = 3031220
+SHA256 (davical_1.1.7.orig.tar.xz) = 
6Uq5XeQ+7csiOTfMApcUf6ccx/gotskJEEuk3JuoJas=
+SIZE (davical_1.1.7.orig.tar.xz) = 1347368
Index: productivity/davical/pkg/PLIST
===
RCS file: /cvs/ports/productivity/davical/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- productivity/davical/pkg/PLIST  30 Dec 2015 10:01:25 -  1.5
+++ productivity/davical/pkg/PLIST  28 May 2018 11:54:02 -
@@ -3,17 +3,15 @@ davical/
 davical/INSTALL
 davical/README
 davical/config/
-davical/config/.gitignore
 davical/config/apache-davical.conf
 davical/config/debug-config.php
 davical/config/example-administration.yml
 davical/config/example-config.php
 @sample davical/config/config.php
-davical/config/imap_pam_conf_php.txt
 davical/config/other-config.php
 

Re: productivity/taskd

[Stuart Henderson]

On 2018/05/28 11:06, Klemens Nanni wrote:
> On Mon, May 28, 2018 at 10:42:52AM +0200, Marc Espie wrote:
> > new update-plist found that:
> > Warning: taskd-1.1.0p2 defines @newgroup _taskd:734 (no entry in user db)
> > Warning: taskd-1.1.0p2 defines @newuser _taskd:732:734:daemon:Taskwarrior 
> > Sync Server:/var/taskd:/sbin/nologin (no entry in user db)
> Why do uid and gid not match either?
> 
>   $ grep 73[24] infrastructure/db/user.list
>   732 _unifi  _unifi  net/unifi
>   #734_icingacmd  net/icinga
> 

Best set both to 734 and register it.

Up to 807 now. It's getting to the point we should probably start
thinking what to do with uids when we approach 1000 as well (or a bit
less..unless I'm the only one who works down from 1000 for for non-ports
things that aren't real users :)

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/05/28 04:29:28

Modified files:
devel/intellij : Makefile distinfo 
devel/intellij/pkg: PLIST 

Log message:
Bugfix update intellij to 2018.1.4

Re: [update] davical & awl [was: www/awl needs update to work with PHP 7, breaks productivity/davical]

[viq]

On Sun, 27 May 2018, 22:17 Landry Breuil,  wrote:

> On Sun, May 27, 2018 at 10:01:22PM +0200, Landry Breuil wrote:
> > On Sun, May 27, 2018 at 09:56:25PM +0200, Landry Breuil wrote:
> > > On Sun, May 27, 2018 at 09:41:26PM +0200, viq wrote:
> > > > On Sun, May 27, 2018 at 10:19 AM, Landry Breuil 
> wrote:
> > > >
> > > > > On Sun, May 27, 2018 at 09:59:49AM +0200, viq wrote:
> > > > > > Currently davical is broken with PHP 7 due to old version of AWL
> that
> > > > > > doesn't work there.
> > > > > > I'll try and cook up an update, but feel free to beat me to it ;)
> > > > >
> > > > > Per https://gitlab.com/davical-project/awl/blob/master/ChangeLog
> there's
> > > > > been some php7 changes, how 'broken' is davical ?
> > > > >
> > > >
> > > > Getting 408 and following error:
> > > > PHP message: PHP Fatal error:  'break' not in the 'loop' or 'switch'
> > > > context in /awl/inc/AwlQuery.php on line 261
> > > > and sync clients don't work, so "very".
> > > >
> > > >
> > > > > https://gitlab.com/davical-project/awl/issues/11 ? one of
> > > > > https://gitlab.com/davical-project/awl/issues ?
> > > >
> > > >
> > > > This specific error seems to be addressed by
> > > > https://gitlab.com/davical-project/awl/merge_requests/6
> > >
> > > Good, so a first shot would be to update to 0.56 as it contains this
> MR,
> > > and then eventually updating awk & davical together in a second time.
> >
> > Oh well according to
> >
> https://gitlab.com/davical-project/davical/commit/348532e13b8a8377aa069bdd1cb98eb5d9f00da9
> > davical needs an update too to work with php7. Blarf.
>
> So here are two quick diffs, totally untested yet, but cant be worse
> than being broken with php 7.
>

I may have gotten rusty, but those diffs fail to apply for me.

>

Re: [update] sysutils/restic 0.8.3 -> 0.9.0

[viq]

On Mon, 28 May 2018, 11:02 Rafael Sadowski,  wrote:

> On Sun May 27, 2018 at 09:54:51PM +0200, viq wrote:
> > On 18-05-21 15:17:46, Aaron Bieber wrote:
> > > Hi!
> > >
> > > Here is an update to restic. Full changelog here:
> > >   https://github.com/restic/restic/releases/tag/v0.9.0
> > >
> > > Highlights include better tls-client-cert argument parsing, support for
> > > illumos / solaris (from jasper@)
> >
> > Another highlight for me is supporting different and many more backends
> > through rclone, is anyone looking into porting that?
> >
>
> I see openbsd-wip/sysutils/rclone.
>

Oh, right, didn't think to check there, thanks.

>

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/05/28 03:09:16

Modified files:
infrastructure/db: user.list 

Log message:
comment _couchdb entry for databases/apache-couchdb ceased to be

Re: productivity/taskd

[Klemens Nanni]

On Mon, May 28, 2018 at 10:42:52AM +0200, Marc Espie wrote:
> new update-plist found that:
> Warning: taskd-1.1.0p2 defines @newgroup _taskd:734 (no entry in user db)
> Warning: taskd-1.1.0p2 defines @newuser _taskd:732:734:daemon:Taskwarrior 
> Sync Server:/var/taskd:/sbin/nologin (no entry in user db)
Why do uid and gid not match either?

$ grep 73[24] infrastructure/db/user.list
732 _unifi  _unifi  net/unifi
#734_icingacmd  net/icinga

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/05/28 03:06:19

Modified files:
infrastructure/db: user.list 

Log message:
owamp defines _owampd, not _owamp

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/05/28 03:03:38

Modified files:
infrastructure/bin: update-plist 

Log message:
I plain forgot about !number to insist on a given uid/gid

Re: [update] sysutils/restic 0.8.3 -> 0.9.0

[Rafael Sadowski]

On Sun May 27, 2018 at 09:54:51PM +0200, viq wrote:
> On 18-05-21 15:17:46, Aaron Bieber wrote:
> > Hi!
> > 
> > Here is an update to restic. Full changelog here:
> >   https://github.com/restic/restic/releases/tag/v0.9.0
> > 
> > Highlights include better tls-client-cert argument parsing, support for
> > illumos / solaris (from jasper@)
> 
> Another highlight for me is supporting different and many more backends
> through rclone, is anyone looking into porting that?
> 

I see openbsd-wip/sysutils/rclone.

productivity/taskd

[Marc Espie]

new update-plist found that:
Warning: taskd-1.1.0p2 defines @newgroup _taskd:734 (no entry in user db)
Warning: taskd-1.1.0p2 defines @newuser _taskd:732:734:daemon:Taskwarrior Sync 
Server:/var/taskd:/sbin/nologin (no entry in user db)

and indeed, taskd did not reserve any entry in user.list.

Apparently, 734 used to be icingacmd


I think it should be okay to reuse the id, but it should be registered in
user.list to avoid confusion...

CVS: cvs.openbsd.org: ports

[Martijn van Duren]

CVSROOT:/cvs
Module name:ports
Changes by: mart...@cvs.openbsd.org 2018/05/28 00:15:15

Removed files:
lang/php/5.6/patches: patch-Zend_zend_alloc_c 

Log message:
Remove patch-Zend_zend_alloc_c. The concept was removed in PHP7 and the
code it applies to was never enabled.

OK sthen@

Re: productivity/timewarrior - WIP

[Matthieu Guegan]

On Sun, May 27, 2018 at 07:52:28PM +0100, Raf Czlonka wrote:

There's only one way[0][1] to find out ;^)

[0] http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/productivity/timewarrior/
[1] well, not *just* one, i.e. 'pkg_info timewarrior', etc.


Thanks Raf, next time I'll search before asking..