Re: plan9port: use getifaddrs(3) instead of kvm(3)

[Martin Pieuchot]

On 07/12/15(Mon) 18:51, Gleydson Soares wrote:
> Hi,
> 
> plan9/plan9port is broken after network stack changes in net/if_var.h
> here is a diff that convert plan9port to use getifaddrs(3) instead of kvm(3) 
> in p9p auxstats.
> 
> builds and runs fine(auxstats is incrementing and seems ok), but I would 
> appreciate other eyes(review),

Diff reads fine, ok with me. 

> Index: Makefile
> ===
> RCS file: /cvs/ports/plan9/plan9port/Makefile,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 Makefile
> --- Makefile  4 Dec 2015 04:26:33 -   1.10
> +++ Makefile  7 Dec 2015 21:36:31 -
> @@ -6,7 +6,7 @@ BROKEN-powerpc =  threading issues
>  COMMENT =Plan 9 from user space
>  
>  DISTNAME =   plan9port-2015
> -REVISION =   0
> +REVISION =   1
>  
>  GH_ACCOUNT = 9fans
>  GH_PROJECT = plan9port
> Index: patches/patch-src_cmd_auxstats_OpenBSD_c
> ===
> RCS file: patches/patch-src_cmd_auxstats_OpenBSD_c
> diff -N patches/patch-src_cmd_auxstats_OpenBSD_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_cmd_auxstats_OpenBSD_c  7 Dec 2015 21:36:31 -
> @@ -0,0 +1,157 @@
> +$OpenBSD$
> +
> +replace kvm(3) with getifaddrs(3)
> +
> +--- src/cmd/auxstats/OpenBSD.c.orig  Wed Nov 11 12:09:34 2015
>  src/cmd/auxstats/OpenBSD.c   Mon Dec  7 02:20:58 2015
> +@@ -1,14 +1,12 @@
> + #include 
> +-#include 
> +-#include 
> + #include 
> + #include 
> + #include 
> + #include 
> ++#include 
> + #include 
> + #include 
> + #include 
> +-#include 
> + #include 
> + #include 
> + #include 
> +@@ -24,11 +22,9 @@ void xcpu(int);
> + void xswap(int);
> + void xsysctl(int);
> + void xnet(int);
> +-void xkvm(int);
> + 
> + void (*statfn[])(int) =
> + {
> +-xkvm,
> + xapm,
> + xloadavg,
> + xcpu,
> +@@ -37,14 +33,6 @@ void (*statfn[])(int) =
> + 0
> + };
> + 
> +-static kvm_t *kvm;
> +-
> +-static struct nlist nl[] = {
> +-{ "_ifnet" },
> +-{ "_cp_time" },
> +-{ "" }
> +-};
> +-
> + void
> + xloadavg(int first)
> + {
> +@@ -76,78 +64,37 @@ xapm(int first)
> + Bprint(, "battery =%d 100\n", ai.battery_life);
> + }
> + 
> +-
> + void
> +-kvminit(void)
> +-{
> +-char buf[_POSIX2_LINE_MAX];
> +-
> +-if(kvm)
> +-return;
> +-kvm = kvm_openfiles(nil, nil, nil, O_RDONLY, buf);
> +-if(kvm == nil) {
> +-fprint(2, "kvm open error\n%s", buf);
> +-return;
> +-}
> +-if(kvm_nlist(kvm, nl) < 0 || nl[0].n_type == 0){
> +-kvm = nil;
> +-return;
> +-}
> +-}
> +-
> +-void
> +-xkvm(int first)
> +-{
> +-if(first)
> +-kvminit();
> +-}
> +-
> +-int
> +-kread(ulong addr, char *buf, int size)
> +-{
> +-if(kvm_read(kvm, addr, buf, size) != size){
> +-memset(buf, 0, size);
> +-return -1;
> +-}
> +-return size;
> +-}
> +-
> +-void
> + xnet(int first)
> + {
> + ulong out, in, outb, inb, err;
> +-static ulong ifnetaddr;
> +-ulong addr;
> +-struct ifnet ifnet;
> +-struct ifnet_head ifnethead;
> +-char name[16];
> ++struct ifaddrs *ifa, *ifap;
> ++struct if_data *ifd = NULL;
> + 
> +-if(first)
> ++if (first)
> + return;
> + 
> +-if(ifnetaddr == 0){
> +-ifnetaddr = nl[0].n_value;
> +-if(ifnetaddr == 0)
> +-return;
> +-}
> ++out = in = outb = inb = err = 0;
> + 
> +-if(kread(ifnetaddr, (char*), sizeof ifnethead) < 0)
> ++if (getifaddrs() == -1)
> + return;
> + 
> +-out = in = outb = inb = err = 0;
> +-addr = (ulong)TAILQ_FIRST();
> +-while(addr){
> +-if(kread(addr, (char*), sizeof ifnet) < 0
> +-|| kread((ulong)ifnet.if_xname, name, 16) < 0)
> +-return;
> +-name[15] = 0;
> +-addr = (ulong)TAILQ_NEXT(, if_list);
> +-out += ifnet.if_opackets;
> +-in += ifnet.if_ipackets;
> +-outb += ifnet.if_obytes;
> +-inb += ifnet.if_ibytes;
> +-err += ifnet.if_oerrors+ifnet.if_ierrors;
> ++for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
> ++if (ifa->ifa_addr == NULL ||
> ++ifa->ifa_addr->sa_family != AF_LINK)
> ++continue;
> ++
> ++ifd = ifa->ifa_data;
> ++
> ++if (ifd != NULL) {
> ++out += ifd->ifi_opackets;
> ++in += ifd->ifi_ipackets;
> ++outb += ifd->ifi_obytes;
> ++inb += ifd->ifi_ibytes;
> ++err += ifd->ifi_ierrors;
> ++}
> + }
> ++
> + Bprint(, "etherin %lud 1000\n", in);
> + Bprint(, "etherout %lud 1000\n", out);
> + Bprint(, "etherinb %lud 100\n", inb);
> +@@ -155,6 +102,8 @@ xnet(int first)
> + 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/08 02:20:24

Modified files:
sysutils/logstash/logstash: Makefile distinfo 
sysutils/logstash/logstash/patches: patch-bin_logstash_lib_sh 
sysutils/logstash/logstash/pkg: PLIST 

Log message:
- update to logstash-2.1.1

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2015/12/08 02:05:39

Added files:
x11/kde4/artwork/patches: 
  patch-kscreensaver_xsavers_CMakeLists_txt 

Log message:
Unbreak configure stage, similar problem as with KUser before.

Spotted again by naddy@.

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2015/12/08 06:05:29

Modified files:
plan9/plan9port: Makefile 
Added files:
plan9/plan9port/patches: patch-src_cmd_auxstats_OpenBSD_c 
 patch-src_cmd_auxstats_mkfile 

Log message:
- use getifaddrs(3) instead of kvm(3)
- stop linking with kvm(3). OpenBSD's p9p/auxstats no longer uses libkvm. 
(reminded by jasper@)

OK mpi@ jasper@

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2015/12/08 03:46:38

Modified files:
net/owncloudclient: Makefile distinfo 
net/owncloudclient/patches: patch-CMakeLists_txt 
patch-src_gui_application_cpp 
patch-src_libsync_utility_cpp 
net/owncloudclient/pkg: PLIST 
Removed files:
net/owncloudclient/patches: patch-csync_src_httpbf_src_httpbf_c 

Log message:
update to owncloudclient-2.1.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/08 04:03:29

Modified files:
security/clamav-unofficial-sigs: Makefile 
security/clamav-unofficial-sigs/patches: 
 
patch-clamav-unofficial-sigs_conf 

Log message:
tweak sample config

Re: [UPDATE] otter-browser 0.9.07 beta 7 => 0.9.08 beta 8

[Adam Wolk]

On Tue, 1 Dec 2015 22:41:44 +0100
Adam Wolk  wrote:

> Hi ports@,
> 
> Otter browser beta 8 has been just released
> 
> Notable changes since previous port:
>  - the port again needs patches we revert commit:
>   
> https://github.com/OtterBrowser/otter-browser/commit/aa597af34b2add313c85c3be3e82253d4f999ebe
>as it leads to an immediate crash on OpenBSD which looks like a
>double free or a null pointer use. The issue is in a bundled 3rd
>party library and has been reported upstream:
>   https://github.com/Chocimier/libmimeapps/issues/1
>  - otter cleaned up their translation naming scheme so a lot of the
>translation files in pkg/PLIST moved around
>  - there is a new WANTLIB Qt5XmlPatterns
> 
> Screenshot of the browser running with serveral MDI
> windows & the about dialog:
>   http://imgur.com/aZgCxJF
> 
> If you've been holding out this is the release to try the browser out
> (normal URL bar!).
> 
> Notable changes since version 0.9.07 (app wise):
>  * enhanced URL completion in address field:
>   - suggest bookmarks by URL and keyword;
>   - suggest URLs from history;
>   - suggest searching for given string using default search engine;
>   - allow to use popup with list of suggestions;
>  * added new extremely flexible mouse gestures system;
>  * added icons for badge in address field;
>  * added FTP listing support to QtWebKit backend;
>  * added SSL certificate viewer;
>  * added Website Information dialog;
>  * added configuration module for downloads handlers;
>  * added configuration module for mouse gestures;
>  * added command line option to print out diagnostic report
> (--report);
>  * added support for configuring policy for popup windows;
>  * updated style of error pages and directory listings;
>  * many other fixes and improvements.
> 
> Tested on amd64 -current snapshot from 28th of November using the
> Gnome desktop using qt5-5.4.1p9.
> 
> Off topic: any plans to bump qt5 to 5.5 or 5.6 when it comes out?
> Upstream would like to plan out bumping the required Qt version up, we
> have some time as the required minimum atm is just 5.2 :) 
> 
> Known issues reported upstream:
>  - Otter will default to the file:// protocol if it detects a file
>matching the provided name (assuming protocol was not provided)
>https://github.com/OtterBrowser/otter-browser/issues/1015
> 

Ping. Anyone?

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/otter-browser/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile  4 Sep 2015 21:59:36 -   1.9
> +++ Makefile  1 Dec 2015 21:37:12 -
> @@ -3,7 +3,7 @@ COMMENT = browser aiming to recreate cl
>  
>  GH_ACCOUNT = OtterBrowser
>  GH_PROJECT = otter-browser
> -V =  0.9.07
> +V =  0.9.08
>  GH_TAGNAME = v$V
>  
>  DISTNAME =   ${GH_PROJECT}-$V
> @@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM =  Yes
>  
>  WANTLIB +=   c m pthread Qt5Core Qt5DBus Qt5Gui
> Qt5Multimedia WANTLIB +=  Qt5Network Qt5PrintSupport
> Qt5Script -WANTLIB += Qt5Sql Qt5WebKit
> Qt5WebKitWidgets Qt5Widgets +WANTLIB +=   Qt5Sql
> Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5XmlPatterns 
>  RUN_DEPENDS =devel/desktop-file-utils x11/gtk+3,-guic
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/otter-browser/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo  4 Sep 2015 21:59:36 -   1.6
> +++ distinfo  1 Dec 2015 21:37:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (otter-browser-0.9.07.tar.gz) =
> HCdQn5c2qcmeEqPvI7CMxBVIrX9tdIG/BwIPtHF4jak= -SIZE
> (otter-browser-0.9.07.tar.gz) = 2634317 +SHA256
> (otter-browser-0.9.08.tar.gz) =
> tGBqylmDuQsjKpBRfyg8LGoQRfKVNSeStKLAClG11Mg= +SIZE
> (otter-browser-0.9.08.tar.gz) = 3124966 Index:
> patches/patch-3rdparty_libmimeapps_Index_cpp
> ===
> RCS file: patches/patch-3rdparty_libmimeapps_Index_cpp diff -N
> patches/patch-3rdparty_libmimeapps_Index_cpp --- /dev/null1
> Jan 1970 00:00:00 - +++
> patches/patch-3rdparty_libmimeapps_Index_cpp  1 Dec 2015
> 21:37:12 - @@ -0,0 +1,56 @@ +$OpenBSD$ +---
> 3rdparty/libmimeapps/Index.cpp.orig   Tue Dec  1 19:50:55 2015
>  3rdparty/libmimeapps/Index.cpp   Tue Dec  1 21:40:01 2015
> +@@ -49,19 +49,8 @@ Index::Index(const std::string ):
> + {
> + findDirectories();
> + createBase();
> +-removeUnused();
> + }
> + 
> +-Index::~Index()
> +-{
> +-std::map::iterator application;
> +-
> +-for (application = knownApplications_.begin();
> application != knownApplications_.end(); ++application) +-{
> +-delete application->second;
> +-}
> +-}
> +-
> + std::vector Index::appsForMime(const std::string
> ) const
> 

CVS: cvs.openbsd.org: ports

[Tobias Ulmer]

CVSROOT:/cvs
Module name:ports
Changes by: tobi...@cvs.openbsd.org 2015/12/08 05:33:26

Modified files:
devel/tig  : Makefile 

Log message:
Michael Reed volunteered to maintain tig, thanks

Re: Update: cmake-3.4.0

[Christian Weisgerber]

David Coppa:

> Here's the update to CMake-3.4.0.
> 
> Please test it or (even better) put it into your next bulk build.

All the fallout that showed up in an amd64 bulk build has been
fixed.  I'd say, go ahead, even though more breakage may be hiding
behind the net-snmp failure.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/08 06:55:01

Modified files:
www/otter-browser: Makefile distinfo 
www/otter-browser/pkg: PLIST 
Added files:
www/otter-browser/patches: patch-3rdparty_libmimeapps_Index_cpp 
   patch-3rdparty_libmimeapps_Index_h 

Log message:
update to otter-browser-0.9.08, from maintainer Adam Wolk

Re: lang/go-bootstrap

[Joel Sing]

On Monday 07 December 2015 23:31:34 Stuart Henderson wrote:
> On 2015/12/08 10:05, Joel Sing wrote:
> > On Monday 07 December 2015 14:18:52 Kent R. Spillner wrote:
> > > On Tue, Dec 08, 2015 at 02:29:03AM +1100, Joel Sing wrote:
> > > > This brings me to the next issue/topic - installing additional
> > > > packages
> > > > under /usr/local/go is probably a bad idea.
> > > 
> > > My recollection is that the other issues you mentioned were necessary in
> > > order to make this work.  So if everyone agrees to a fix for this then I
> > > believe the others just go away.
> > > 
> > > > There are likely two options - we could install packages in a separate
> > > > location (e.g. /usr/local/go-pkg) and then when code is built it is
> > > > added
> > > > to GOPATH. Alternatively, the code is fetched and built when the
> > > > binary
> > > > is built
> > > 
> > > I think option #1 (install packages in a separate location and then add
> > > it
> > > to GOPATH) is our only choice because ports shouldn't fetch anything
> > > during
> > > builds.
> > 
> > I was moreso thinking along the lines of using 'go get -d' to fetch the
> > sources,
> 
> This is the main problem that go.port.mk was trying to solve - file fetching
> is done by ports infrastructure, not by the port itself. In the bulk build
> case, this is totally under control of DPB which calls out to ftp(1) to
> fetch as a separate uid, and DPB checks the hash itself - the port Makefile
> is only used to fetch the filename/url.
> 
> The uid running the actual port build doesn't have network privileges.

Thanks for clarlifying - we could still implement 'go get -d' as a way of 
getting sources, but it would be more work than it is likely worth (and there 
are also some issues surrounding which versions of the dependencies get 
fetched).

I'll rework go.port.mk and the relevant packages using /usr/local/go-pkg.

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2015/12/08 06:41:01

Modified files:
plan9/plan9port/patches: patch-src_cmd_auxstats_OpenBSD_c 
 patch-src_cmd_auxstats_mkfile 

Log message:
patches already sent upstream
https://plan9port-review.googlesource.com/1410

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/08 07:48:00

Modified files:
net/scamper: Makefile distinfo 
net/scamper/pkg: PLIST 

Log message:
update to scamper-20141211c

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/12/08 06:30:29

Modified files:
graphics/gegl03: Makefile 
graphics/gegl03/pkg: PLIST 

Log message:
libraw gets picked up if present at configure time; add support for it
(spotted by naddy@)

While here, add libwebp support.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/08 08:21:54

Modified files:
security/clamav-unofficial-sigs: Makefile 
security/clamav-unofficial-sigs/patches: 
 
patch-clamav-unofficial-sigs_sh 

Log message:
add various fixes to clamav-unofficial-sigs

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/08 06:49:36

Modified files:
net/icinga/core2: Makefile 

Log message:
mark as broken on sparc64, toolchain issues (errors out with gcc 4.2,
hangs with gcc 4.9).

Re: shells/bash distinfo

[Christian Weisgerber]

Gleydson Soares:

> --- Makefile  14 Aug 2015 15:29:12 -  1.95
> +++ Makefile  8 Dec 2015 02:05:08 -
> @@ -2,6 +2,7 @@
>  
>  COMMENT= GNU Bourne Again Shell
>  
> +REVISION=0
>  DISTNAME=bash-4.3.30
>  PKGNAME= bash-4.3.42
>  CATEGORIES=  shells

No REVISION bump.  There is no actual code change.

> --- distinfo  14 Aug 2015 15:29:12 -  1.56
> +++ distinfo  8 Dec 2015 02:05:08 -
> @@ -10,7 +10,7 @@ SHA256 (bash/bash43-038) = rb6qUAynqCU18
>  SHA256 (bash/bash43-039) = q5Tc7SIVVBCXaR9gw+syPMKO8lSUY+alM0u8weYedOw=
>  SHA256 (bash/bash43-040) = hLs5a5JimSylQk/qtu0+w58ZPvXHbf5KYrVRvY3Z12s=
>  SHA256 (bash/bash43-041) = TsQylm5BmFJKfgzWhf4iLpYEN2nJYT5mdCrEddsTLBo=
> -SHA256 (bash/bash43-042) = t1pTFBqz2P/z+nS189x2RosB6uKZ9Qu8K8ca45XWkK8=
> +SHA256 (bash/bash43-042) = rCGTItsnkdqHpJbubo5VRIRklL2q6iYmJwwvc8EESRk=
>  SIZE (bash/bash-4.3.30.tar.gz) = 7977214
>  SIZE (bash/bash43-031) = 3689
>  SIZE (bash/bash43-032) = 1734

ok

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/08 09:15:24

Modified files:
databases/mariadb: Makefile distinfo 
databases/mariadb/patches: patch-client_CMakeLists_txt 
   patch-scripts_mysql_install_db_sh 
databases/mariadb/pkg: PLIST-tests 
Added files:
databases/mariadb/patches: 
   patch-storage_innobase_include_os0sync_h 

Log message:
update to MariaDB-10.0.22, from Brad (sorry for the belated commit).
https://mariadb.com/kb/en/mariadb/mariadb-10022-release-notes/

CVE-2015-4802   CVE-2015-4807   CVE-2015-4815
CVE-2015-4826   CVE-2015-4830   CVE-2015-4836
CVE-2015-4858   CVE-2015-4861   CVE-2015-4870
CVE-2015-4913   CVE-2015-4792

[update] perl6: rakudo/nqp/moarvm to 2015.11, parrot to 7.10.0

[Carlin Bingham]

Updates everything to the November release.


--
Carlin


Index: lang/rakudo/Makefile
===
RCS file: /cvs/ports/lang/rakudo/Makefile,v
retrieving revision 1.23
diff -u -p -u -r1.23 Makefile
--- lang/rakudo/Makefile5 Nov 2015 11:52:32 -   1.23
+++ lang/rakudo/Makefile8 Dec 2015 14:34:39 -
@@ -4,10 +4,10 @@ SHARED_ONLY = Yes
 
 COMMENT =  Rakudo Perl 6 compiler
 
-V =2015.10
+V =2015.11
 DISTNAME = rakudo-$V
 
-NQP_VERSION =  2015.10
+NQP_VERSION =  2015.11
 
 CATEGORIES =   lang perl6
 
Index: lang/rakudo/distinfo
===
RCS file: /cvs/ports/lang/rakudo/distinfo,v
retrieving revision 1.10
diff -u -p -u -r1.10 distinfo
--- lang/rakudo/distinfo5 Nov 2015 11:52:32 -   1.10
+++ lang/rakudo/distinfo8 Dec 2015 14:34:39 -
@@ -1,2 +1,2 @@
-SHA256 (rakudo-2015.10.tar.gz) = ES+cP5fjK5ydKxylAFc5VSUxNzUX2/eTlV2Rs78gh60=
-SIZE (rakudo-2015.10.tar.gz) = 726353
+SHA256 (rakudo-2015.11.tar.gz) = rkTPPiB0Zx6GIEY3XWuzwHauDoLgbI71hYjCt3ULb4Y=
+SIZE (rakudo-2015.11.tar.gz) = 740778
Index: lang/rakudo/pkg/PLIST
===
RCS file: /cvs/ports/lang/rakudo/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -r1.10 PLIST
--- lang/rakudo/pkg/PLIST   5 Nov 2015 11:52:32 -   1.10
+++ lang/rakudo/pkg/PLIST   8 Dec 2015 14:34:39 -
@@ -35,6 +35,8 @@ share/perl6/lib/Test.pm
 share/perl6/lib/Test.pm.moarvm
 share/perl6/lib/lib.pm6
 share/perl6/lib/lib.pm6.moarvm
+share/perl6/lib/newline.pm6
+share/perl6/lib/newline.pm6.moarvm
 share/perl6/runtime/
 share/perl6/runtime/CORE.setting.moarvm
 share/perl6/runtime/RESTRICTED.setting.moarvm
Index: lang/nqp/Makefile
===
RCS file: /cvs/ports/lang/nqp/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- lang/nqp/Makefile   5 Nov 2015 11:52:08 -   1.16
+++ lang/nqp/Makefile   8 Dec 2015 14:35:18 -
@@ -2,7 +2,7 @@
 
 COMMENT =  Not Quite Perl
 
-V =2015.10
+V =2015.11
 DISTNAME = nqp-$V
 
 PATCHORIG =.orig.port
Index: lang/nqp/distinfo
===
RCS file: /cvs/ports/lang/nqp/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- lang/nqp/distinfo   5 Nov 2015 11:52:08 -   1.7
+++ lang/nqp/distinfo   8 Dec 2015 14:35:18 -
@@ -1,2 +1,2 @@
-SHA256 (nqp-2015.10.tar.gz) = fsYZ/E5Kmdwn9qnx8YXcF0Lgk74+LjFT6+VfqbfGfWM=
-SIZE (nqp-2015.10.tar.gz) = 5315377
+SHA256 (nqp-2015.11.tar.gz) = 2F+JQBYQx/OnZ/yh0UAwWoTAGHnQuasD0y/+zgdvmWU=
+SIZE (nqp-2015.11.tar.gz) = 5111592
Index: lang/moarvm/Makefile
===
RCS file: /cvs/ports/lang/moarvm/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- lang/moarvm/Makefile20 Nov 2015 19:44:15 -  1.9
+++ lang/moarvm/Makefile8 Dec 2015 14:36:53 -
@@ -6,11 +6,11 @@ BROKEN-hppa = dyncall_callvm.c:68:4: er
 
 COMMENT =  virtual machine for nqp/rakudo
 
-V =2015.10
+V =2015.11
 DISTNAME = MoarVM-$V
 PKGNAME =  moarvm-$V
 
-SHARED_LIBS =  moar3.0
+SHARED_LIBS =  moar4.0
 
 CATEGORIES =   lang
 
Index: lang/moarvm/distinfo
===
RCS file: /cvs/ports/lang/moarvm/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- lang/moarvm/distinfo5 Nov 2015 11:51:39 -   1.4
+++ lang/moarvm/distinfo8 Dec 2015 14:36:53 -
@@ -1,2 +1,2 @@
-SHA256 (MoarVM-2015.10.tar.gz) = LQX7rHqkMdWhBiWVjfHz1Hlj157eLIdfUv7D6mXqRF8=
-SIZE (MoarVM-2015.10.tar.gz) = 3247914
+SHA256 (MoarVM-2015.11.tar.gz) = 7KDvzWIMUZCbbK6o48gIXw3h27Yp3AZL6jqRapvq1c8=
+SIZE (MoarVM-2015.11.tar.gz) = 3261494
Index: lang/moarvm/pkg/PLIST
===
RCS file: /cvs/ports/lang/moarvm/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- lang/moarvm/pkg/PLIST   5 Nov 2015 11:51:39 -   1.4
+++ lang/moarvm/pkg/PLIST   8 Dec 2015 14:36:53 -
@@ -147,6 +147,7 @@ include/moar/platform/
 include/moar/platform/inttypes.h
 include/moar/platform/io.h
 include/moar/platform/mmap.h
+include/moar/platform/setjmp.h
 include/moar/platform/stdint.h
 include/moar/platform/sys.h
 include/moar/platform/threads.h
@@ -181,6 +182,7 @@ include/moar/strings/unicode.h
 include/moar/strings/unicode_gen.h
 include/moar/strings/utf16.h
 include/moar/strings/utf8.h
+include/moar/strings/utf8_c8.h
 include/moar/strings/windows1252.h
 include/moar/types.h
 

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2015/12/08 09:50:41

Modified files:
net/net-snmp   : Makefile 
net/net-snmp/patches: patch-agent_mibgroup_mibII_ipv6_c 

Log message:
Unbreak: stop using if_var.h/struct ifnet to retrieve ipv6 data.

"looks fine to me" jasper@, ok sthen@

Re: [update] perl6: rakudo/nqp/moarvm to 2015.11, parrot to 7.10.0

[Andrew Fresh]

On Wed, Dec 09, 2015 at 05:24:03AM +1300, Carlin Bingham wrote:
> Updates everything to the November release.

Seems to fix a bug I ran into with "skip-empty".

pkg_add -r rakudo didn't automatically update moarvm but I wasn't using
a proper $PKG_PATH so that was likely my fault.

OK afresh1@

> 
> 
> --
> Carlin
> 
> 
> Index: lang/rakudo/Makefile
> ===
> RCS file: /cvs/ports/lang/rakudo/Makefile,v
> retrieving revision 1.23
> diff -u -p -u -r1.23 Makefile
> --- lang/rakudo/Makefile  5 Nov 2015 11:52:32 -   1.23
> +++ lang/rakudo/Makefile  8 Dec 2015 14:34:39 -
> @@ -4,10 +4,10 @@ SHARED_ONLY =   Yes
>  
>  COMMENT =Rakudo Perl 6 compiler
>  
> -V =  2015.10
> +V =  2015.11
>  DISTNAME =   rakudo-$V
>  
> -NQP_VERSION =2015.10
> +NQP_VERSION =2015.11
>  
>  CATEGORIES = lang perl6
>  
> Index: lang/rakudo/distinfo
> ===
> RCS file: /cvs/ports/lang/rakudo/distinfo,v
> retrieving revision 1.10
> diff -u -p -u -r1.10 distinfo
> --- lang/rakudo/distinfo  5 Nov 2015 11:52:32 -   1.10
> +++ lang/rakudo/distinfo  8 Dec 2015 14:34:39 -
> @@ -1,2 +1,2 @@
> -SHA256 (rakudo-2015.10.tar.gz) = ES+cP5fjK5ydKxylAFc5VSUxNzUX2/eTlV2Rs78gh60=
> -SIZE (rakudo-2015.10.tar.gz) = 726353
> +SHA256 (rakudo-2015.11.tar.gz) = rkTPPiB0Zx6GIEY3XWuzwHauDoLgbI71hYjCt3ULb4Y=
> +SIZE (rakudo-2015.11.tar.gz) = 740778
> Index: lang/rakudo/pkg/PLIST
> ===
> RCS file: /cvs/ports/lang/rakudo/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -u -r1.10 PLIST
> --- lang/rakudo/pkg/PLIST 5 Nov 2015 11:52:32 -   1.10
> +++ lang/rakudo/pkg/PLIST 8 Dec 2015 14:34:39 -
> @@ -35,6 +35,8 @@ share/perl6/lib/Test.pm
>  share/perl6/lib/Test.pm.moarvm
>  share/perl6/lib/lib.pm6
>  share/perl6/lib/lib.pm6.moarvm
> +share/perl6/lib/newline.pm6
> +share/perl6/lib/newline.pm6.moarvm
>  share/perl6/runtime/
>  share/perl6/runtime/CORE.setting.moarvm
>  share/perl6/runtime/RESTRICTED.setting.moarvm
> Index: lang/nqp/Makefile
> ===
> RCS file: /cvs/ports/lang/nqp/Makefile,v
> retrieving revision 1.16
> diff -u -p -u -r1.16 Makefile
> --- lang/nqp/Makefile 5 Nov 2015 11:52:08 -   1.16
> +++ lang/nqp/Makefile 8 Dec 2015 14:35:18 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =Not Quite Perl
>  
> -V =  2015.10
> +V =  2015.11
>  DISTNAME =   nqp-$V
>  
>  PATCHORIG =  .orig.port
> Index: lang/nqp/distinfo
> ===
> RCS file: /cvs/ports/lang/nqp/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -r1.7 distinfo
> --- lang/nqp/distinfo 5 Nov 2015 11:52:08 -   1.7
> +++ lang/nqp/distinfo 8 Dec 2015 14:35:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (nqp-2015.10.tar.gz) = fsYZ/E5Kmdwn9qnx8YXcF0Lgk74+LjFT6+VfqbfGfWM=
> -SIZE (nqp-2015.10.tar.gz) = 5315377
> +SHA256 (nqp-2015.11.tar.gz) = 2F+JQBYQx/OnZ/yh0UAwWoTAGHnQuasD0y/+zgdvmWU=
> +SIZE (nqp-2015.11.tar.gz) = 5111592
> Index: lang/moarvm/Makefile
> ===
> RCS file: /cvs/ports/lang/moarvm/Makefile,v
> retrieving revision 1.9
> diff -u -p -u -r1.9 Makefile
> --- lang/moarvm/Makefile  20 Nov 2015 19:44:15 -  1.9
> +++ lang/moarvm/Makefile  8 Dec 2015 14:36:53 -
> @@ -6,11 +6,11 @@ BROKEN-hppa =   dyncall_callvm.c:68:4: er
>  
>  COMMENT =virtual machine for nqp/rakudo
>  
> -V =  2015.10
> +V =  2015.11
>  DISTNAME =   MoarVM-$V
>  PKGNAME =moarvm-$V
>  
> -SHARED_LIBS =moar3.0
> +SHARED_LIBS =moar4.0
>  
>  CATEGORIES = lang
>  
> Index: lang/moarvm/distinfo
> ===
> RCS file: /cvs/ports/lang/moarvm/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 distinfo
> --- lang/moarvm/distinfo  5 Nov 2015 11:51:39 -   1.4
> +++ lang/moarvm/distinfo  8 Dec 2015 14:36:53 -
> @@ -1,2 +1,2 @@
> -SHA256 (MoarVM-2015.10.tar.gz) = LQX7rHqkMdWhBiWVjfHz1Hlj157eLIdfUv7D6mXqRF8=
> -SIZE (MoarVM-2015.10.tar.gz) = 3247914
> +SHA256 (MoarVM-2015.11.tar.gz) = 7KDvzWIMUZCbbK6o48gIXw3h27Yp3AZL6jqRapvq1c8=
> +SIZE (MoarVM-2015.11.tar.gz) = 3261494
> Index: lang/moarvm/pkg/PLIST
> ===
> RCS file: /cvs/ports/lang/moarvm/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 PLIST
> --- lang/moarvm/pkg/PLIST 5 Nov 2015 11:51:39 -   1.4
> +++ lang/moarvm/pkg/PLIST 8 Dec 2015 14:36:53 -
> @@ -147,6 +147,7 @@ include/moar/platform/
>  

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2015/12/08 10:18:59

Modified files:
devel/cmake: Makefile distinfo 
devel/cmake/patches: patch-CMakeLists_txt 
 patch-Modules_CMakeCInformation_cmake 
 patch-Modules_CMakeCXXInformation_cmake 
 patch-Modules_CMakeFortranInformation_cmake 
 patch-Modules_Compiler_GNU_cmake 
 patch-Modules_FindBoost_cmake 
 patch-Modules_FindJNI_cmake 
 patch-Modules_FindJava_cmake 
 patch-Modules_FindPythonLibs_cmake 
 patch-Source_cmComputeLinkInformation_cxx 
 patch-Source_cmInstallCommand_cxx 
 patch-Source_cmTarget_cxx 
 patch-Source_kwsys_SystemTools_cxx 
 patch-Tests_CMakeLists_txt 
 patch-Tests_RunCMake_CMakeLists_txt 
 patch-bootstrap 
devel/cmake/pkg: PLIST 
Added files:
devel/cmake/patches: patch-Source_cmGeneratorTarget_cxx 
 patch-Source_cmake_cxx 

Log message:
Update to cmake-3.4.0

tested in a bulk build by naddy@
kde4-related failures proactively fixed by zhuk@

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2015/12/08 11:55:39

Modified files:
math/libqalculate: Makefile 

Log message:
BROKEN-macppc: reliably fails to build because of an ICE on 
libqalculate/Calculator.cc:7030

Re: net/kea

[Patrik Lundin]

On Tue, Dec 08, 2015 at 07:39:24PM +0100, Patrik Lundin wrote:
> > not a port problem, but "message" is a terrible name for sonething that
> > upstream want to place in a system directory!
> 
> I have mentioned this in my upstream kea-dev thread.
> 

FYI: upstream has created a ticket which aims to rename "message" to
"kea-msg-compiler" based on this input: http://kea.isc.org/ticket/4228

-- 
Patrik Lundin

UPDATE: www/opengroupware

[Sebastian Reitenbach]

Hi,

attached patch updates to 5.5-rc3.

Mostly some compilation and small runtime fixes.
Major change is dropped support for Apache 1.3, but therefore added support for 
Apache 2.4.

Tested and works for me with Apache 2.4.

If there are no objections, I'd update by the end of the week.
Otherwise comments and or OKs welcome too ;)

cheers,
Sebastian


Index: Makefile
===
RCS file: /cvs/ports/www/opengroupware/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	26 Oct 2015 11:56:13 -	1.10
+++ Makefile	8 Dec 2015 19:27:25 -
@@ -2,8 +2,7 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	5.5rc2
-REVISION=	7
+VERSION =	5.5rc3
 DISTNAME =	opengroupware-${VERSION}
 
 SHARED_LIBS +=  LSAddress 0.0 # 5.5
@@ -43,14 +42,12 @@
 WANTLIB += NGObjWeb NGStreams SaxObjC WEExtensions WOExtensions
 WANTLIB += XmlRpc ldap
 
-MODULES =		apache-module x11/gnustep converters/libiconv
+MODULES =		x11/gnustep converters/libiconv
 MODGNUSTEP_NEEDS_GUI =	No
-MODAPACHE_NAME =	ngobjweb
-MODAPACHE_LOCATION =	${WRKBUILD}/SOPE/mod_ngobjweb
-
+BUILD_DEPENDS +=	www/apache-httpd
 LIB_DEPENDS +=		www/sope
 RUN_DEPENDS +=		sope-postgres-*|sope-mysql-*:www/sope,-postgres \
-			archivers/zip archivers/unzip
+			archivers/zip archivers/unzip www/apache-httpd
 
 CONFIGURE_STYLE =	simple dest
 CONFIGURE_ARGS +=	--prefix=${PREFIX}
@@ -80,23 +77,23 @@
 		libZSProjects_INTERFACE_VERSION=${LIBZSProjects_VERSION} \
 		libZSTasks_INTERFACE_VERSION=${LIBZSTasks_VERSION} \
 		libOGoAsteriskCommands_INTERFACE_VERSION=${LIBOGoAsteriskCommands_VERSION} \
-		libSkyInvoice_INTERFACE_VERSION=${LIBSkyInvoice_VERSION}
+		libSkyInvoice_INTERFACE_VERSION=${LIBSkyInvoice_VERSION} \
+		APXS=${LOCALBASE}/sbin/apxs2 \
+		APR=${LOCALBASE}/bin/apr-1-config
 
 EXAMPLE_FILES =	opengroupware.conf NSGlobalDomain.plist ogo-webui.plist \
 		ogo-zidestore.plist ogo-xmlrpcd.plist
 
 SUBST_VARS +=	VARBASE
 
-post-build:
-	${MODAPACHE_CREATE_ENABLE_SCRIPT}
-
 post-install:
 	mkdir -p ${PREFIX}/share/examples/opengroupware
 .for F in ${EXAMPLE_FILES}
 	${SUBST_DATA} \
 		${FILESDIR}/${F} ${PREFIX}/share/examples/opengroupware/${F}
 .endfor
-	${MODAPACHE_INSTALL}
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/apache2
+	mv ${PREFIX}/lib/mod_ngobjweb.so ${PREFIX}/lib/apache2
 	cp ${WRKSRC}/Database/PostgreSQL/pg-update-1.x-to-5.5.psql \
 		${PREFIX}/lib/opengroupware/commands/OGo.model/Resources/
 
Index: distinfo
===
RCS file: /cvs/ports/www/opengroupware/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo	29 Oct 2013 06:16:26 -	1.1.1.1
+++ distinfo	8 Dec 2015 19:27:25 -
@@ -1,2 +1,2 @@
-SHA256 (opengroupware-5.5rc2.tar.gz) = bllauvlna79algLhWv4rEHfmTv+qJraQVYdc++jXn/c=
-SIZE (opengroupware-5.5rc2.tar.gz) = 9047108
+SHA256 (opengroupware-5.5rc3.tar.gz) = GcrZ/+qs630uhz0EgvsUIlfMME1jCK8iBnhNfF6CP2s=
+SIZE (opengroupware-5.5rc3.tar.gz) = 9023582
Index: files/opengroupware.conf
===
RCS file: /cvs/ports/www/opengroupware/files/opengroupware.conf,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 opengroupware.conf
--- files/opengroupware.conf	29 Oct 2013 06:16:37 -	1.1.1.1
+++ files/opengroupware.conf	8 Dec 2015 19:27:25 -
@@ -1,4 +1,4 @@
-
+
   
   SetHandler NONE
   
Index: patches/patch-SOPE_mod_ngobjweb_ngobjweb_module_c
===
RCS file: patches/patch-SOPE_mod_ngobjweb_ngobjweb_module_c
diff -N patches/patch-SOPE_mod_ngobjweb_ngobjweb_module_c
--- patches/patch-SOPE_mod_ngobjweb_ngobjweb_module_c	17 Oct 2014 09:21:09 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,54 +0,0 @@
-$OpenBSD: patch-SOPE_mod_ngobjweb_ngobjweb_module_c,v 1.1 2014/10/17 09:21:09 sebastia Exp $
-
-proposed fix for bug 88
-
 SOPE/mod_ngobjweb/ngobjweb_module.c.orig	Wed Feb  6 18:38:08 2013
-+++ SOPE/mod_ngobjweb/ngobjweb_module.c	Tue Jul 23 17:19:20 2013
-@@ -21,6 +21,39 @@
- 
- #include "common.h"
- 
-+#ifdef APACHE2
-+static const command_rec ngobjweb_cmds[] = {
-+  AP_INIT_TAKE1(
-+"SetSNSPort",
-+ngobjweb_set_sns_port,
-+NULL,
-+OR_FILEINFO,
-+"the path of the Unix domain address to use (eg /tmp/.snsd)" 
-+  ),
-+  AP_INIT_TAKE1(
-+"SetAppPort",
-+ngobjweb_set_app_port,
-+NULL,
-+OR_FILEINFO,
-+"the path of the Unix domain address to use (eg /tmp/.snsd)"   
-+  ),
-+  AP_INIT_TAKE1(
-+"SetAppPrefix",
-+ngobjweb_set_app_prefix,
-+NULL,
-+OR_FILEINFO,
-+"any prefix that is before the app name (eg /MyDir with /MyDir/MyApp.woa)"
-+  ),
-+  AP_INIT_TAKE1(
-+"SNSUseHTTP",
-+ngobjweb_set_use_http,
-+NULL,
-+OR_FILEINFO,
-+"use HTTP protocol to query snsd (on,off) ?"
-+  ),
-+  {NULL}
-+};
-+#else
- static command_rec ngobjweb_cmds[] = {
-   {
- "SetSNSPort",
-@@ -56,6 +89,7 @@ static 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/12/08 12:36:35

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

Log message:
Update to phpvirtualbox-5.0.4.

Re: net/kea

[Patrik Lundin]

On Mon, Dec 07, 2015 at 09:59:44AM +, Stuart Henderson wrote:
> > 
> > 1. When running "make update-plist" I get the following messages:
> > ===
> > make-plist: Bogus element outside of every prefix: /etc/kea/kea.conf
> > make-plist: Bogus element outside of every prefix: /etc/kea/keactrl.conf
> 
> For these, you can often override a variable in upstream's Makefiles
> in FAKE_FLAGS to install these files to /usr/local/share/examples,
> often named sysconfdir or SYSCONFDIR.
> 
>  it's likely to be similar to this
> 
> FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/
> 
> pre-install:
> mkdir -p ${PREFIX}/share/examples/bind10/
> 

Some trial and error proved that these were pretty much exactly what was
needed, thanks!

This line is now printed instead, guess I can just ignore it?:
===
make-plist: Bogus element outside of every prefix: /etc/kea
===

> > make-plist: Bogus element outside of every prefix: /etc/rc.d/kea
> 
> Ignore this and handle the rcscript in PLIST manually.
> 

I have noticed that update-plist always removes the rcscript in
PLIST, but reading older threads this seems to be a known problem.

> > make-plist: Bogus element outside of every prefix: /var/kea
> > make-plist: Bogus element outside of every prefix: /var/run/kea
> 
> /var/run is cleared at boot so the /var/run/kea directory needs creating
> in the rcscript. we normally do not include these in plist.
> 

I have removed the PLIST @sample for /var/run/kea, and added an rc_pre()
which creates the directory if it does not exist.

> 
> other comments:
> 
> "@sample /etc/kea/" shoukd use SYSCONFDIR and this plist line is usually
> placed near the files that go in that dir
> 

Fixed.

>
> please order Makefile closer to the section ordering in
> Makefile.template
> 
> the shared libs lines are ok (except want to be earlier in the makefile)
> 

I have done a major reorder of the Makefile to mirror the template.

> the static libs are unlikely to be useful, and the whole port is unlikely
> to work without shared libs, so I'd disable them (probably --disable-static
> in CONFIGURE_ARGS, and SHARED_ONLY=Yes) to save build time
> 

This turned out to be the trickiest part. Adding "--disable-static" to
CONFIGURE_ARGS indeed disabled static libraries according to config.log:
===
configure:12388: checking whether to build static libraries
configure:12392: result: no
===

However, the .a files were still being generated by the build.

After digging around I found out about LIBTOOL_FLAGS and added
"LIBTOOL_FLAGS=  --tag=disable-static" and this made the .a files
disappear.

Using LIBTOOL_FLAGS it does not seem to matter if CONFIGURE_ARGS are set
or not, should I use both for good measure or only LIBTOOL_FLAGS? Is
this expected behaviour?

> not a port problem, but "message" is a terrible name for sonething that
> upstream want to place in a system directory!

I have mentioned this in my upstream kea-dev thread.

Attached is the updated port, which only uses LIBTOOL_FLAGS to disable
the static libraries.

Thanks a lot for your time!

-- 
Patrik Lundin


kea.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/12/08 12:41:37

Modified files:
x11/menu-cache : Makefile distinfo 

Log message:
Update to menu-cache-1.0.1.

Re: [update] perl6: rakudo/nqp/moarvm to 2015.11, parrot to 7.10.0

[Stuart Henderson]

On 2015/12/08 11:22, Andrew Fresh wrote:
> On Wed, Dec 09, 2015 at 05:24:03AM +1300, Carlin Bingham wrote:
> > Updates everything to the November release.
> 
> Seems to fix a bug I ran into with "skip-empty".
> 
> pkg_add -r rakudo didn't automatically update moarvm but I wasn't using
> a proper $PKG_PATH so that was likely my fault.

I don't know these ports at all, but since you mention this, do they
want to force dependencies on a specific version?

Also LIB_DEPENDS occurs twice in rakudo/Makefile (not new, in the tree).

Re: net/kea

[Patrik Lundin]

On Tue, Dec 08, 2015 at 10:41:07PM +, Stuart Henderson wrote:
> 
> I see it in perfdhcp. Actually it looks like there's another option, we can
> instead use CONFIGURE_ARGS+= --with-openssl - which would you prefer?
> 
> $ objdump -p ../fake-amd64/usr/local/sbin/perfdhcp
> 
[...]
>   NEEDED  libbotan-1.10.so.1.0
[...]

It is not being required on my (clean) system, did you have the library
installed previously when building the port? Of course we should make sure only
one path is choosen anyway.

For reference, this is how perfdhcp looks for me:
===
# objdump -p /usr/local/sbin/perfdhcp  

/usr/local/sbin/perfdhcp: file format elf64-x86-64

Program Header:
PHDR off0x0040 vaddr 0x0040 paddr 
0x0040 align 2**3
 filesz 0x0268 memsz 0x0268 flags r-x
  INTERP off0x0318 vaddr 0x0318 paddr 
0x0318 align 2**0
 filesz 0x0013 memsz 0x0013 flags r--
LOAD off0x vaddr 0x paddr 
0x align 2**20
 filesz 0x0005361e memsz 0x0005361e flags r-x
LOAD off0x00053620 vaddr 0x00153620 paddr 
0x00153620 align 2**20
 filesz 0x00011ae5 memsz 0x00011ae5 flags r--
LOAD off0x00065108 vaddr 0x00265108 paddr 
0x00265108 align 2**20
 filesz 0x1ad0 memsz 0x1ad0 flags rw-
LOAD off0x00066bd8 vaddr 0x00366bd8 paddr 
0x00366bd8 align 2**20
 filesz 0x0908 memsz 0x0908 flags rw-
LOAD off0x000674e0 vaddr 0x004674e0 paddr 
0x004674e0 align 2**20
 filesz 0x0058 memsz 0x0500 flags rw-
 DYNAMIC off0x00066a08 vaddr 0x00266a08 paddr 
0x00266a08 align 2**3
 filesz 0x01d0 memsz 0x01d0 flags rw-
NOTE off0x032c vaddr 0x032c paddr 
0x032c align 2**2
 filesz 0x0018 memsz 0x0018 flags r--
EH_FRAME off0x0005a128 vaddr 0x0015a128 paddr 
0x0015a128 align 2**2
 filesz 0x0f54 memsz 0x0f54 flags r--
OPENBSD_RANDOMIZE off0x00065108 vaddr 0x00265108 paddr 
0x00265108 align 2**3
 filesz 0x0008 memsz 0x0008 flags rw-

Dynamic Section:
  NEEDED  libkea-exceptions.so.0.0
  NEEDED  libkea-dhcp++.so.0.0
  NEEDED  libkea-asiolink.so.0.0
  NEEDED  libkea-dns++.so.0.0
  NEEDED  libkea-cryptolink.so.0.0
  NEEDED  libcrypto.so.36.1
  NEEDED  libkea-util.so.0.0
  NEEDED  libstdc++.so.57.0
  NEEDED  libm.so.9.0
  NEEDED  libc.so.84.2
  HASH0x348
  STRTAB  0x48f0
  SYMTAB  0x1440
  STRSZ   0x69e5
  SYMENT  0x18
  DEBUG   0x0
  PLTGOT  0x366bd8
  PLTRELSZ0xd98
  PLTREL  0x7
  JMPREL  0xf700
  RELA0xb2d8
  RELASZ  0x4428
  RELAENT 0x18
  RELACOUNT   0x111

===

I have posted a question to kea-dev regarding this:
https://lists.isc.org/pipermail/kea-dev/2015-December/000588.html

Let's see how that goes.

-- 
Patrik Lundin

UPDATE: suitesparse-4.4.6

[Paul Irofti]

Hello,

This updates suitesparse to 4.4.6. Minor bump due to this change:

 CHOLMOD 3.0.6:
- minor fix to CHOLMOD (-DNGPL did not work as expected)
- added MATLAB interface for row add/delete (lurowmod)

Okay?

Paul


Index: Makefile
===
RCS file: /cvs/ports/math/suitesparse/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile4 Dec 2015 20:47:53 -   1.3
+++ Makefile9 Dec 2015 07:53:24 -
@@ -4,7 +4,7 @@ BROKEN-hppa=undefined refs to dtrsv/dge
 
 COMMENT=   suite of sparse matrix algorithms
 
-DISTNAME=  SuiteSparse-4.4.4
+DISTNAME=  SuiteSparse-4.4.6
 PKGNAME=   ${DISTNAME:L}
 
 CATEGORIES=math
@@ -13,7 +13,7 @@ HOMEPAGE= http://faculty.cse.tamu.edu/d
 
 MAINTAINER=Paul Irofti 
 
-SO_VERSION=2.0
+SO_VERSION=2.1
 .for _lib in \
 amd btf camd ccolamd cholmod colamd csparse cxsparse klu ldl rbio spqr \
 suitesparseconfig umfpack
Index: distinfo
===
RCS file: /cvs/ports/math/suitesparse/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo20 Jul 2015 23:10:35 -  1.1.1.1
+++ distinfo9 Dec 2015 07:53:24 -
@@ -1,2 +1,2 @@
-SHA256 (SuiteSparse-4.4.4.tar.gz) = 
8q5H6W8/N7MTw9+vylnxPm28Hp5Us1r1kVUZGYEPtv0=
-SIZE (SuiteSparse-4.4.4.tar.gz) = 25733849
+SHA256 (SuiteSparse-4.4.6.tar.gz) = 
fyJQnYetqFBlgNU37955z5DijiKDVcGLi/YDqtGi17Y=
+SIZE (SuiteSparse-4.4.6.tar.gz) = 25627898

'Could not find module' when working on new hs-ports

[Matthias Kilian]

Hi,

abieiber just ran into this problem while working on a new hs- port.
I'm not sure wether I mentioned it anywhere except in the commit
message, so:

When working on a new hs- port or on an update of an existing one,
you should run /usr/ports/lang/ghc/files/fixup-hs-plist on the ports
PLIST after creating / updating it. The script will do some reordering
of PLIST entries (register.sh, unregister.sh) and, more important,
add @exec and @unexec entries.

Otherwise you'll end up with a nice installable package which doesn't
show up when running

ghc-pkg list

Ciao,
Kili

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2015/12/08 16:35:22

Modified files:
www/varnish: Makefile distinfo 

Log message:
Update for Varnish to 4.1.0:

https://www.varnish-cache.org/content/varnish-cache-410

OK benoit@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/08 17:03:11

Modified files:
mail/mutt  : Makefile 
Added files:
mail/mutt/patches: patch-mh_c 

Log message:
Add Mutt patch to fix hash table key "use after free" in mh_check_mailbox().
Reported by J. Scott Heppler  http://dev.mutt.org/trac/ticket/3797

Re: net/kea

[Patrik Lundin]

On Tue, Dec 08, 2015 at 11:18:53PM +0100, Patrik Lundin wrote:
> 
> What is picking up botan? I looked at every @bin and @lib with ldd and I
> can't see anyone referring to that library. What am i missing?
> 

>From http://kea.isc.org/docs/kea-guide.html#required-software:
===
Kea supports two crypto libraries: Botan and OpenSSL. Only one of them
is required to be installed during compilation. Kea uses the Botan
crypto library for C++ (http://botan.randombit.net/), version 1.8 or
later. As an alternative to Botan, Kea can use the OpenSSL crypto
library (http://www.openssl.org/). It requires a version with SHA-2
support. 
===

I realize I do not know which library is preferred from the upstream
perspective, but using LibreSSL seemed nice (and this is what was choosen on my
build box).

On my box the following is seen:
===
# ldd /usr/local/sbin/kea-dhcp4
[...]
1f4847a77000 1f4848045000 rlib 07   0  
/usr/lib/libcrypto.so.36.1
[...]
===

>From config.log (after tests for botan have failed):
===
configure:17410: checking for OpenSSL library
configure:17430: result: yes
configure:17468: checking OpenSSL version
configure:17480: result: LibreSSL 2.3.2
configure:17485: checking support of SHA-2
configure:17506: c++ -o conftest -O2 -pipe   -DOS_BSD  conftest.cpp  -lcrypto 
>&5
configure:17506: $? = 0
configure:17507: result: yes
===

I can ask upstream what they prefer if there are no strong opinions raised on
this list.

-- 
Patrik Lundin

Re: net/kea

[Stuart Henderson]

On 2015/12/08 23:18, Patrik Lundin wrote:
> On Tue, Dec 08, 2015 at 09:46:34PM +, Stuart Henderson wrote:
> > Thanks, this is looking good to me, Only two changes I'd make. First is
> > in the rc script, what you have isn't wrong, but the mkdir/chown/chmod
> > lines can be replaced with a single command:
> > 
> > install -d -o root:_kea -m 775 ${LOCALSTATEDIR}/run/kea
> > 
> 
> This is much prettier, nice catch :).
> 
> >
> > Second change is WANTLIB/LIB_DEPENDS; it picks up botan so it needs to be
> > listed in LIB_DEPENDS, and the relevant WANTLIBs added. New tar attached.
> > 
> 
> What is picking up botan? I looked at every @bin and @lib with ldd and I
> can't see anyone referring to that library. What am i missing?
> 
> -- 
> Patrik Lundin
> 

I see it in perfdhcp. Actually it looks like there's another option, we can
instead use CONFIGURE_ARGS+= --with-openssl - which would you prefer?



$ objdump -p ../fake-amd64/usr/local/sbin/perfdhcp

../fake-amd64/usr/local/sbin/perfdhcp: file format elf64-x86-64

Program Header:
PHDR off0x0040 vaddr 0x0040 paddr 
0x0040 align 2**3
 filesz 0x0268 memsz 0x0268 flags r-x
  INTERP off0x0318 vaddr 0x0318 paddr 
0x0318 align 2**0
 filesz 0x0013 memsz 0x0013 flags r--
LOAD off0x vaddr 0x paddr 
0x align 2**20
 filesz 0x000536de memsz 0x000536de flags r-x
LOAD off0x000536e0 vaddr 0x001536e0 paddr 
0x001536e0 align 2**20
 filesz 0x00011ba5 memsz 0x00011ba5 flags r--
LOAD off0x00065288 vaddr 0x00265288 paddr 
0x00265288 align 2**20
 filesz 0x1b30 memsz 0x1b30 flags rw-
LOAD off0x00066db8 vaddr 0x00366db8 paddr 
0x00366db8 align 2**20
 filesz 0x0908 memsz 0x0908 flags rw-
LOAD off0x000676c0 vaddr 0x004676c0 paddr 
0x004676c0 align 2**20
 filesz 0x0058 memsz 0x0500 flags rw-
 DYNAMIC off0x00066b88 vaddr 0x00266b88 paddr 
0x00266b88 align 2**3
 filesz 0x0230 memsz 0x0230 flags rw-
NOTE off0x032c vaddr 0x032c paddr 
0x032c align 2**2
 filesz 0x0018 memsz 0x0018 flags r--
EH_FRAME off0x0005a2a8 vaddr 0x0015a2a8 paddr 
0x0015a2a8 align 2**2
 filesz 0x0f54 memsz 0x0f54 flags r--
OPENBSD_RANDOMIZE off0x00065288 vaddr 0x00265288 paddr 
0x00265288 align 2**3
 filesz 0x0008 memsz 0x0008 flags rw-

Dynamic Section:
  NEEDED  libkea-exceptions.so.0.0
  NEEDED  libkea-dhcp++.so.0.0
  NEEDED  libkea-asiolink.so.0.0
  NEEDED  libkea-dns++.so.0.0
  NEEDED  libkea-cryptolink.so.0.0
  NEEDED  libbotan-1.10.so.1.0
  NEEDED  libbz2.so.10.4
  NEEDED  libcrypto.so.36.1
  NEEDED  libgmp.so.9.0
  NEEDED  libpthread.so.20.1
  NEEDED  libz.so.5.0
  NEEDED  libkea-util.so.0.0
  NEEDED  libstdc++.so.57.0
  NEEDED  libm.so.9.0
  NEEDED  libc.so.84.2
  RPATH   /usr/local/lib
  HASH0x348
  STRTAB  0x4908
  SYMTAB  0x1440
  STRSZ   0x6a93
  SYMENT  0x18
  DEBUG   0x0
  PLTGOT  0x366db8
  PLTRELSZ0xd98
  PLTREL  0x7
  JMPREL  0xf7c8
  RELA0xb3a0
  RELASZ  0x4428
  RELAENT 0x18
  RELACOUNT   0x111

Re: net/kea

[Stuart Henderson]

On 2015/12/08 23:59, Patrik Lundin wrote:
> On Tue, Dec 08, 2015 at 10:41:07PM +, Stuart Henderson wrote:
> > 
> > I see it in perfdhcp. Actually it looks like there's another option, we can
> > instead use CONFIGURE_ARGS+= --with-openssl - which would you prefer?
> > 
> > $ objdump -p ../fake-amd64/usr/local/sbin/perfdhcp
> > 
> [...]
> >   NEEDED  libbotan-1.10.so.1.0
> [...]
> 
> It is not being required on my (clean) system, did you have the library
> installed previously when building the port? Of course we should make sure 
> only
> one path is choosen anyway.

Yes - and this will sometimes be the case in package builds, so if it's not
registered then we'll either have build failures (DPB has a 'junking' stage
run periodically where it removes packages during the build if they're not
a known dependency of anything currently being built) or runtime failures
(if packages are produced which are built against botan and the user doesn't
have that installed).

> I have posted a question to kea-dev regarding this:
> https://lists.isc.org/pipermail/kea-dev/2015-December/000588.html
> 
> Let's see how that goes.

Good idea.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/12/08 23:45:55

Modified files:
devel/py-ioflo : Makefile distinfo 

Log message:
Update to py-ioflo-1.4.9.

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2015/12/08 15:14:32

Modified files:
plan9/plan9port: Makefile distinfo 
Removed files:
plan9/plan9port/patches: patch-src_cmd_auxstats_OpenBSD_c 
 patch-src_cmd_auxstats_mkfile 

Log message:
update plan9/plan9port to current upstream version
(GH_COMMIT 009b0cb5eb340b8bc3268bfaeb86abfeffdc1b1c).

auxstats(getifaddrs(3)) patches have already been accepted and committed 
upstream

Re: net/kea

[Patrik Lundin]

On Tue, Dec 08, 2015 at 09:46:34PM +, Stuart Henderson wrote:
> Thanks, this is looking good to me, Only two changes I'd make. First is
> in the rc script, what you have isn't wrong, but the mkdir/chown/chmod
> lines can be replaced with a single command:
> 
>   install -d -o root:_kea -m 775 ${LOCALSTATEDIR}/run/kea
> 

This is much prettier, nice catch :).

>
> Second change is WANTLIB/LIB_DEPENDS; it picks up botan so it needs to be
> listed in LIB_DEPENDS, and the relevant WANTLIBs added. New tar attached.
> 

What is picking up botan? I looked at every @bin and @lib with ldd and I
can't see anyone referring to that library. What am i missing?

-- 
Patrik Lundin

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2015/12/08 15:18:58

Modified files:
shells/bash: distinfo 

Log message:
unbreak bash. upstream re-roll the 042 patch.

OK naddy@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/08 14:03:26

Modified files:
infrastructure/db: user.list 

Log message:
reserve 763 for kea

Re: net/kea

[Stuart Henderson]

Thanks, this is looking good to me, Only two changes I'd make. First is
in the rc script, what you have isn't wrong, but the mkdir/chown/chmod
lines can be replaced with a single command:

install -d -o root:_kea -m 775 ${LOCALSTATEDIR}/run/kea

Second change is WANTLIB/LIB_DEPENDS; it picks up botan so it needs to be
listed in LIB_DEPENDS, and the relevant WANTLIBs added. New tar attached.

Any OKs to import? (Or, as usual, if someone else would like to import,
it's OK with me).

> FYI: upstream has created a ticket which aims to rename "message" to
> "kea-msg-compiler" based on this input: http://kea.isc.org/ticket/4228

Great, thanks :)



kea,2.tgz
Description: application/tar-gz