Re: apache2 fails with rc.d (but actually starts)

2016-06-21 Thread Stuart Henderson 
On 2016/06/21 17:57, Johan Huldtgren wrote:
> when the old openbsd apache went away recently I swapped to apache2
> for the one site I have which still needs it, while it works, when it
> gets started at boot (or if I wish to restart it), using rc.d or rcctl
> will report a failure, but it will start nonetheless.

For me, loading mod_rewrite causes the process title to change,
which breaks rc.d.

It would probably make sense to call "apachectl2 start", "apachectl2
stop" for those two functions, but there isn't a suitable alternative
for checking status - the least bad way I can see to fix that is
something like pexp=".*${daemon}.*", maybe with some ${daemon_flags}
in there if it can be done...

Re: CVS: cvs.openbsd.org: ports

2016-06-21 Thread Joerg Jung 
On Tue, Jun 21, 2016 at 03:58:10PM -0600, Joerg Jung wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   j...@cvs.openbsd.org2016/06/21 15:58:10
> 
> Modified files:
>   mail/opensmtpd-extras: Makefile distinfo 
> 
> Log message:
> update to snapshot from today

this was ok giovanni

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Joerg Jung 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/06/21 15:58:10

Modified files:
mail/opensmtpd-extras: Makefile distinfo 

Log message:
update to snapshot from today

apache2 fails with rc.d (but actually starts)

2016-06-21 Thread Johan Huldtgren 

hello,

when the old openbsd apache went away recently I swapped to apache2
for the one site I have which still needs it, while it works, when it
gets started at boot (or if I wish to restart it), using rc.d or rcctl
will report a failure, but it will start nonetheless. If I use
apachectl2 it starts without issue. Using -d to rcctl produces nothing
obviously wrong (as far as I can tell). My httpd2.conf is barely
changed from the default one shipped (diff below), the only
substantial changes are that mod_rewrite and mod_perl are active and
there is one virtual host (but removing all those does not change the
behavior). Since apache seems happy with the config and it runs, turning up
debugging or syntax checks haven't produced anything useful. I don't know
if there is any additional debugging I can set for rcctl which would be
helpful.

If anybody has any ideas I'd appreciate it, while it's not a huge
issue it's a bit unnerving to see apache2 being reported as not running
each morning in the daily mail.

thanks,

.jh


# rcctl -d start apache2
doing _rc_parse_conf
doing _rc_quirks
apache2_flags empty, using default ><
doing _rc_parse_conf /var/run/rc.d/apache2
doing _rc_quirks
doing rc_check
apache2
doing rc_start
doing _rc_wait start
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing _rc_rm_runfile
(failed)

# ps auxww | grep httpd
root  4803  0.0  0.2 19940 31124 ??  Ss 2:30PM0:00.54 
httpd2: /usr/local/sbin/httpd2
www  96364  0.0  0.0 19816  3616 ??  I  2:30PM0:00.05 
httpd2: /usr/local/sbin/httpd2
www  92392  0.0  0.0 19816  3656 ??  I  2:30PM0:00.05 
httpd2: /usr/local/sbin/httpd2
www  60610  0.0  0.0 19816  3588 ??  I  2:30PM0:00.03 
httpd2: /usr/local/sbin/httpd2
www  45996  0.0  0.0 19816  3580 ??  I  2:30PM0:00.05 
httpd2: /usr/local/sbin/httpd2
www  90635  0.0  0.0 19816  3548 ??  I  2:30PM0:00.02 
httpd2: /usr/local/sbin/httpd2

root 42612  0.0  0.0   172   364 p2  R+ 2:30PM0:00.00 grep httpd

# apachectl2 -t 


Syntax OK

# diff -u /usr/local/share/examples/apache2/conf/httpd2.conf 
/etc/apache2/httpd2.conf
--- /usr/local/share/examples/apache2/conf/httpd2.conf  Mon Jun 13 
08:19:54 2016

+++ /etc/apache2/httpd2.confTue Jun 21 14:28:14 2016
@@ -49,7 +49,7 @@
 # prevent Apache from glomming onto all bound IP addresses.
 #
 #Listen 12.34.56.78:80
-Listen 80
+Listen 127.0.0.1:80

 #
 # Dynamic Shared Object (DSO) Support
@@ -172,7 +172,8 @@
 #LoadModule speling_module /usr/local/lib/apache2/mod_speling.so
 #LoadModule userdir_module /usr/local/lib/apache2/mod_userdir.so
 LoadModule alias_module /usr/local/lib/apache2/mod_alias.so
-#LoadModule rewrite_module /usr/local/lib/apache2/mod_rewrite.so
+LoadModule rewrite_module /usr/local/lib/apache2/mod_rewrite.so
+LoadModule perl_module /usr/local/lib/apache2/mod_perl.so

 
 #
@@ -205,7 +206,7 @@
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. ad...@your-domain.com
 #
-ServerAdmin y...@example.com
+ServerAdmin hostmas...@mysite.com

 #
 # ServerName gives the name and port that the server uses to identify 
itself.

@@ -214,7 +215,7 @@
 #
 # If your host doesn't have a registered DNS name, enter its IP 
address here.

 #
-#ServerName www.example.com:80
+ServerName www.mysite.com

 #
 # Deny access to the entirety of your server's filesystem. You must
@@ -238,8 +239,8 @@
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "/var/www/htdocs"
-
+DocumentRoot "/var/www/htdocs_www"
+
 #
 # Possible values for the Options directive are "None", "All",
 # or any combination of:
@@ -290,7 +291,7 @@
 # logged here.  If you *do* define an error logfile for a 
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog "logs/error_log"
+ErrorLog "logs/default/error_apache.log"

 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -319,7 +320,7 @@
 # define per- access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog "logs/access_log" common
+CustomLog "logs/default/access_apache.log" combined

 #
 # If you prefer a logfile with access, agent, and referer information
@@ -438,7 +439,7 @@
 #
 # Some examples:
 #ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
+ErrorDocument 404 http://www.mysite.com/missing.html
 #ErrorDocument 404 "/cgi-bin/missing_handler.pl"

Re: [NEW] net/libmaxminddb

2016-06-21 Thread Giovanni Bechis 
On Tue, Jun 21, 2016 at 07:55:02PM +0200, Frederic Cambus wrote:
> On Tue, Jun 21, 2016 at 10:37:44AM +0100, Stuart Henderson wrote:
> > 
> > There are mixed "VARNAME=" and "VARNAME =" in the Makefile, could
> > you pick one please. Then it will be OK with me to import..
> 
> New tarball attached, addressing those issues.
> 
there is a missing TEST_DEPENDS on devel/p5-IPC-Run3,
other than that ok giovanni@

> > I would also like to have a helper target to generate the db files
> > so that if it's necessary for someone else to update them they
> > can do so, though that can be done after importing.
> 
> Sure, I have a script to generate the tarballs, which also checksums DB
> files before packing them. I'll clean it up so it can be added after
> import.
> 
I think it should be a new target in our Makefile, but we could work on that
in-tree.
 Cheers
  Giovanni

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Joerg Jung 
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/06/21 15:55:08

Modified files:
devel/subversion: Makefile 
devel/subversion/pkg: PLIST-main 

Log message:
fix user and group

from Johan Huldtgren via czarkoff

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Ingo Feinerer 
CVSROOT:/cvs
Module name:ports
Changes by: feine...@cvs.openbsd.org2016/06/21 12:21:52

Modified files:
math/R : Makefile distinfo 
math/R/pkg : PLIST 

Log message:
Update to R 3.3.1

OK dcoppa@

Re: UPDATE: math/R

2016-06-21 Thread David Coppa 
On Tue, Jun 21, 2016 at 5:18 PM, Ingo Feinerer  wrote:
> Dear useRs,
>
> update math/R 3.3.0 -> 3.3.1
>
> OK?

Ok with me.

Ciao!
David

CVS: cvs.openbsd.org: ports

2016-06-21 Thread David Coppa 
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/06/21 12:06:39

Modified files:
productivity/taskwarrior: Makefile 

Log message:
Fix license marker, from Frederic Cambus

CVS: cvs.openbsd.org: ports

2016-06-21 Thread David Coppa 
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/06/21 12:02:36

Modified files:
databases/hs-HDBC-postgresql: Makefile distinfo 

Log message:
Update to HDBC-postgresql-2.3.2.4

Re: [NEW] net/libmaxminddb

2016-06-21 Thread Frederic Cambus 
On Tue, Jun 21, 2016 at 10:37:44AM +0100, Stuart Henderson wrote:
> 
> There are mixed "VARNAME=" and "VARNAME =" in the Makefile, could
> you pick one please. Then it will be OK with me to import..

New tarball attached, addressing those issues.

> I would also like to have a helper target to generate the db files
> so that if it's necessary for someone else to update them they
> can do so, though that can be done after importing.

Sure, I have a script to generate the tarballs, which also checksums DB
files before packing them. I'll clean it up so it can be added after
import.



libmaxminddb.tar.gz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Juan Francisco Cantero Hurtado 
CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2016/06/21 11:36:18

Modified files:
net/wget   : Tag: OPENBSD_5_8 Makefile distinfo 
net/wget/patches: Tag: OPENBSD_5_8 patch-doc_wget_texi 

Log message:
MFC:
update to wget-1.18

This solves CVE-2016-4971.
This introduces a backward-incompatibility for HTTP->FTP redirects and
any script that relies on the old behaviour must use --trust-server-names.

ok jasper@

Re: apache-httpd rc script not working properly

2016-06-21 Thread Michael Lechtermann 
Hi,

> On 21Juni, 2016, at 17:03, Antoine Jacoutot  wrote:
> 
> Sorry but I cannot reproduce your issue with a default configuration.
> So you'll have to provide us with more info.

thanks for checking, this is the behavior I get with 5.9:

# time /etc/rc.d/apache2 start
apache2(failed)
0m35.09s real 0m00.27s user 0m02.40s system
[…starts OK, but fails to check, times out…]

# ps ax | grep [h]ttpd2
14568 ??  Ss  0:00.38 httpd2: /usr/local/sbin/httpd2
19759 ??  S   0:00.02 httpd2: /usr/local/sbin/httpd2
 7983 ??  S   0:00.14 httpd2: /usr/local/sbin/httpd2
 8262 ??  S   0:00.06 httpd2: /usr/local/sbin/httpd2
23839 ??  S   0:00.26 httpd2: /usr/local/sbin/httpd2
24914 ??  S   0:00.11 httpd2: /usr/local/sbin/httpd2
19513 ??  S   0:00.20 httpd2: /usr/local/sbin/httpd2
 3778 ??  S   0:00.25 httpd2: /usr/local/sbin/httpd2
 8778 ??  S   0:00.23 httpd2: /usr/local/sbin/httpd2
17706 ??  S   0:00.13 httpd2: /usr/local/sbin/httpd2
 8920 ??  S   0:00.12 httpd2: /usr/local/sbin/httpd2
21764 ??  S   0:00.18 httpd2: /usr/local/sbin/httpd2
23359 ??  S   0:00.12 httpd2: /usr/local/sbin/httpd2
15642 ??  S   0:00.20 httpd2: /usr/local/sbin/httpd2
32692 ??  S   0:00.18 httpd2: /usr/local/sbin/httpd2
19331 ??  S   0:00.10 httpd2: /usr/local/sbin/httpd2
  348 ??  S   0:00.07 httpd2: /usr/local/sbin/httpd2
 1547 ??  S   0:00.28 httpd2: /usr/local/sbin/httpd2
28917 ??  S   0:00.01 httpd2: /usr/local/sbin/httpd2

# /etc/rc.d/apache2 stop
[…no output…]

# ps ax | grep [h]ttpd2
14568 ??  Ss  0:00.38 httpd2: /usr/local/sbin/httpd2
19759 ??  S   0:00.02 httpd2: /usr/local/sbin/httpd2
 8262 ??  S   0:00.06 httpd2: /usr/local/sbin/httpd2
19513 ??  S   0:00.21 httpd2: /usr/local/sbin/httpd2
 7983 ??  S   0:00.14 httpd2: /usr/local/sbin/httpd2
23839 ??  S   0:00.26 httpd2: /usr/local/sbin/httpd2
24914 ??  S   0:00.12 httpd2: /usr/local/sbin/httpd2
 3778 ??  S   0:00.33 httpd2: /usr/local/sbin/httpd2
 8778 ??  S   0:00.23 httpd2: /usr/local/sbin/httpd2
 8920 ??  S   0:00.14 httpd2: /usr/local/sbin/httpd2
17706 ??  S   0:00.15 httpd2: /usr/local/sbin/httpd2
21764 ??  S   0:00.18 httpd2: /usr/local/sbin/httpd2
  348 ??  S   0:00.08 httpd2: /usr/local/sbin/httpd2
32692 ??  S   0:00.22 httpd2: /usr/local/sbin/httpd2
23359 ??  S   0:00.13 httpd2: /usr/local/sbin/httpd2
19331 ??  S   0:00.10 httpd2: /usr/local/sbin/httpd2
15642 ??  S   0:00.20 httpd2: /usr/local/sbin/httpd2
 1547 ??  S   0:00.29 httpd2: /usr/local/sbin/httpd2
28917 ??  S   0:00.01 httpd2: /usr/local/sbin/httpd2

# /etc/rc.d/apache2 reload
apache2(failed)

# ps ax | grep [h]ttpd2
14568 ??  Ss  0:00.41 httpd2: /usr/local/sbin/httpd2
19759 ??  S   0:00.02 httpd2: /usr/local/sbin/httpd2
 8262 ??  S   0:00.07 httpd2: /usr/local/sbin/httpd2
 7983 ??  S   0:00.14 httpd2: /usr/local/sbin/httpd2
24914 ??  S   0:00.12 httpd2: /usr/local/sbin/httpd2
19513 ??  S   0:00.24 httpd2: /usr/local/sbin/httpd2
23839 ??  S   0:00.26 httpd2: /usr/local/sbin/httpd2
 3778 ??  S   0:00.37 httpd2: /usr/local/sbin/httpd2
 8778 ??  S   0:00.23 httpd2: /usr/local/sbin/httpd2
21764 ??  S   0:00.19 httpd2: /usr/local/sbin/httpd2
 8920 ??  S   0:00.15 httpd2: /usr/local/sbin/httpd2
17706 ??  S   0:00.15 httpd2: /usr/local/sbin/httpd2
  348 ??  S   0:00.08 httpd2: /usr/local/sbin/httpd2
15642 ??  S   0:00.20 httpd2: /usr/local/sbin/httpd2
32692 ??  S   0:00.22 httpd2: /usr/local/sbin/httpd2
23359 ??  S   0:00.13 httpd2: /usr/local/sbin/httpd2
19331 ??  S   0:00.10 httpd2: /usr/local/sbin/httpd2
 1547 ??  S   0:00.29 httpd2: /usr/local/sbin/httpd2
28917 ??  S   0:00.03 httpd2: /usr/local/sbin/httpd2

# /etc/rc.d/apache2 check
apache2(failed)

# ps ax | grep [h]ttpd2
14568 ??  Ss  0:00.46 httpd2: /usr/local/sbin/httpd2
19759 ??  S   0:00.02 httpd2: /usr/local/sbin/httpd2
 8262 ??  S   0:00.08 httpd2: /usr/local/sbin/httpd2
 7983 ??  S   0:00.14 httpd2: /usr/local/sbin/httpd2
24914 ??  S   0:00.13 httpd2: /usr/local/sbin/httpd2
19513 ??  S   0:00.24 httpd2: /usr/local/sbin/httpd2
23839 ??  S   0:00.26 httpd2: /usr/local/sbin/httpd2
 3778 ??  S   0:00.37 httpd2: /usr/local/sbin/httpd2
 8778 ??  S   0:00.23 httpd2: /usr/local/sbin/httpd2
21764 ??  S   0:00.19 httpd2: /usr/local/sbin/httpd2
 8920 ??  S   0:00.15 httpd2: /usr/local/sbin/httpd2
17706 ??  S   0:00.15 httpd2: /usr/local/sbin/httpd2
  348 ??  S   0:00.08 httpd2: /usr/local/sbin/httpd2
15642 ??  S   0:00.21 httpd2: /usr/local/sbin/httpd2
32692 ??  S   0:00.29 httpd2: /usr/local/sbin/httpd2
23359 ??  S   0:00.13 httpd2: /usr/local/sbin/httpd2
19331 ??  S   0:00.10 httpd2: /usr/local/sbin/httpd2
 1547 ??  S   0:00.29 httpd2: /usr/local/sbin/httpd2
28917 ??  S   0:00.03 httpd2: /usr/local/sbin/httpd2


Now with my patched rc

UPDATE: math/R

2016-06-21 Thread Ingo Feinerer 
Dear useRs,

update math/R 3.3.0 -> 3.3.1

OK?

Best regards,
Ingo

Index: Makefile
===
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile
--- Makefile6 May 2016 08:52:28 -   1.83
+++ Makefile21 Jun 2016 15:15:38 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.83 2016/05/06 08:52:28 feinerer Exp $
 
 COMMENT=   powerful math/statistics/graphics language
-DISTNAME=  R-3.3.0
+DISTNAME=  R-3.3.1
 
 SO_VERSION=32.0
 .for _lib in R Rblas Rlapack
Index: distinfo
===
RCS file: /cvs/ports/math/R/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo6 May 2016 08:52:28 -   1.30
+++ distinfo21 Jun 2016 15:15:38 -
@@ -1,2 +1,2 @@
-SHA256 (R-3.3.0.tar.gz) = klaxVLGlmT2ES+57GVXNScma1yzvA8zjzRvcoTEDEeQ=
-SIZE (R-3.3.0.tar.gz) = 29820067
+SHA256 (R-3.3.1.tar.gz) = PcWa5YMfU4D4PBabrCEDrQUu/g7OxP+nS95NhaD9qeI=
+SIZE (R-3.3.1.tar.gz) = 29848329
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/R/pkg/PLIST,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST
--- pkg/PLIST   6 May 2016 08:52:28 -   1.30
+++ pkg/PLIST   21 Jun 2016 15:15:39 -
@@ -974,6 +974,7 @@ lib/R/library/nlme/
 lib/R/library/nlme/CITATION
 lib/R/library/nlme/DESCRIPTION
 lib/R/library/nlme/INDEX
+lib/R/library/nlme/LICENCE
 lib/R/library/nlme/Meta/
 lib/R/library/nlme/Meta/Rd.rds
 lib/R/library/nlme/Meta/data.rds
@@ -1034,6 +1035,7 @@ lib/R/library/nlme/scripts/ch04.R
 lib/R/library/nlme/scripts/ch05.R
 lib/R/library/nlme/scripts/ch06.R
 lib/R/library/nlme/scripts/ch08.R
+lib/R/library/nlme/scripts/runme.R
 lib/R/library/nlme/scripts/sims.rda
 lib/R/library/nnet/
 lib/R/library/nnet/CITATION

Re: apache-httpd rc script not working properly

2016-06-21 Thread Antoine Jacoutot 
On Tue, Jun 21, 2016 at 12:49:49AM +0200, Antoine Jacoutot wrote:
> On Mon, Jun 20, 2016 at 11:16:53PM +0200, Michael Lechtermann wrote:
> > Hi,
> > 
> > the current apache2 rc.d script isn’t working properly as it is. The script 
> > doesn’t detect if the process was started successfully and can neither 
> > stop, reload or even check it. The following patch fixes it for me:
> 
> Thanks, I'll have a look at it.

Sorry but I cannot reproduce your issue with a default configuration.
So you'll have to provide us with more info.


> 
> > --- apache2.rc.orig Mon Jun 20 21:07:37 2016
> > +++ apache2.rc  Mon Jun 20 21:11:56 2016
> > @@ -6,4 +6,10 @@
> > 
> > . /etc/rc.d/rc.subr
> > 
> > +pexp="httpd2:.*${daemon}"
> > +
> > +rc_reload() {
> > +   pkill -HUP -oxf "${pexp}"
> > +}
> > +
> > rc_cmd $1
> > 
> > 
> > 
> > Best regards,
> > Michael
> > 
> 
> -- 
> Antoine

-- 
Antoine

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/06/21 09:00:17

Modified files:
devel/libwnck3 : Makefile distinfo 
devel/libwnck3/patches: patch-libwnck_tasklist_c 
devel/libwnck3/pkg: PLIST 

Log message:
Update to libwnck3-3.20.0.

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/06/21 07:22:53

Modified files:
graphics/libgxps: Makefile distinfo 
graphics/libgxps/pkg: PLIST 

Log message:
Update to libgxps-0.2.4.

Re: Correct license for productivity/taskwarrior

2016-06-21 Thread David Coppa 


Il 21 giugno 2016 14:07:48 CEST, Frederic Cambus  ha scritto:
>Hi ports@,
>
>License marker for productivity/taskwarrior is wrong, and should be
>switched from GPLv2 to MIT [1].
>
>The diff also removes an extraneous slash in MASTER_SITES.
>
>[1] http://taskwarrior.org/docs/license.html
>
>Index: Makefile
>===
>RCS file: /cvs/ports/productivity/taskwarrior/Makefile,v
>retrieving revision 1.22
>diff -u -p -r1.22 Makefile
>--- Makefile   5 Mar 2016 16:26:40 -   1.22
>+++ Makefile   21 Jun 2016 12:23:46 -
>@@ -11,9 +11,9 @@ HOMEPAGE =   http://www.taskwarrior.org/
> 
> MAINTAINER=   Eric Lalonde 
> 
>-MASTER_SITES =${HOMEPAGE}/download/
>+MASTER_SITES =${HOMEPAGE}download/
> 
>-# GPLv2
>+# MIT
> PERMIT_PACKAGE_CDROM =Yes
> 
> # Needs C++11; linker issues with clang

Sure, go ahead.

ciao!
David

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/06/21 06:38:07

Modified files:
graphics/shotwell: Makefile distinfo 
graphics/shotwell/patches: patch-Makefile 
   patch-plugins_Makefile_plugin_mk 
   patch-src_camera_CameraTable_vala 
graphics/shotwell/pkg: PLIST 

Log message:
Update to shotwell-0.23.2.

Correct license for productivity/taskwarrior

2016-06-21 Thread Frederic Cambus 
Hi ports@,

License marker for productivity/taskwarrior is wrong, and should be
switched from GPLv2 to MIT [1].

The diff also removes an extraneous slash in MASTER_SITES.

[1] http://taskwarrior.org/docs/license.html

Index: Makefile
===
RCS file: /cvs/ports/productivity/taskwarrior/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile5 Mar 2016 16:26:40 -   1.22
+++ Makefile21 Jun 2016 12:23:46 -
@@ -11,9 +11,9 @@ HOMEPAGE =http://www.taskwarrior.org/
 
 MAINTAINER=Eric Lalonde 
 
-MASTER_SITES = ${HOMEPAGE}/download/
+MASTER_SITES = ${HOMEPAGE}download/
 
-# GPLv2
+# MIT
 PERMIT_PACKAGE_CDROM = Yes
 
 # Needs C++11; linker issues with clang

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/06/21 06:26:31

Modified files:
net/py-libcloud: Makefile distinfo 
net/py-libcloud/pkg: PLIST 

Log message:
Update to py-libcloud-1.0.0.

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/06/21 06:22:19

Modified files:
x11/gnome/photos: Makefile distinfo 

Log message:
Update to gnome-photos-3.20.2.

Re: Unknown fragment error reporting

2016-06-21 Thread Marc Espie 
On Tue, Jun 21, 2016 at 11:24:30AM +0200, Adam Wolk wrote:
> The error report is quite deep in Subst.pm handle_fragment which is
> called from PkgCreate.pm. Is there a way to obtain the ports/package
> name or folder in a nice way inside handle_fragment? Adding a package
> name to the error report would make finding the offending
> dependencies much easier.

Hum... never thought it would be a problem. Going to fix that after lunch

Re: [NEW] net/libmaxminddb

2016-06-21 Thread Stuart Henderson 
On 2016/06/18 16:27, Frederic Cambus wrote:
> On Sun, May 29, 2016 at 10:25:59PM +0200, Frederic Cambus wrote:
> 
> > > Do you fancy adding GeoLite2 dbs as subpackages, something like
> > > net/GeoIP does? (They could go in a separate port but I think it
> > > makes it easier for people to find them if it's in the main one).
> > 
> > Sure, here is a new tarball implementing the suggestion, I tried to
> > stay as close as possible to what net/GeoIP is doing.
> > 
> > The DB files are installed in ${LOCALSTATEDIR}/db/GeoIP/, same path
> > as net/GeoIP. I'm not sure if it's a good idea or not, but in case
> > geoipupdate gets imported, it would allow to update both GeoLite and 
> > GeoLite2 databases with only one configuration file.
> 
> New tarball attached, with an updated GeoLite2 databases distribution
> file containing the latest version released in June.
> 
> Comments? OK?
> 

There are mixed "VARNAME=" and "VARNAME =" in the Makefile, could
you pick one please. Then it will be OK with me to import..

I would also like to have a helper target to generate the db files
so that if it's necessary for someone else to update them they
can do so, though that can be done after importing.

Re: [NEW] sysutils/sysmon

2016-06-21 Thread Stuart Henderson 
Could you either fix the net-snmp detection or explicitly disable
it like this please?

CONFIGURE_ENV = ac_cv_header_net_snmp_version_h=no

A few things about share/examples/sysmon/sysmon.conf.dist,

- should probably be @sample'd into ${SYSCONFDIR}/sysmon.conf,
if not then at least it wants an @extra ${SYSCONFDIR}/sysmon.conf
in PLIST.

- patch to replace /usr/local/htdocs/index.html with something
better, calling it index.html is probably bad so maybe
/var/www/htdocs/sysmon.html


On 2016/06/20 22:46, George Rosamond wrote:
> reping, after some syntax changes to Makefile.
> 
> From pkg/DESCR:
> 
> Sysmon is a network monitoring tool designed to provide high performance
> and accurate network monitoring.
> 
> This tool is available in the public domain for anyone to use it that is
> interested. It provides better performance and checking capabilities
> than other tools such as Rover, Nocmon (not this: Nocmonitor), Whatsup,
> Big Brother, and other such tools.
> 
> Configuration is simple and hierarchical, and can easily integrate email
> alerts.
> 
> Currently supported protocols include SMTP, IMAP, HTTP, TCP, UDP, NNTP,
> and PING. Sysmon also provides a simple web output of monitored hosts.
> 
> g

Unknown fragment error reporting

2016-06-21 Thread Adam Wolk 
Hi ports@,

Today while committing otter-browser I noticed a weird behavior with
portcheck. When running in /usr/ports/www/otter-browser it behaved as
expected but when running on my commit tree in
~/ports/www/otter-browser it produced the following error output:

Error: unknown fragment SHARED at /usr/libdata/perl5/OpenBSD/Subst.pm line 109, 
<$fh> line 5.
Error: unknown fragment SHARED at /usr/libdata/perl5/OpenBSD/Subst.pm line 109, 
<$fh> line 2.

It took me some time to debug the issue. The error is not from the
otter-port I was about to commit but from several dependencies that did
have incorrect entries in their PLIST. The difference between the trees
being that my commit tree didn't have the dependencies (ie. net/avahi
with a %%SHARED%% entry in them) updated and portcheck seems to default
to the relative root ports directory based on the current folder.

The error report is quite deep in Subst.pm handle_fragment which is
called from PkgCreate.pm. Is there a way to obtain the ports/package
name or folder in a nice way inside handle_fragment? Adding a package
name to the error report would make finding the offending
dependencies much easier.

Regards,
Adam

CVS: cvs.openbsd.org: ports

2016-06-21 Thread Adam Wolk 
CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/06/21 03:03:45

Modified files:
www/otter-browser: Makefile distinfo 
www/otter-browser/pkg: PLIST 

Log message:
www/otter-browser 0.9.10 beta 10 => 0.9.11pre129 move to weekly releases

Notable changes since version 0.9.10 (app wise):
* F12 menu now exposes all modes for Images visibility (including
newly added option to show cached images only) and Plugins,
* QtWebEngine backend is now capable of saving pages in MIME HTML
format and as complete set of files,
* new toolbar visibility settings for full screen mode.

OK bmercer@, go ahead sthen@