Re: Upcoming Ruby Plans

[Antoine Jacoutot]

On Wed, Oct 11, 2017 at 03:49:10AM +, Jeremy Evans wrote:
> tl;dr:
> 
> * Make ruby 2.4 default ruby version
> * Remove ruby 1.8, 2.1, 2.2
> * Remove ruby-do_* and ruby-swift-db-*
> 
> This message may be a little long, but if you are interested in ruby on
> OpenBSD, I'd like to get some feedback.  I plan on preparing for these
> changes over the next few weeks, and commiting them during p2k17.
> 
> Now that ruby 2.4.2 has been released, I plan to switch the default ruby
> version in the ports tree from 2.3 to 2.4.  I'll be doing bulk builds of
> all ruby ports before and after switching to hopefully catch all the
> necessary bumps.
> 
> In late August I worked on getting the remaining ports that depended on
> ruby 1.8 working on a modern version of ruby, and getting OKs to remove
> a couple ports that couldn't be upgraded and were no longer needed
> (gonzui and puppet-dashboard).  There shouldn't be any remaining ports
> that depend on lang/ruby/1.8, other than some old ruby libraries:
> 
> * databases/ruby-bdb (dependency of gonzui)
> * devel/ruby-gems (included in ruby 1.9+)
> * devel/ruby-rake (included in ruby 1.9+)
> 
> So I plan on removing these ports and then removing ruby 1.8.
> 
> Upstream support for ruby 2.1 was dropped completely in March, so I plan
> on also removing ruby 2.1 per our usual ruby support policy.
> 
> When I first proposed our current ruby support policy in August 2015,
> there was a greater need to support older ruby versions.  Since then,
> the last couple ruby versions have had fewer backwards incompatible
> changes, so there is less reason to continue to supporting old versions.
> Plus, honestly I don't want to backport security patches to versions not
> supported upstream.
> 
> So, with that in mind I'd like to update our ruby support policy to the
> following:
> 
> 1) All upstream versions in normal maintenance phase are supported, with
>C extensions built for each version.
> 2) Once an upstream version enters security maintenance phase, it
>remains in the ports tree, but C extensions are no longer built for
>it.
> 3) 6 months after the upstream version enters security maintenance
>phase, it is removed from the ports tree.
> 
> Currently, this would have the effect of also removing ruby 2.2, since
> it has been over 6 months since ruby 2.2 entered security maintenance
> phase (which happened on March 28, 2017 with the release of ruby 2.2.7).
> 
> There are currently a couple of ruby ports (ruby-augeas and
> ruby-libvirt) that are built for ruby 2.2 and not ruby 2.3, those will
> need to be dealt with before ruby 2.2 can be removed.
> 
> There are quite a few ruby database driver ports in the tree that are no
> longer needed:
> 
> * ruby-data_objects
> * ruby-do_mysql
> * ruby-do_postgres
> * ruby-do_sqlite3
> * ruby-swift-db-mysql
> * ruby-swift-db-postgres
> * ruby-swift-db-sqlite3
> 
> These ports are all dead upstream.  They used to be usable with
> databases/ruby-sequel, but support for them was dropped in a recent
> Sequel version, and there is nothing in the tree that uses them.  The
> data_objects and do_* ports were used by DataMapper and were reasonably
> popular at one point, but pretty much nothing in the ruby ecosystem
> still uses DataMapper anymore.  The swift-db-* ports were never popular
> or widely used.  I plan on removing these ports as well.
> 
> There are a number of pure ruby gem ports in the tree that are not
> dependencies of anything else and have not been updated in many years.
> I would like to remove some of these ports as they do not add value.  I
> don't have a list of such ports yet, this is probably something I'll
> research at p2k17.
> 
> I appreciate any thoughts or comments on these changes.

Thank you for the detailed explanation Jeremy. FWIW I agree with your plan.

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2017/10/10 23:21:29

Modified files:
lang/scala : Makefile distinfo 
lang/scala/pkg : PLIST 

Log message:
update scala to 2.12.3.
sounds good jasper@.

Upcoming Ruby Plans

[Jeremy Evans]

tl;dr:

* Make ruby 2.4 default ruby version
* Remove ruby 1.8, 2.1, 2.2
* Remove ruby-do_* and ruby-swift-db-*

This message may be a little long, but if you are interested in ruby on
OpenBSD, I'd like to get some feedback.  I plan on preparing for these
changes over the next few weeks, and commiting them during p2k17.

Now that ruby 2.4.2 has been released, I plan to switch the default ruby
version in the ports tree from 2.3 to 2.4.  I'll be doing bulk builds of
all ruby ports before and after switching to hopefully catch all the
necessary bumps.

In late August I worked on getting the remaining ports that depended on
ruby 1.8 working on a modern version of ruby, and getting OKs to remove
a couple ports that couldn't be upgraded and were no longer needed
(gonzui and puppet-dashboard).  There shouldn't be any remaining ports
that depend on lang/ruby/1.8, other than some old ruby libraries:

* databases/ruby-bdb (dependency of gonzui)
* devel/ruby-gems (included in ruby 1.9+)
* devel/ruby-rake (included in ruby 1.9+)

So I plan on removing these ports and then removing ruby 1.8.

Upstream support for ruby 2.1 was dropped completely in March, so I plan
on also removing ruby 2.1 per our usual ruby support policy.

When I first proposed our current ruby support policy in August 2015,
there was a greater need to support older ruby versions.  Since then,
the last couple ruby versions have had fewer backwards incompatible
changes, so there is less reason to continue to supporting old versions.
Plus, honestly I don't want to backport security patches to versions not
supported upstream.

So, with that in mind I'd like to update our ruby support policy to the
following:

1) All upstream versions in normal maintenance phase are supported, with
   C extensions built for each version.
2) Once an upstream version enters security maintenance phase, it
   remains in the ports tree, but C extensions are no longer built for
   it.
3) 6 months after the upstream version enters security maintenance
   phase, it is removed from the ports tree.

Currently, this would have the effect of also removing ruby 2.2, since
it has been over 6 months since ruby 2.2 entered security maintenance
phase (which happened on March 28, 2017 with the release of ruby 2.2.7).

There are currently a couple of ruby ports (ruby-augeas and
ruby-libvirt) that are built for ruby 2.2 and not ruby 2.3, those will
need to be dealt with before ruby 2.2 can be removed.

There are quite a few ruby database driver ports in the tree that are no
longer needed:

* ruby-data_objects
* ruby-do_mysql
* ruby-do_postgres
* ruby-do_sqlite3
* ruby-swift-db-mysql
* ruby-swift-db-postgres
* ruby-swift-db-sqlite3

These ports are all dead upstream.  They used to be usable with
databases/ruby-sequel, but support for them was dropped in a recent
Sequel version, and there is nothing in the tree that uses them.  The
data_objects and do_* ports were used by DataMapper and were reasonably
popular at one point, but pretty much nothing in the ruby ecosystem
still uses DataMapper anymore.  The swift-db-* ports were never popular
or widely used.  I plan on removing these ports as well.

There are a number of pure ruby gem ports in the tree that are not
dependencies of anything else and have not been updated in many years.
I would like to remove some of these ports as they do not add value.  I
don't have a list of such ports yet, this is probably something I'll
research at p2k17.

I appreciate any thoughts or comments on these changes.

Thanks,
Jeremy

Re: [update] vdirsyncer 0.16.3

[Jeremie Courreges-Anglas]

On Tue, Oct 10 2017, Remi Locherer  wrote:
> On Mon, Oct 09, 2017 at 03:02:49PM -0400, Daniel Jakots wrote:
>> On Sat, 7 Oct 2017 23:21:31 +0200, Remi Locherer
>>  wrote:
>> 
>> > Hi,
>> > 
>> > this is an update for vdirsyncer to version 0.16.3 which was released
>> > few days ago. See
>> > https://vdirsyncer.pimutils.org/en/stable/changelog.html for changes.
>> > 
>> > This patch also enables tests and shortens some long lines in
>> > Makefile.
>> 
>> lgtm
>> 
>> > The tests depend on two python modules that are not available in ports
>> > yet. py-test-localserver
>> 
>> it needs requests as a TDEP, can you put MODPY_PI and MODPY_SETUPTOOLS
>> just after MODULES please?
>
> Thanks for spotting this! Attached the fixed ports.

Looks good to me.  Two nits in py-test-subtesthack:
- s/an/and in COMMENT
- the bdep on devel/py-setuptools_scm doesn't seem to be needed?

With this addressed, ok jca@ to import py-test-localserver and
py-test-subtesthack, and ok for the vdirsyncer update.

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

Re: print/texlive/base: switch to c++11 for real

[Matthias Kilian]

Hi,

On Mon, Oct 09, 2017 at 10:17:43AM +0100, Edd Barrett wrote:
> On Sun, Oct 08, 2017 at 08:50:54PM +0200, Matthias Kilian wrote:
> > ps: I think edd@ mentioned that the next texlive release will be
> > C++-11-ready, so there's no point in upstreaming the fix.
> 
> Yes hopefully.
> 
> I have an updated TL 2017 base in openbsd-wip in case you wanted to
> check that all is well. I'm still working on the texmf, but you should
> be able to check the compile stage of base works OK.
> 
> Hoping to get TL 2017 in shortly after 6.2.

Well, my remark about texlive 2017 was only about wether to send
the patch upstream or not. openbsd-wip won't help here.

So, until texlive 2017 happens, can i just commit the C++11 diff
below or not? Could someone *please* test it on sparc64?

If not, we have to stick with a very old print/poppler.

Index: Makefile
===
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- Makefile24 Aug 2017 09:45:23 -  1.92
+++ Makefile8 Oct 2017 18:41:58 -
@@ -6,7 +6,7 @@ COMMENT =   base binaries for TeXLive typ
 DISTNAME = texlive-${DIST_V}b-source
 PKGNAME =  texlive_base-${V}
 WRKDIST =  ${WRKDIR}/texlive-${DIST_V}-source
-REVISION = 2
+REVISION = 3
 
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
texlive-${DIST_V}-extra${EXTRACT_SUFX}
@@ -47,7 +47,7 @@ LIB_DEPENDS = converters/libiconv \
 MODULES =  textproc/intltool perl
 
 # c++-11 required for poppler
-COMPILER = gcc
+COMPILER = base-clang ports-gcc
 
 # Never set SEPARATE_BUILD
 CONFIGURE_STYLE =  gnu
@@ -55,6 +55,8 @@ CONFIGURE_STYLE = gnu
 CPPFLAGS = -I${X11BASE}/include \
-I${LOCALBASE}/include \
-I${LOCALBASE}/include/poppler
+
+CXXFLAGS +=-std=c++11
 
 LDFLAGS =  -L${LOCALBASE}/lib \
-L${X11BASE}/lib
Index: patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w
===
RCS file: patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w
diff -N patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w8 Oct 2017 
18:41:58 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Let it build with -std=c++11.
+
+found by sthen@ at
+https://github.com/termux/termux-packages/blob/master/packages/texlive-bin/c%2B%2B11.patch
+
+
+Index: texk/web2c/luatexdir/image/pdftoepdf.w
+--- texk/web2c/luatexdir/image/pdftoepdf.w.orig
 texk/web2c/luatexdir/image/pdftoepdf.w
+@@ -71,7 +71,12 @@ static char *get_file_checksum(const char *a, file_err
+ ck = (char *) malloc(PDF_CHECKSUM_SIZE);
+ if (ck == NULL)
+ formatted_error("pdf inclusion","out of memory while processing 
'%s'", a);
+-snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) 
size,(uint64_t) mtime);
++snprintf(ck, PDF_CHECKSUM_SIZE, "%"
++  PRIu64
++  "_%"
++  PRIu64,
++  (uint64_t) size,
++  (uint64_t) mtime);
+} else {
+ switch (fe) {
+ case FE_FAIL:

Re: NEW: games/soyuz

[Ian Sutton]

On Sat, Sep 30, 2017 at 04:32:27PM +0100, Stuart Henderson wrote:
> Diff on top to tidy it up a bit.
> 
> I don't read Russian (totally killing my chances of being an astronaut
> ;) but is there something on the screen you get by pressing T that would
> pass for a version number?  Is there copyright information anywhere
> that would let us fill in the markers better?

I had a russian pal translate the 't' screen:

The first line of text says Version Number
The second line of text says Information System Version Number

So that gives us 4.29 D and 4.04 respectively. Nothing about copyrights.
 
> (btw, it's easier to review if you send a tar with just portname/* rather
> than usr/ports/category/portname/* .. or category/portname/* if there are
> multiple ports in different categories within one submission).

I'll remember for the next one. Diff looks good, I'll go ahead and add
in the version numbers.

Re: UPDATE: net/bitlbee-facebook

[Rafael Sadowski]

On Tue Oct 10, 2017 at 10:10:45AM +, Michal Mazurek wrote:
> The previous version stopped working.
> 
> OK?
> 
> Index: net/bitlbee-facebook/Makefile
> ===
> RCS file: /cvs/ports/net/bitlbee-facebook/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- net/bitlbee-facebook/Makefile 28 May 2017 14:16:12 -  1.2
> +++ net/bitlbee-facebook/Makefile 10 Oct 2017 10:03:25 -
> @@ -1,7 +1,7 @@
>  # $OpenBSD: Makefile,v 1.2 2017/05/28 14:16:12 ajacoutot Exp $
>  
>  COMMENT= Facebook Messenger protocol plugin for bitlbee
> -V=   1.1.1
> +V=   1.1.2
>  DISTNAME=bitlbee-facebook-$V
>  REVISION=0

You forgot to remove REVISION.

>  CATEGORIES=  net
> Index: net/bitlbee-facebook/distinfo
> ===
> RCS file: /cvs/ports/net/bitlbee-facebook/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- net/bitlbee-facebook/distinfo 28 May 2017 11:59:36 -  1.1.1.1
> +++ net/bitlbee-facebook/distinfo 10 Oct 2017 10:03:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (bitlbee-facebook-1.1.1.tar.gz) = 
> NAhNEkMpx0xeThJ+tnLZmaWd7rK9wYPVndbFATfFU8U=
> -SIZE (bitlbee-facebook-1.1.1.tar.gz) = 396646
> +SHA256 (bitlbee-facebook-1.1.2.tar.gz) = 
> O5RfgFdzoO8nyXIHzbqmUESr5QvmqpV08sMZ+OU4CWg=
> +SIZE (bitlbee-facebook-1.1.2.tar.gz) = 397445
> 
> -- 
> Michal Mazurek
> 

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2017/10/10 15:58:26

Modified files:
lang/racket-minimal: Makefile 

Log message:
Add mips64el to racket.

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2017/10/10 14:56:53

Modified files:
sysutils/ruby-puppet/4: Makefile 
sysutils/ruby-puppet/4/pkg: PLIST 
Added files:
sysutils/ruby-puppet/4/patches: patch-lib_puppet_rb 

Log message:
Properly install the locales related gettextsetup stuff, and tell
Puppet where to find it. That will prevent spamming logs with
GettextSetup not found for module ... introduced since the last update

Re: Update: devel/radare2

[Matthias Schmidt]

Hi Edd,

* Edd Barrett wrote:
> 
> Thanks for this. Comments inline.

Thanks for your comments.

> >  # In radare, all libs have the same version
> > -LIBV = 2.0 # 0.10.6
> > +LIBV = 2.0 # 1.6.0
> 
> Did you check if you needed to bump the major versions here?
> https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs

I looked at the FAQ and compared the old and the new libs.  A lot of
functions disappeared so I bumped the version to 3.0.  Strange enough I
had to enable rpath in configure to build it on recent -current.

> > +bin/r2-docker
> 
> Hrm docker... Is that useful for us? If not, we could delete it in a
> post-fake, or patch the build system to not install it at all.

The shell script allows r2 to be run in docker container.  Not useful
on OpenBSD ATM, however, it does no harm :)  If you want it gone, I can
modify the Makefile patch to remove it.
 
> At fake time:
> ---8<---
> ===>  Faking installation for radare2-1.6.0
> install -d -m 755 /usr/ports/pobj/radare2-1.6.0/fake-amd64
> /usr/ports/pobj/radare2-1.6.0/bin/install -c -d 
> "/usr/ports/pobj/radare2-1.6.0/fake-amd64/usr/local/share/doc
> /radare2"
> for FILE in doc/* ; do /usr/ports/pobj/radare2-1.6.0/bin/install -c -m 644 
> $FILE "/usr/ports/pobj/radare2-1.6.0/fake-amd64/usr/local/share/doc/radare2" 
> ; done
> install: doc/3D: Inappropriate file type or format
> install: doc/images: Inappropriate file type or format
> install: doc/node.js: Inappropriate file type or format
> install: doc/pdb: Inappropriate file type or format
> install: doc/sandbox: Inappropriate file type or format
> --->8---
> 
> ^ You probably want to investigate that.

Right, the for loop in combination with OpenBSD's install does not work.
I replaced the loop with two nested loops in the Makefile and provided a
patch for it.
 
> Similarly, at package time:
> 
> ---8<---
> ===>  Building package for radare2-1.6.0
> Create /usr/ports/packages/amd64/all/radare2-1.6.0.tgz
> Warning: symlink(s) point to non-existent 
> /usr/ports/pobj/radare2-1.6.0/fake-amd64/usr/ports/pobj/radare2-1.6.0/radare2-1.6.0/sys/indent.sh
> /usr/ports/pobj/radare2-1.6.0/fake-amd64/usr/local/bin/r2-indent
> Warning: symlink(s) point to non-existent 
> /usr/ports/pobj/radare2-1.6.0/fake-amd64/usr/ports/pobj/radare2-1.6.0/radare2-1.6.0/sys/r2-docker.sh
> /usr/ports/pobj/radare2-1.6.0/fake-amd64/usr/local/bin/r2-docker
> --->8---
> 
> If you can figure these bits out I will re-review, including the
> bindings.

Also modified the Makefile to correctly install both.  However, if
r2-docker should be gone I would remove the appropriate install lines
from the Makefile.

Cheers

Matthias
diff --git a/Makefile.inc b/Makefile.inc
index f0f00222637..7c23bfbd34d 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS ?=   amd64 i386
 # that don't. We know powerpc is busted.
 #ONLY_FOR_ARCHS ?= arm mips64 mips64el powerpc sparc64
 
-V ?=   0.10.6
+V ?=   1.6.0
 SUBST_VARS +=  V
 
 CATEGORIES ?=  devel
@@ -18,9 +18,7 @@ PERMIT_PACKAGE_CDROM ?=   Yes
 PERMIT_PACKAGE_FTP ?=  Yes
 PERMIT_DISTFILES_FTP ?=Yes
 
-MASTER_SITES ?=http://www.radare.org/get/
-
-EXTRACT_SUFX ?=.tar.xz
+MASTER_SITES ?=http://radare.mikelloc.com/get/${V}/
 
 USE_GMAKE ?=   Yes
 CONFIGURE_STYLE ?= simple
diff --git a/bindings/distinfo b/bindings/distinfo
index 42f478206d3..0bcc14b6bb5 100644
--- a/bindings/distinfo
+++ b/bindings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (radare2-bindings-0.10.6.tar.xz) = 
u4DlpSOhSmKbl4vCX9WikFRUIO+v7FQpRIo4nIG1xvY=
-SIZE (radare2-bindings-0.10.6.tar.xz) = 861548
+SHA256 (radare2-bindings-1.6.0.tar.gz) = 
q8MgxPU1PxXZakAyk0klPxQPCSEHTw0Nvuazy58AZ7g=
+SIZE (radare2-bindings-1.6.0.tar.gz) = 1197753
diff --git a/bindings/pkg/PLIST b/bindings/pkg/PLIST
index 2669bcac6d9..21293f36ee3 100644
--- a/bindings/pkg/PLIST
+++ b/bindings/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2016/10/10 12:20:17 feinerer Exp $
-@conflict radare-bindings2-*
+@comment $OpenBSD$
 share/vala/vapi/
 share/vala/vapi/libr.deps
 share/vala/vapi/libr.vapi
diff --git a/main/Makefile b/main/Makefile
index 1252f030c8d..da0edac160d 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -5,9 +5,9 @@ COMMENT =   reverse engineers disassembler and 
debugger
 DISTNAME = radare2-${V}
 
 # In radare, all libs have the same version
-LIBV = 2.0 # 0.10.6
+LIBV = 3.0 # 1.6.0
 .for _lib in r_anal r_asm r_bin r_bp r_config r_cons r_core \
-   r_crypto r_debug r_egg r_flags r_fs r_hash r_io r_lang \
+   r_crypto r_debug r_egg r_flag r_fs r_hash r_io r_lang \
r_magic r_parse r_reg r_search r_socket r_syscall r_util
 SHARED_LIBS+=  ${_lib} ${LIBV}
 .endfor
@@ -23,7 +23,8 @@ CONFIGURE_ARGS += --mandir=${PREFIX}/man \

Re: please help! apache ignoring ifmodule php

[kasak]

10.10.2017 12:52, kasak пишет:

10 окт. 2017 г., в 10:53, Zé Loff  написал(а):


On Mon, Oct 09, 2017 at 10:16:47PM +0300, kasak wrote:

Hello everybody!

Please look at my virtualhost config:


ServerName phpmyadmin
DocumentRoot /var/www/htdocs/phpmyadmin


 Options FollowSymLinks
 DirectoryIndex index.php
 Require ip 192.168.0


php_value upload_max_filesize 40M
php_value post_max_size 50M



apache ignoring php values here, the upload size is still 2048 Kb defaults.



Which version of apache?  Which version of PHP?  Where did you get the
module?

Is setting post_max_size on your /etc/php-*.ini (i.e. system-wide) a
viable option, or do you need a different default value for other
purposes?

--
 


I am using packages
apache-httpd-2.4.27p0
php-7.0.23
 From ports, openbsd version is 6.2.

Changing settings works from .htaccess works. But this is not the option, I 
need to change some php admin flags that can be changed only from httpd.conf or 
system-wide php.ini.





Hello again! I was able to fix this issue by commenting out  
lines. I don't know why but it helped! This is strange, because the same 
config with ifmodule lines worked well in linux.

CVS: cvs.openbsd.org: ports

[Joel Sing]

CVSROOT:/cvs
Module name:ports
Changes by: js...@cvs.openbsd.org   2017/10/10 08:57:06

Modified files:
lang/go-bootstrap: Makefile distinfo 
lang/go-bootstrap/pkg: PLIST 
Removed files:
lang/go-bootstrap/patches: patch-src_time_time_test_go 

Log message:
Switch lang/go-bootstrap to use the go1.4 release tarball.

Upstream is providing a tarball of the release-branch.go1.4 git branch,
which contains minor fixes to keep Go 1.4 building on current platforms.
Most of the patches that we currently have for lang/go-bootstrap have
now been committed upstream.

The current go1.4 release tarball contains one of the patches and most of
the remaining patches will be removed when a new release tarball becomes
available.

ok sthen@

CVS: cvs.openbsd.org: ports

[Aaron Bieber]

CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2017/10/10 07:32:07

Modified files:
lang/node  : Makefile distinfo 
lang/node/patches: patch-Makefile 
   
patch-deps_npm_node_modules_node-gyp_gyp_pylib_gyp_generator_make_py 
Added files:
lang/node/patches: patch-test_common_index_js 
   
patch-test_parallel_test-child-process-exec-timeout_js 
   patch-test_parallel_test-cluster-dgram-1_js 
   patch-test_parallel_test-http-dns-error_js 
   patch-test_parallel_test-net-dns-error_js 
   patch-test_parallel_test-process-execpath_js 
   patch-test_sequential_test-child-process-execsync_js 
   patch-test_sequential_test-module-loading_js 

Log message:
Update node to the latest.
Full changelog here: 
https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V6.md#6.11.4

Port changes:
- fix tests

No objections.

Re: [lang/go-bootstrap] Switch to go1.4 release tarball

[Joel Sing]

On Tuesday 10 October 2017 09:53:43 Stuart Henderson wrote:
> On 2017/10/09 03:34, Joel Sing wrote:
> > Upstream is providing a tarball of the release-branch.go1.4 git branch,
> > which contains minor fixes to keep Go 1.4 building on current platforms.
> > Most of the patches that we currently have for lang/go-bootstrap have
> > been committed upstream - one of these is already in the go1.4
> > release tarball that is available, while some have been committed and
> > 
> > will appear in the next tarball that's created:
> >   https://github.com/golang/go/issues/20672
> > 
> > Switch to the go1.4 release tarball so that we can drop a patch now and
> > in the future, drop most of the remaining patches.
> > 
> > ok?
> 
> before,   $ make show=PKGNAMES
> go-bootstrap-1.4.3p4
> 
> after,$ make show=PKGNAMES
> go-bootstrap-20170531
> 
> ok either way but I wonder if it would be better to keep 1.4 in the
> package name (e.g. something like 1.4.20170531)?

I had actually pondered the same thing - I'll change it to what you suggest 
since I agree that it is more intuitive/useful. Thanks.
 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/go-bootstrap/Makefile,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 Makefile
> > --- Makefile8 Oct 2017 15:40:56 -   1.6
> > +++ Makefile8 Oct 2017 16:28:57 -
> > @@ -4,11 +4,9 @@ ONLY_FOR_ARCHS =   ${GO_ARCHS}
> > 
> >  COMMENT =  Go programming language
> > 
> > -VERSION =  1.4.3
> > -EXTRACT_SUFX = .src.tar.gz
> > -DISTNAME = go${VERSION}
> > +VERSION =  20170531
> > +DISTNAME = go1.4-bootstrap-${VERSION}
> > 
> >  PKGNAME =  go-bootstrap-${VERSION}
> > 
> > -REVISION = 4
> > 
> >  CATEGORIES =   lang
> >  
> >  HOMEPAGE = https://golang.org/
> > 
> > @@ -22,7 +20,7 @@ PERMIT_DISTFILES_FTP =  bootstrap only
> > 
> >  WANTLIB =  c m pthread
> > 
> > -MASTER_SITES = https://golang.org/dl/
> > +MASTER_SITES = https://storage.googleapis.com/golang/
> > 
> >  BUILD_DEPENDS =shells/bash
> > 
> > @@ -84,7 +82,7 @@ do-install:
> > ${INSTALL_PROGRAM} -p ${WRKDIST}/bin/go{,fmt} ${GOROOT}/bin
> > 
> > @cd ${WRKDIST} && \
> > 
> > -   find . ! -name .hg\* -type f -maxdepth 1 \
> > +   find . ! -name .git\* ! -name .hg\* -type f -maxdepth 1 \
> > 
> > -exec ${INSTALL_DATA} -p {} \
> > ${GOROOT} \;
> > 
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/lang/go-bootstrap/distinfo,v
> > retrieving revision 1.1.1.1
> > diff -u -p -u -p -r1.1.1.1 distinfo
> > --- distinfo4 Dec 2015 17:19:18 -   1.1.1.1
> > +++ distinfo8 Oct 2017 16:28:57 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (go1.4.3.src.tar.gz) =
> > mUf8cFsLhBtZOMSLItwz6WR+wHUrrmblAnjfTyP2SVk=
> > -SIZE (go1.4.3.src.tar.gz) = 10875170
> > +SHA256 (go1.4-bootstrap-20170531.tar.gz) =
> > SfgG9mdiB3hht95wgfWGmVlAdy0p1MRQaME0RBp0P6I= +SIZE
> > (go1.4-bootstrap-20170531.tar.gz) = 11315348
> > Index: patches/patch-src_time_time_test_go
> > ===
> > RCS file: patches/patch-src_time_time_test_go
> > diff -N patches/patch-src_time_time_test_go
> > --- patches/patch-src_time_time_test_go 8 Oct 2017 15:40:56 -   
> > 1.1
> > +++ /dev/null   1 Jan 1970 00:00:00 -
> > @@ -1,14 +0,0 @@
> > -$OpenBSD: patch-src_time_time_test_go,v 1.1 2017/10/08 15:40:56 jsing Exp
> > $ -
> > -Index: src/time/time_test.go
> >  src/time/time_test.go.orig
> > -+++ src/time/time_test.go
> > -@@ -915,6 +915,8 @@ func TestCountMallocs(t *testing.T) {
> > - }
> > -
> > - func TestLoadFixed(t *testing.T) {
> > -+  t.Skip("skipping test for Go 1.4; Issue 17545")
> > -+
> > -   // Issue 4064: handle locations without any zone transitions.
> > -   loc, err := LoadLocation("Etc/GMT+1")
> > -   if err != nil {
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/lang/go-bootstrap/pkg/PLIST,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 PLIST
> > --- pkg/PLIST   4 Jun 2017 17:50:16 -   1.2
> > +++ pkg/PLIST   8 Oct 2017 16:28:58 -
> > @@ -375,11 +375,47 @@ go/bootstrap/misc/chrome/gophertool/goph
> > 
> >  go/bootstrap/misc/chrome/gophertool/manifest.json
> >  go/bootstrap/misc/chrome/gophertool/popup.html
> >  go/bootstrap/misc/chrome/gophertool/popup.js
> > 
> > +go/bootstrap/misc/dashboard/
> > +go/bootstrap/misc/dashboard/codereview/
> > +go/bootstrap/misc/dashboard/codereview/app.yaml
> > +go/bootstrap/misc/dashboard/codereview/cron.yaml
> > +go/bootstrap/misc/dashboard/codereview/dashboard/
> > +go/bootstrap/misc/dashboard/codereview/dashboard/cl.go
> > 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/10/10 06:33:49

Modified files:
textproc/mupdf : Makefile 
textproc/mupdf/patches: patch-source_fitz_load-jpx_c 

Log message:
MuPDF does some locking around its allocation calls; it overrides openjpeg's
allocators to do this locking too. However mupdf tries to manually align things
in a way that doesn't match what openjpeg does, which we noticed when frees
were segfaulting because the addresses didn't match up.

In the case of the openjpeg port it's relying on malloc(3)'s guarantee
"The allocated space is suitably aligned (after possible pointer coercion)
for storage of any type of object" so patch mupdf to do the same.

Fixes crash noticed by jca@ in 
https://www.broadband-forum.org/technical/download/TR-177.pdf

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/10/10 06:04:59

Modified files:
comms/smstools : Makefile distinfo 
comms/smstools/patches: patch-scripts_sendsms 
comms/smstools/pkg: PLIST 
Removed files:
comms/smstools/patches: patch-src_Makefile 

Log message:
update to smstools3-3.1.21

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/10/10 06:03:48

Modified files:
net/icinga/web2-module-director: Makefile distinfo 
net/icinga/web2-module-director/pkg: PLIST 

Log message:
update to icingaweb2-module-director-1.4.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/10/10 06:03:39

Modified files:
net/icinga/web2: Makefile distinfo 
net/icinga/web2/pkg: PLIST 

Log message:
update to icinga-web2-2.4.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/10/10 05:57:13

Modified files:
multimedia/get_iplayer: Makefile distinfo 
multimedia/get_iplayer/patches: patch-get_iplayer 

Log message:
update to get_iplayer-3.04

Re: README diff for SOGo with base relayd(8) and httpd(8)

[Stuart Henderson]

On 2017/10/10 13:34, Marcus MERIGHI wrote:
> Currently there is one major disadvantage of running SOGo behind
> relayd(8) and httpd(8), it is documented at 
> 
> https://sogo.nu/bugs/view.php?id=4252
> 
> For me the problem is seen with thunderbird when saving a changed
> calendar entry. The change is done by SOGo but the response is wrong,
> RFC-wise, so relayd(8) makes it an 500 (Internal Server error) and
> Thunderbird throws an error to the user.

Will upstream ever fix it if there's a workaround like this in the package
documentation?


> Anyways, this works for me:
> 
> Index: README

Anything which changes the package means you must bump REVISION.

> ===
> RCS file: /cvs/ports/www/sogo/pkg/README,v
> retrieving revision 1.21
> diff -u -p -u -r1.21 README
> --- README5 Jul 2017 21:11:50 -   1.21
> +++ README10 Oct 2017 11:15:18 -
> @@ -51,6 +51,95 @@ The SOPE PostgreSQL database adaptor is 
>  If you want to use a MySQL database as backend, you have to install
>  the sope-mysql package on the host where SOPE and SOGo are installed.
>  
> +SOGo with base relayd(8) and httpd(8)
> +===

The ='s are supposed to underline the above text, so there are meant to be
the same number of = as characters on the line above.

> +Edit /etc/relayd.conf
> +
> +table  { 127.0.0.1 }
> +table  { 127.0.0.1 }
> +table  { 127.0.0.1 }
> +
> +http protocol httpproto {
> +return error
> +block
> +
> +match request path "/SOGo/" forward to  tag dav
> +match request path "/SOGo/*" forward to  tag dav
> +match request path "/sogo/" forward to  tag dav
> +match request path "/sogo/*" forward to  tag dav
> +match request path "/SOGo.woa/*" forward to  tag davstat
> +
> +match response header remove "Server"
> +match response header set "Connection" value "close"
> +
> +match request header set "Keep-Alive" value "$TIMEOUT"
> +
> +match request tagged dav header set "X-Real-IP" \
> +  value "https://$REMOTE_ADDR;
> +match request tagged dav header set "X-Forwarded-By" \
> +  value "$SERVER_ADDR:$SERVER_PORT"
> +match request tagged dav header set "X-Forwarded-For" \
> +  value "$REMOTE_ADDR"
> +match request tagged dav header set "Host" value "davhost.dmn.tld"
> +match request tagged dav header set "x-webobjects-server-protocol" \
> +  value "HTTP/1.0"
> +match request tagged dav header set "x-webobjects-remote-host" \
> +  value "127.0.0.1"
> +match request tagged dav header set "x-webobjects-server-name" \
> +  value "davhost.dmn.tld"
> +match request tagged dav header set "x-webobjects-server-url" \
> +  value "https://davhost.dmn.tld/;
> +match request tagged dav header set "x-webobjects-server-port" \
> +  value "$SERVER_PORT"
> +
> +match request url log
> +
> +pass request method HEAD
> +pass request method GET
> +pass request method POST
> +
> +pass request tagged dav method PUT
> +pass request tagged dav method DELETE
> +pass request tagged dav method MKCOL
> +pass request tagged dav method MOVE
> +pass request tagged dav method OPTIONS
> +pass request tagged dav method PROPFIND
> +pass request tagged dav method REPORT
> +
> +tcp { nodelay, sack }
> +}
> +relay httpredir {
> +listen on 127.0.0.1 port http
> +listen on 127.0.0.1 port http tls
> +protocol httpproto
> +forward to  port 19000
> +forward to  port 2
> +forward to  port 18000
> +}
> +
> +# mkdir -p ${VARBASE}/www/htdocs/sogo/SOGo.woa/WebServerResources
> +# cp -R ${TRUEPREFIX}/lib/GNUstep/SOGo/WebServerResources \
> +${VARBASE}/www/htdocs/sogo/SOGo.woa/WebServerResources
> +
> +Edit /etc/httpd.conf
> +
> +# redirect from http to https
> +server davhost.dmn.tld {
> +listen on 127.0.0.1 port 19000
> +block return 301 "https://davhost.dmn.tld/SOGo/;
> +}
> +# serve other websites like this
> +server some.website.tld {
> +listen on 127.0.0.1 port 19000
> +root "/htdocs/somewebsite"
> +}
> +# serve sogo static content
> +server sogo {
> +listen on 127.0.0.1 port 18000
> +root "/htdocs/sogo"
> +directory no auto index
> +}
> +
>  SOGo with nginx
>  ===
>  Since nginx configuration is not explained in the SOGo Manual, here is an 
> example.
> 

README diff for SOGo with base relayd(8) and httpd(8)

[Marcus MERIGHI]

Currently there is one major disadvantage of running SOGo behind
relayd(8) and httpd(8), it is documented at 

https://sogo.nu/bugs/view.php?id=4252

For me the problem is seen with thunderbird when saving a changed
calendar entry. The change is done by SOGo but the response is wrong,
RFC-wise, so relayd(8) makes it an 500 (Internal Server error) and
Thunderbird throws an error to the user.

Anyways, this works for me:

Index: README
===
RCS file: /cvs/ports/www/sogo/pkg/README,v
retrieving revision 1.21
diff -u -p -u -r1.21 README
--- README  5 Jul 2017 21:11:50 -   1.21
+++ README  10 Oct 2017 11:15:18 -
@@ -51,6 +51,95 @@ The SOPE PostgreSQL database adaptor is 
 If you want to use a MySQL database as backend, you have to install
 the sope-mysql package on the host where SOPE and SOGo are installed.
 
+SOGo with base relayd(8) and httpd(8)
+===
+Edit /etc/relayd.conf
+
+table  { 127.0.0.1 }
+table  { 127.0.0.1 }
+table  { 127.0.0.1 }
+
+http protocol httpproto {
+return error
+block
+
+match request path "/SOGo/" forward to  tag dav
+match request path "/SOGo/*" forward to  tag dav
+match request path "/sogo/" forward to  tag dav
+match request path "/sogo/*" forward to  tag dav
+match request path "/SOGo.woa/*" forward to  tag davstat
+
+match response header remove "Server"
+match response header set "Connection" value "close"
+
+match request header set "Keep-Alive" value "$TIMEOUT"
+
+match request tagged dav header set "X-Real-IP" \
+  value "https://$REMOTE_ADDR;
+match request tagged dav header set "X-Forwarded-By" \
+  value "$SERVER_ADDR:$SERVER_PORT"
+match request tagged dav header set "X-Forwarded-For" \
+  value "$REMOTE_ADDR"
+match request tagged dav header set "Host" value "davhost.dmn.tld"
+match request tagged dav header set "x-webobjects-server-protocol" \
+  value "HTTP/1.0"
+match request tagged dav header set "x-webobjects-remote-host" \
+  value "127.0.0.1"
+match request tagged dav header set "x-webobjects-server-name" \
+  value "davhost.dmn.tld"
+match request tagged dav header set "x-webobjects-server-url" \
+  value "https://davhost.dmn.tld/;
+match request tagged dav header set "x-webobjects-server-port" \
+  value "$SERVER_PORT"
+
+match request url log
+
+pass request method HEAD
+pass request method GET
+pass request method POST
+
+pass request tagged dav method PUT
+pass request tagged dav method DELETE
+pass request tagged dav method MKCOL
+pass request tagged dav method MOVE
+pass request tagged dav method OPTIONS
+pass request tagged dav method PROPFIND
+pass request tagged dav method REPORT
+
+tcp { nodelay, sack }
+}
+relay httpredir {
+listen on 127.0.0.1 port http
+listen on 127.0.0.1 port http tls
+protocol httpproto
+forward to  port 19000
+forward to  port 2
+forward to  port 18000
+}
+
+# mkdir -p ${VARBASE}/www/htdocs/sogo/SOGo.woa/WebServerResources
+# cp -R ${TRUEPREFIX}/lib/GNUstep/SOGo/WebServerResources \
+${VARBASE}/www/htdocs/sogo/SOGo.woa/WebServerResources
+
+Edit /etc/httpd.conf
+
+# redirect from http to https
+server davhost.dmn.tld {
+listen on 127.0.0.1 port 19000
+block return 301 "https://davhost.dmn.tld/SOGo/;
+}
+# serve other websites like this
+server some.website.tld {
+listen on 127.0.0.1 port 19000
+root "/htdocs/somewebsite"
+}
+# serve sogo static content
+server sogo {
+listen on 127.0.0.1 port 18000
+root "/htdocs/sogo"
+directory no auto index
+}
+
 SOGo with nginx
 ===
 Since nginx configuration is not explained in the SOGo Manual, here is an 
example.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/10 04:21:51

Modified files:
graphics/babl  : Makefile distinfo 

Log message:
Update to babl-0.1.34.

UPDATE: net/bitlbee-facebook

[Michal Mazurek]

The previous version stopped working.

OK?

Index: net/bitlbee-facebook/Makefile
===
RCS file: /cvs/ports/net/bitlbee-facebook/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- net/bitlbee-facebook/Makefile   28 May 2017 14:16:12 -  1.2
+++ net/bitlbee-facebook/Makefile   10 Oct 2017 10:03:25 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.2 2017/05/28 14:16:12 ajacoutot Exp $
 
 COMMENT=   Facebook Messenger protocol plugin for bitlbee
-V= 1.1.1
+V= 1.1.2
 DISTNAME=  bitlbee-facebook-$V
 REVISION=  0
 CATEGORIES=net
Index: net/bitlbee-facebook/distinfo
===
RCS file: /cvs/ports/net/bitlbee-facebook/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- net/bitlbee-facebook/distinfo   28 May 2017 11:59:36 -  1.1.1.1
+++ net/bitlbee-facebook/distinfo   10 Oct 2017 10:03:25 -
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-facebook-1.1.1.tar.gz) = 
NAhNEkMpx0xeThJ+tnLZmaWd7rK9wYPVndbFATfFU8U=
-SIZE (bitlbee-facebook-1.1.1.tar.gz) = 396646
+SHA256 (bitlbee-facebook-1.1.2.tar.gz) = 
O5RfgFdzoO8nyXIHzbqmUESr5QvmqpV08sMZ+OU4CWg=
+SIZE (bitlbee-facebook-1.1.2.tar.gz) = 397445

-- 
Michal Mazurek

Re: please help! apache ignoring ifmodule php

[kasak]

> 10 окт. 2017 г., в 10:53, Zé Loff  написал(а):
> 
> 
> On Mon, Oct 09, 2017 at 10:16:47PM +0300, kasak wrote:
>> Hello everybody!
>> 
>> Please look at my virtualhost config:
>> 
>> 
>> ServerName phpmyadmin
>> DocumentRoot /var/www/htdocs/phpmyadmin
>> 
>> 
>> Options FollowSymLinks
>> DirectoryIndex index.php
>> Require ip 192.168.0
>> 
>> 
>> php_value upload_max_filesize 40M
>> php_value post_max_size 50M
>> 
>> 
>> 
>> apache ignoring php values here, the upload size is still 2048 Kb defaults.
>> 
>> 
> 
> Which version of apache?  Which version of PHP?  Where did you get the
> module?
> 
> Is setting post_max_size on your /etc/php-*.ini (i.e. system-wide) a
> viable option, or do you need a different default value for other
> purposes?
> 
> -- 
>  
> 

I am using packages
apache-httpd-2.4.27p0
php-7.0.23
From ports, openbsd version is 6.2.

Changing settings works from .htaccess works. But this is not the option, I 
need to change some php admin flags that can be changed only from httpd.conf or 
system-wide php.ini.

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2017/10/10 03:22:53

Modified files:
devel  : Makefile 

Log message:
+devel/py-hgnested

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2017/10/10 03:21:11

Log message:
From Sebastien Marie. OK danj@.

Comment:
mercurial extension to work with nested repositories

Description:
Mercurial extension to work with nested repositories.

It was inspired by the forest extension.

The extension allow to apply common Mercurial commands to all the nested
repositories at once like pull, push etc. It allow also to fetch a complete
tree of repositories through ssh or http.

Maintainer: The OpenBSD ports mailing-list 

WWW: https://bitbucket.org/cedk/hgnested

Status:

Vendor Tag: juanfra
Release Tags:   juanfra_20171010

N ports/devel/py-hgnested/Makefile
N ports/devel/py-hgnested/distinfo
N ports/devel/py-hgnested/pkg/DESCR
N ports/devel/py-hgnested/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/10/10 03:20:48

Modified files:
net/ocserv : Makefile distinfo 
net/ocserv/patches: patch-configure_ac patch-doc_sample_config 
patch-tests_data_test1_passwd 

Log message:
update to ocserv-0.11.9

Re: UPDATE: net/lftp

[Stuart Henderson]

On 2017/10/09 22:34, Rafael Sadowski wrote:
> +RUN_DEPENDS +=   devel/desktop-file-utils \
> + x11/gtk+3,-guic

oh yuk, please don't pull that in for a CLI ftp client..

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/10/10 02:55:31

Modified files:
devel/py-hg-git: Makefile 

Log message:
fix bogus ${MODPY_PY_PREFIX} in DISTNAME, inadvertently found by semarie :)

Re: [lang/go-bootstrap] Switch to go1.4 release tarball

[Stuart Henderson]

On 2017/10/09 03:34, Joel Sing wrote:
> Upstream is providing a tarball of the release-branch.go1.4 git branch,
> which contains minor fixes to keep Go 1.4 building on current platforms.
> Most of the patches that we currently have for lang/go-bootstrap have
> been committed upstream - one of these is already in the go1.4
> release tarball that is available, while some have been committed and
> will appear in the next tarball that's created:
> 
>   https://github.com/golang/go/issues/20672
> 
> Switch to the go1.4 release tarball so that we can drop a patch now and
> in the future, drop most of the remaining patches.
> 
> ok?

before,   $ make show=PKGNAMES
go-bootstrap-1.4.3p4

after,$ make show=PKGNAMES 
go-bootstrap-20170531

ok either way but I wonder if it would be better to keep 1.4 in the
package name (e.g. something like 1.4.20170531)?




> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/go-bootstrap/Makefile,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile
> --- Makefile  8 Oct 2017 15:40:56 -   1.6
> +++ Makefile  8 Oct 2017 16:28:57 -
> @@ -4,11 +4,9 @@ ONLY_FOR_ARCHS = ${GO_ARCHS}
>  
>  COMMENT =Go programming language
>  
> -VERSION =1.4.3
> -EXTRACT_SUFX =   .src.tar.gz
> -DISTNAME =   go${VERSION}
> +VERSION =20170531
> +DISTNAME =   go1.4-bootstrap-${VERSION}
>  PKGNAME =go-bootstrap-${VERSION}
> -REVISION =   4
>  CATEGORIES = lang
>  
>  HOMEPAGE =   https://golang.org/
> @@ -22,7 +20,7 @@ PERMIT_DISTFILES_FTP =  bootstrap only
>  
>  WANTLIB =c m pthread
>  
> -MASTER_SITES =   https://golang.org/dl/
> +MASTER_SITES =   https://storage.googleapis.com/golang/
>  
>  BUILD_DEPENDS =  shells/bash
>  
> @@ -84,7 +82,7 @@ do-install:
>   ${INSTALL_PROGRAM} -p ${WRKDIST}/bin/go{,fmt} ${GOROOT}/bin
>  
>   @cd ${WRKDIST} && \
> - find . ! -name .hg\* -type f -maxdepth 1 \
> + find . ! -name .git\* ! -name .hg\* -type f -maxdepth 1 \
>   -exec ${INSTALL_DATA} -p {} \
>   ${GOROOT} \;
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/go-bootstrap/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo  4 Dec 2015 17:19:18 -   1.1.1.1
> +++ distinfo  8 Oct 2017 16:28:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (go1.4.3.src.tar.gz) = mUf8cFsLhBtZOMSLItwz6WR+wHUrrmblAnjfTyP2SVk=
> -SIZE (go1.4.3.src.tar.gz) = 10875170
> +SHA256 (go1.4-bootstrap-20170531.tar.gz) = 
> SfgG9mdiB3hht95wgfWGmVlAdy0p1MRQaME0RBp0P6I=
> +SIZE (go1.4-bootstrap-20170531.tar.gz) = 11315348
> Index: patches/patch-src_time_time_test_go
> ===
> RCS file: patches/patch-src_time_time_test_go
> diff -N patches/patch-src_time_time_test_go
> --- patches/patch-src_time_time_test_go   8 Oct 2017 15:40:56 -   
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_time_time_test_go,v 1.1 2017/10/08 15:40:56 jsing Exp $
> -
> -Index: src/time/time_test.go
>  src/time/time_test.go.orig
> -+++ src/time/time_test.go
> -@@ -915,6 +915,8 @@ func TestCountMallocs(t *testing.T) {
> - }
> - 
> - func TestLoadFixed(t *testing.T) {
> -+t.Skip("skipping test for Go 1.4; Issue 17545")
> -+
> - // Issue 4064: handle locations without any zone transitions.
> - loc, err := LoadLocation("Etc/GMT+1")
> - if err != nil {
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/lang/go-bootstrap/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- pkg/PLIST 4 Jun 2017 17:50:16 -   1.2
> +++ pkg/PLIST 8 Oct 2017 16:28:58 -
> @@ -375,11 +375,47 @@ go/bootstrap/misc/chrome/gophertool/goph
>  go/bootstrap/misc/chrome/gophertool/manifest.json
>  go/bootstrap/misc/chrome/gophertool/popup.html
>  go/bootstrap/misc/chrome/gophertool/popup.js
> +go/bootstrap/misc/dashboard/
> +go/bootstrap/misc/dashboard/codereview/
> +go/bootstrap/misc/dashboard/codereview/app.yaml
> +go/bootstrap/misc/dashboard/codereview/cron.yaml
> +go/bootstrap/misc/dashboard/codereview/dashboard/
> +go/bootstrap/misc/dashboard/codereview/dashboard/cl.go
> +go/bootstrap/misc/dashboard/codereview/dashboard/front.go
> +go/bootstrap/misc/dashboard/codereview/dashboard/gc.go
> +go/bootstrap/misc/dashboard/codereview/dashboard/mail.go
> +go/bootstrap/misc/dashboard/codereview/dashboard/people.go
> +go/bootstrap/misc/dashboard/codereview/index.yaml
> +go/bootstrap/misc/dashboard/codereview/queue.yaml
> +go/bootstrap/misc/dashboard/codereview/static/
> +go/bootstrap/misc/dashboard/codereview/static/gopherstamp.jpg
> 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/10 02:50:11

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

Log message:
Update to goocanvas2-2.0.4.

Re: [update] vdirsyncer 0.16.3

[Remi Locherer]

On Mon, Oct 09, 2017 at 03:02:49PM -0400, Daniel Jakots wrote:
> On Sat, 7 Oct 2017 23:21:31 +0200, Remi Locherer
>  wrote:
> 
> > Hi,
> > 
> > this is an update for vdirsyncer to version 0.16.3 which was released
> > few days ago. See
> > https://vdirsyncer.pimutils.org/en/stable/changelog.html for changes.
> > 
> > This patch also enables tests and shortens some long lines in
> > Makefile.
> 
> lgtm
> 
> > The tests depend on two python modules that are not available in ports
> > yet. py-test-localserver
> 
> it needs requests as a TDEP, can you put MODPY_PI and MODPY_SETUPTOOLS
> just after MODULES please?

Thanks for spotting this! Attached the fixed ports.

Remi

> 
> > and py-test-subtesthack are attached to this mail.
> 
> same things about Makefile order as above?
> 
> > The author of vdirsyncer announced that the next version will include
> > some rust code. That means in the future this port will only be
> > available on i386 and amd64.
> > 
> > Remi
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/productivity/vdirsyncer/Makefile,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 Makefile
> > --- Makefile31 Aug 2017 16:30:23 -  1.4
> > +++ Makefile7 Oct 2017 21:16:02 -
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT =  synchronize calendars and contacts
> >  
> > -MODPY_EGG_VERSION =0.16.2
> > +MODPY_EGG_VERSION =0.16.3
> >  DISTNAME = vdirsyncer-${MODPY_EGG_VERSION}
> >  CATEGORIES =   productivity
> >  
> > @@ -28,19 +28,30 @@ RUN_DEPENDS =
> > devel/py-atomicwrites${MO devel/py-click-threading${MODPY_FLAVOR} \
> > www/py-requests-toolbelt${MODPY_FLAVOR}
> >  
> > +TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \
> > +   devel/py-test-localserver${MODPY_FLAVOR} \
> > +   devel/py-test-subtesthack${MODPY_FLAVOR} \
> > +   www/py-urllib3${MODPY_FLAVOR} \
> > +   ${RUN_DEPENDS}
> > +
> >  post-build:
> > cd ${WRKSRC}/docs; ${MAKE_ENV} PYTHONPATH=${WRKSRC} \
> > -   sphinx-build${MODPY_BIN_SUFFIX} -b html -d
> > _build/doctrees . _build/html
> > +   sphinx-build${MODPY_BIN_SUFFIX} \
> > +   -b html -d _build/doctrees . _build/html
> >  
> >  post-install:
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vdirsyncer
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vdirsyncer
> > -   cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst
> > CONTRIBUTING.rst \
> > -   ISSUE_TEMPLATE.md LICENSE README.rst
> > ${PREFIX}/share/doc/vdirsyncer
> > -   cd ${WRKSRC}/docs/_build/html && pax -rw *
> > ${PREFIX}/share/doc/vdirsyncer
> > +   cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst \
> > +   CONTRIBUTING.rst ISSUE_TEMPLATE.md LICENSE
> > README.rst \
> > +   ${PREFIX}/share/doc/vdirsyncer
> > +   cd ${WRKSRC}/docs/_build/html && \
> > +   pax -rw * ${PREFIX}/share/doc/vdirsyncer
> > ${INSTALL_DATA} ${WRKSRC}/config.example \
> > ${PREFIX}/share/examples/vdirsyncer
> >  
> > -NO_TEST =  Yes
> > +do-test:
> > +   cd ${WRKSRC}; DAV_SERVER=skip DETERMINISTIC_TESTS=true \
> > +   ${MODPY_BIN} -m pytest tests/
> >  
> >  .include 
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/productivity/vdirsyncer/distinfo,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 distinfo
> > --- distinfo31 Aug 2017 16:30:23 -  1.3
> > +++ distinfo7 Oct 2017 21:16:02 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (vdirsyncer-0.16.2.tar.gz) =
> > qoGfKfS80ffdVqmNzt23GVasiQ2KNEFN+aLe+lj/uKc= -SIZE
> > (vdirsyncer-0.16.2.tar.gz) = 112083 +SHA256
> > (vdirsyncer-0.16.3.tar.gz)
> > = /F9sUiXViLAe4iU1inwJYoOJaiompPAsllHPk6Jb/DY= +SIZE
> > (vdirsyncer-0.16.3.tar.gz) = 113327 Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/productivity/vdirsyncer/pkg/PLIST,v retrieving
> > revision 1.3 diff -u -p -r1.3 PLIST
> > --- pkg/PLIST   31 Aug 2017 16:30:23 -  1.3
> > +++ pkg/PLIST   7 Oct 2017 21:16:02 -
> > @@ -17,7 +17,6 @@ lib/python${MODPY_VERSION}/site-packages
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}metasync.${MODPY_PYC_MAGIC_TAG}pyc
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}repair.${MODPY_PYC_MAGIC_TAG}pyc
> > -lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> >  
> > lib/python${MODPY_VERSION}/site-packages/vdirsyncer/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
> >