CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/08 00:08:53

Modified files:
www/lighttpd   : Tag: OPENBSD_5_8 Makefile distinfo 

Log message:
- update to lighttpd-1.4.38
* various reliability fixes for header parsing as well as an upload fix
http://www.lighttpd.net/2015/12/5/1.4.38/

from brad

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/12/07 23:56:46

Modified files:
net/znc/patches: patch-src_Csocket_cpp 

Log message:
Add comments to the patch.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
emulators/qemu : Makefile 
emulators/qemu/patches: patch-hw_net_pcnet_c 
Added files:
emulators/qemu/patches: patch-hw_net_eepro100_c 

Log message:
SECURITY fixes for CVE-2015-7504, CVE-2015-7512, CVE-2015-8345.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/12/07 23:59:44

Modified files:
www/lighttpd   : Makefile distinfo 
Removed files:
www/lighttpd/patches: patch-src_connections_c 

Log message:
Update to lighttpd-1.4.38.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/12/08 00:10:34

Modified files:
net/arping : Makefile distinfo 

Log message:
Update to arping-2.16.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2015/12/07 07:55:50

ports/x11/kde4/kgamma/patches

Update of /cvs/ports/x11/kde4/kgamma/patches
In directory cvs.openbsd.org:/tmp/cvs-serv2626/patches

Log Message:
Directory /cvs/ports/x11/kde4/kgamma/patches added to the repository

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2015/12/07 07:58:47

Added files:
x11/kde4/kgamma/patches: patch-CMakeLists_txt 
x11/kde4/kuser/patches: patch-CMakeLists_txt 

Log message:
Unbreak build with upcoming CMake 3.4.

Those ports were lucky to build with CMake <3.4 since their CMakeLists.txt
were wrong due to missing include(CheckIncludeFiles).

Those patches do affect configure stage only, so no revision bumps.

Noticed by naddy@, thanks!

Re: lang/go-bootstrap

[Joel Sing]

On Sunday 06 December 2015 16:44:33 Stuart Henderson wrote:
> Slight problem with the go update, it breaks build of some ports using
> the go module:
> 
> textproc/go-xlsx
> net/go-websocket
> devel/go-check-v1
> devel/go-tools

I obviously did not get to look carefully at r1.2 of go.port.mk - there are a 
number of issues that should be resolved:

- Running 'go install -x' and piping the results through sed and sh -v is 
crazy. Firstly, 'go install -x' will *run* those commands, then they're being 
run a second time around via sh. Not to mention that there are cases where 
replacing GOROOT is wrong. If Go is writing outside of GOPATH then it is 
either being called/used incorrectly, or there is a bug that should be fixed.

- Using -work is going to cause mess since it prints the work directory and 
leaves the work directory behind. I cannot see anything that is cleaning this 
up, so we're left with /tmp/go-build*.

- Using 'go build -a' should be unnecessary - furthermore, the semantics of -a 
have changed between go1.4 and go1.5. In go1.4 the standard library was 
excluded from the -a flag whereas for go1.5 it does mean all dependencies 
including the standard library (this was the same for go1.3). However, there 
is a blanket 'do not rebuild standard library packages' in place when the -a 
flag is not specified.

This brings me to the next issue/topic - installing additional packages under 
/usr/local/go is probably a bad idea. The biggest issue is that Go treats 
packages under that path as being 'standard library' and as such, they do not 
get rebuilt unless the -a flag is used. The Go development model is that you 
fetch additional packages into your workspace - obviously this does not work 
that well for prepackaged/compiled code. 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 (for example, when building 
net/websocketd, net/go-websocket is pulled in and compiled at the same time.
I don't have a strong preference, however polluting /usr/local/go is not going 
to work well unless we use -a, which will now attempt to rebuild all standard 
library code and fail.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 06:34:50

Removed files:
net/wmnetload/patches: patch-configure_in 

Log message:
remove unused patch (we already have patch-configure which is actually used)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 06:51:08

ports/security/keepassx/patches

Update of /cvs/ports/security/keepassx/patches
In directory cvs.openbsd.org:/tmp/cvs-serv11017/patches

Log Message:
Directory /cvs/ports/security/keepassx/patches added to the repository

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/07 07:11:02

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

Log message:
update to clamav-unofficial-sigs-4.9.2 - caveat emptor, this requires config
to be merged from the example file, now requires bash, and the script is getting
horribly dirty..

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 07:58:54

Modified files:
net/wmnetload  : Makefile 
net/wmnetload/patches: patch-configure 
   patch-src_ifstat_openbsd_c 

Log message:
- use getifaddrs(3)
- stop linking with libkvm now that it's no longer used

ok mpi@

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/12/07 09:25:06

Modified files:
games/manaplus : Makefile distinfo 

Log message:
Update to manaplus-1.5.12.5.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 01:04:21

Added files:
textproc/ruby-treetop/patches: 
   patch-spec_compiler_tt_compiler_spec_rb 

Log message:
missed in previous, only affects tests

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 01:03:59

Modified files:
textproc/ruby-treetop: Makefile distinfo 
textproc/ruby-treetop/pkg: PLIST 

Log message:
- update to treetop-1.6.3
- enable tests

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 01:04:04

ports/textproc/ruby-treetop/patches

Update of /cvs/ports/textproc/ruby-treetop/patches
In directory cvs.openbsd.org:/tmp/cvs-serv20940/patches

Log Message:
Directory /cvs/ports/textproc/ruby-treetop/patches added to the repository

NEW: games/astromenace

[Anthony J. Bentley]

Hi,

Space is a vast area, an unbounded territory where it seems there is a
room for everybody, but reversal of fortune put things differently. The
hordes of hostile creatures crawled out from the dark corners of the
universe, craving to conquer your homeland. Their force is compelling,
their legions are interminable. However, humans didn't give up without a
final showdown and put their best pilot to fight back. These malicious
invaders chose the wrong galaxy to conquer and you are to prove it! Go
ahead and make alien aggressors regret their insolence.

AstroMenace is a 3D vertical space shoot-em-up with 3D graphics featuring
customizable ships.

ok?

-- 
Anthony J. Bentley


astromenace.tar.gz
Description: astromenace.tar.gz

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 02:04:38

Modified files:
sysutils/rofi  : Makefile 
Added files:
sysutils/rofi/patches: patch-include_rofi_h 
   patch-source_dialogs_script_c 
   patch-source_helper_c 

Log message:
expand ~ and ~user; upstream was kind enough to properly implement this instead
of relying on wordexp(), which wouldn't have worked for us.

Re: net/kea

[Stuart Henderson]

On 2015/12/06 21:19, Patrik Lundin wrote:
> Hello,
> 
> I am working on a port for Kea, the new DHCP server from ISC.
> 
> ===
> # cat pkg/DESC
> Kea is a new open source DHCPv4/DHCPv6 server being developed by Internet
> Systems Consortium. The objective of this project is to provide a very
> high-performance, extensible DHCP server engine for use by enterprises and
> service providers, either as is or with extensions and modifications.
> 
> Kea provides DHCPv4 and DHCPv6 servers, a dynamic DNS update module, a 
> portable
> DHCP library, libdhcp++, and a DHCP benchmarking tool, perfdhcp.
> ===
> 
> Attached you will find the port, which is currently a work-in-progress
> hoping for input from more experience porters.
> 
> I am currently able to build three flavors: the default one which only
> uses the built in "memfile" backend, and then two database backends
> using mysql and postgresql.
> 
> My current up front questions are these:
> 
> 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/

the advantage of this is that if upstream later start to install another
file, you're less likely to miss it.

> make-plist: Bogus element outside of every prefix: /etc/rc.d/kea

Ignore this and handle the rcscript in PLIST manually.

> 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.

> 
> Can these be ignored? I am handling all of the files mentioned via
> @sample lines in PLIST (except for rc.d/kea which of course is an @rc
> line).
> 
> 2. I am not completely comfortable in my SHARED_LIBS knowledge, I would
>appreciate an extra eye on those lines in the Makefile. Right now
>they are taken as-is from the output generated when building the
>port.
> 
> Other than that I have raised some additional questions against
> upstream, you can find them here:
> https://lists.isc.org/pipermail/kea-dev/2015-December/000576.html
> 
> -- 
> Patrik Lundin

other comments:

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

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)

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

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

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2015/12/07 03:08:54

Modified files:
textproc   : Makefile 

Log message:
+tinyxml2

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2015/12/07 03:08:21

Log message:
Import tinyxml2-3.0.0.

TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily
integrated into other programs.

In brief, TinyXML-2 parses an XML document, and builds from that a Document
Object Model (DOM) that can be read, modified, and saved.

tweak + ok sthen@

Status:

Vendor Tag: bentley
Release Tags:   bentley_20151207

N ports/textproc/tinyxml2/Makefile
N ports/textproc/tinyxml2/distinfo
N ports/textproc/tinyxml2/pkg/DESCR
N ports/textproc/tinyxml2/pkg/PLIST

No conflicts created by this import

NEW: games/starfighter

[Anthony J. Bentley]

Hi,

Project: Starfighter is a space shoot 'em up game originally developed
by Parallel Realities in 2002, and released in 2003. You assume the role
of Chris Bainfield in his quest to put an end to WEAPCO, the weapons
corporation which has enslaved the galaxy.

ok?

-- 
Anthony J. Bentley


starfighter.tar.gz
Description: starfighter.tar.gz

Re: amd64 bulk report

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/12/06 09:11, Antoine Jacoutot wrote:
>> * net/ifstat
>> * net/libdnet
>> * net/nmap
>> * net/ocserv
>> * security/aircrack-ng
>
> From my test build:
>
> None of the above actually need things from if_var.h, they're ok with the
> whole file wrapped in ifdef kernel.
>
>> * devel/libgtop2
>
> mpi's already taking care of libgtop2
>
>> * net/zabbix

The following patch is supposed to affect only OpenBSD and thus should
be easy to push upstream.  No need to read kernel mem to get if_data,
zabbix already had code in case kvm_read fails.

Robert, does the following work fine for you?

Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.117
diff -u -p -r1.117 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.117
+++ Makefile7 Dec 2015 12:18:37 -
@@ -5,7 +5,7 @@ COMMENT-server =network and application
 COMMENT-web =  network and application monitoring - web frontend
 
 VERSION =  2.4.6
-REVISION-main =1
+REVISION-main =2
 REVISION-server =  0
 DISTNAME = zabbix-${VERSION}
 FULLPKGNAME-main = zabbix-agent-${VERSION}
Index: patches/patch-src_libs_zbxsysinfo_openbsd_net_c
===
RCS file: patches/patch-src_libs_zbxsysinfo_openbsd_net_c
diff -N patches/patch-src_libs_zbxsysinfo_openbsd_net_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_libs_zbxsysinfo_openbsd_net_c 7 Dec 2015 12:18:37 
-
@@ -0,0 +1,99 @@
+$OpenBSD$
+
+Stop using struct ifnet and libkvm for interface stats.
+
+--- src/libs/zbxsysinfo/openbsd/net.c.orig Sun Dec  6 15:59:59 2015
 src/libs/zbxsysinfo/openbsd/net.c  Sun Dec  6 16:19:21 2015
+@@ -24,13 +24,8 @@
+ 
+ #include 
+ 
+-#if OpenBSD >= 201405
+-# include   /* structs ifnet and ifnet_head are defined in 
this header since OpenBSD 5.5 */
+-#endif
+-
+ static struct nlist kernel_symbols[] =
+ {
+-  {"_ifnet", N_UNDF, 0, 0, 0},
+   {"_tcbtable", N_UNDF, 0, 0, 0},
+   {NULL, 0, 0, 0, 0}
+ };
+@@ -43,11 +38,6 @@ static int  get_ifdata(const char *if_name,
+   zbx_uint64_t *tbytes, zbx_uint64_t *tpackets, zbx_uint64_t 
*terrors,
+   zbx_uint64_t *icollisions, char **error)
+ {
+-  struct ifnet_head   head;
+-  struct ifnet*ifp;
+-
+-  kvm_t   *kp;
+-  int len = 0;
+   int ret = SYSINFO_RET_FAIL;
+ 
+   if (NULL == if_name || '\0' == *if_name)
+@@ -88,66 +78,7 @@ static int  get_ifdata(const char *if_name,
+   if (icollisions)
+   *icollisions = 0;
+ 
+-  if (NULL != (kp = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL))) /* 
requires root privileges */
+   {
+-  struct ifnetv;
+-
+-  if (N_UNDF == kernel_symbols[IFNET_ID].n_type)
+-  if (0 != kvm_nlist(kp, _symbols[0]))
+-  kernel_symbols[IFNET_ID].n_type = N_UNDF;
+-
+-  if (N_UNDF != kernel_symbols[IFNET_ID].n_type)
+-  {
+-  len = sizeof(struct ifnet_head);
+-
+-  if (kvm_read(kp, kernel_symbols[IFNET_ID].n_value, 
, len) >= len)
+-  {
+-  len = sizeof(struct ifnet);
+-
+-  for (ifp = head.tqh_first; ifp; ifp = 
v.if_list.tqe_next)
+-  {
+-  if (kvm_read(kp, (u_long)ifp, , len) 
< len)
+-  break;
+-
+-  if (0 == strcmp(if_name, v.if_xname))
+-  {
+-  if (ibytes)
+-  *ibytes += v.if_ibytes;
+-  if (ipackets)
+-  *ipackets += 
v.if_ipackets;
+-  if (ierrors)
+-  *ierrors += 
v.if_ierrors;
+-  if (idropped)
+-  *idropped += 
v.if_iqdrops;
+-  if (obytes)
+-  *obytes += v.if_obytes;
+-  if (opackets)
+-  *opackets += 
v.if_opackets;
+-  if (oerrors)
+-  *oerrors += 
v.if_oerrors;
+-  if (tbytes)
+-  *tbytes += v.if_ibytes 
+ v.if_obytes;
+-  

Re: amd64 bulk report

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/12/06 09:11, Antoine Jacoutot wrote:
>> * net/ifstat
>> * net/libdnet
>> * net/nmap
>> * net/ocserv
>> * security/aircrack-ng
>
> From my test build:
>
> None of the above actually need things from if_var.h, they're ok with the
> whole file wrapped in ifdef kernel.
>
>> * devel/libgtop2
>
> mpi's already taking care of libgtop2

>> * security/antisniff

Here's a diff that removes the need to look at if_var.h - use
getifaddrs(3) instead; the diff is a bit unreadable, but the resulting
intpr() function isn't.

Untested, is antisniff still relevant these days?

Index: Makefile
===
RCS file: /cvs/ports/security/antisniff/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile30 Aug 2014 21:54:08 -  1.25
+++ Makefile7 Dec 2015 12:11:10 -
@@ -3,6 +3,7 @@
 COMMENT=   promiscuous mode interface detector
 
 PKGNAME=   antisniff-1.1.2
+REVISION=  0
 CATEGORIES=security
 
 DISTNAME=  anti_sniff_researchv1-1-2
Index: patches/patch-bpf_getetheraddr_c
===
RCS file: patches/patch-bpf_getetheraddr_c
diff -N patches/patch-bpf_getetheraddr_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-bpf_getetheraddr_c7 Dec 2015 12:11:10 -
@@ -0,0 +1,112 @@
+$OpenBSD$
+--- bpf_getetheraddr.c.origSat Dec 12 21:40:00 1998
 bpf_getetheraddr.c Sun Dec  6 16:34:36 2015
+@@ -90,7 +90,7 @@ struct nlist nl[] = {
+ 
+ kvm_t *kvmd;  
+ 
+-void intpr(u_long ifnetaddr, char *, struct ether_addr *);
++void intpr(char *, struct ether_addr *);
+ int  kread(u_long addr, char *buf, int size);
+ 
+ 
+@@ -130,83 +130,40 @@ int getetheraddr(HDEV fd, struct ether_addr *eaddr){
+ 
+   strncpy(intname, ifr.ifr_name, sizeof(intname));
+ 
+-  if ((kvmd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY,
+-  buf)) == NULL) {
+-fprintf(stderr, "kvm_open: %s\n", buf);
+-exit(1);
+-  }
+-
+-  if (kvm_nlist(kvmd, nl) < 0 || nl[0].n_type == 0) {
+-if (nlistf)
+-  fprintf(stderr, "%s: no namelist\n", nlistf);
+-else
+-  fprintf(stderr, "no namelist\n");
+-exit(1);
+-  }
+-
+-  intpr(nl[N_IFNET].n_value, intname, eaddr);
++  intpr(intname, eaddr);
+   return(TRUE);
+ }
+ 
++#include 
++
+ void
+-intpr(u_long ifnetaddr, char *intname, struct ether_addr *eaddr){
+-  struct ifnet ifnet;
+-  union {
+-struct ifaddr ifa;
+-struct in_ifaddr in;
+-  } ifaddr;
+-  u_long ifaddraddr;
+-  struct ifnet_head ifhead; /* TAILQ_HEAD */
+-  char name[IFNAMSIZ];
++intpr(char *intname, struct ether_addr *eaddr) {
++  struct ifaddrs *ifa0, *ifa;
+   struct sockaddr_dl *sdl;
+   struct sockaddr *sa;
+ 
+- if (ifnetaddr == 0) {
+-   printf("ifnet: symbol not defined\n");
+-   return;
+- }
++  if (getifaddrs() == -1)
++return;
+ 
+- /*
+-  * Find the pointer to the first ifnet structure.  Replace
+-  * the pointer to the TAILQ_HEAD with the actual pointer
+-  * to the first list element.
+-  */
+-  if (kread(ifnetaddr, (char *), sizeof ifhead))
+-return;
++  for (ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next) {
+ 
+-  ifnetaddr = (u_long)ifhead.tqh_first;
+-  ifaddraddr = 0;
+-
+-  while (ifnetaddr){
+-register char *cp;
+-
+-if (kread(ifnetaddr, (char *), sizeof ifnet))
+-  return;
+-bcopy(ifnet.if_xname, name, IFNAMSIZ);
+-name[IFNAMSIZ - 1] = '\0';  /* sanity */
+-ifnetaddr = (u_long)ifnet.if_list.tqe_next;
+-ifaddraddr = (u_long)ifnet.if_addrlist.tqh_first;
+-
+-if (strcmp(name, intname) == 0) {
+-  if (ifaddraddr != 0){
+-if (kread(ifaddraddr, (char *), sizeof ifaddr)) {
+-  ifaddraddr = 0;
++if (strcmp(ifa->ifa_name, intname) == 0) {
++sa = (struct sockaddr *)ifa->ifa_addr;
++  if (sa == NULL)
+   continue;
+-}
+-#define CP(x) ((char *)(x))
+-cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
+-   CP(); 
+-sa = (struct sockaddr *)cp;
++  if (sa->sa_family != AF_LINK)
++  continue;
+ sdl = (struct sockaddr_dl *)sa;
+ /*
+ if (sdl->sdl_type == IFT_ETHER ||
+ sdl->sdl_type == IFT_FDDI)
+ */
+ /*  printf("%s\n", ether_ntoa((struct ether_addr *)LLADDR(sdl))); */
+-  memcpy((char *)eaddr, (char *)LLADDR(sdl), sizeof(struct 
ether_addr));
+-  }
++memcpy((char *)eaddr, (char *)LLADDR(sdl), sizeof(struct ether_addr));
+ }
+   }
++
++  freeifaddrs(ifa0);
+ }
+ 
+ 
Index: patches/patch-includes_h
===
RCS file: /cvs/ports/security/antisniff/patches/patch-includes_h,v
retrieving revision 1.4
diff -u -p -r1.4 patch-includes_h
--- patches/patch-includes_h6 Dec 2013 11:54:48 -   1.4
+++ patches/patch-includes_h7 Dec 2015 12:11:10 -
@@ -1,13 +1,11 @@
 $OpenBSD: patch-includes_h,v 1.4 2013/12/06 

Re: amd64 bulk report (net-snmp)

[Jérémie Courrèges-Anglas]

Stuart Henderson  writes:

> On 2015/12/06 09:11, Antoine Jacoutot wrote:
>> * net/ifstat
>> * net/libdnet
>> * net/nmap
>> * net/ocserv
>> * security/aircrack-ng
>
> From my test build:
>
> None of the above actually need things from if_var.h, they're ok with the
> whole file wrapped in ifdef kernel.
>
>> * devel/libgtop2
>
> mpi's already taking care of libgtop2
>
[...]

> the above, plus net-snmp, do need things from if_var.

I took a look at net-snmp, things are a bit a ugly but in the end we
should be able to use getifaddrs(3) instead of kvm/struct ifnet for
ipv6.c.

The following is wip, I'd like to further split the getifaddrs(3) and
ifnet implementations but it probably should be discussed with upstream
before going too far.

I've done basic tests this morning using snmpwalk localhost and netsnmpd
started as root.

Thoughts?

Index: Makefile
===
RCS file: /cvs/ports/net/net-snmp/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- Makefile5 Nov 2015 23:43:46 -   1.84
+++ Makefile7 Dec 2015 12:32:43 -
@@ -6,7 +6,7 @@ COMMENT-main=   extendable SNMP implementa
 COMMENT-tkmib= graphical SNMP MIB browser
 
 V= 5.7.3
-REVISION-main= 4
+REVISION-main= 5
 
 DISTNAME=  net-snmp-$V
 MULTI_PACKAGES=-main -tkmib
@@ -58,6 +58,7 @@ CONFIGURE_ARGS=   ${CONFIGURE_SHARED} \
--with-temp-file-pattern=/tmp/snmpd \
--with-logfile="/var/log/snmpd" \
--with-persistent-directory="/var/net-snmp"
+CONFIGURE_ENV= ac_cv_IFNET_NEEDS_KERNEL=no
 TEST_TARGET=   test
 
 pre-configure:
Index: patches/patch-agent_mibgroup_mibII_ipv6_c
===
RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_mibII_ipv6_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-agent_mibgroup_mibII_ipv6_c
--- patches/patch-agent_mibgroup_mibII_ipv6_c   20 Dec 2013 02:20:00 -  
1.1
+++ patches/patch-agent_mibgroup_mibII_ipv6_c   7 Dec 2015 12:32:43 -
@@ -1,7 +1,213 @@
 $OpenBSD: patch-agent_mibgroup_mibII_ipv6_c,v 1.1 2013/12/20 02:20:00 krw Exp $
 agent/mibgroup/mibII/ipv6.c.orig   Tue Oct  9 18:28:58 2012
-+++ agent/mibgroup/mibII/ipv6.cSat Nov 30 08:25:29 2013
-@@ -1336,9 +1336,13 @@ var_udp6(register struct variable * vp,
+--- agent/mibgroup/mibII/ipv6.c.orig   Mon Dec  8 21:23:22 2014
 agent/mibgroup/mibII/ipv6.cMon Dec  7 09:11:14 2015
+@@ -81,6 +81,7 @@
+ # include 
+ #endif
+ #if HAVE_NETINET6_IP6_VAR_H
++# include 
+ # include 
+ #endif
+ #include 
+@@ -597,7 +598,44 @@ if_getindex(const char *name)
+ 
+ /**/
+ #ifndef linux
++
++#ifdef __OpenBSD__
++
+ /*
++ * It is not possible to use struct ifnet anymore on OpenBSD, get
++ * interface flags and L2 address through getifaddrs(3).
++ */
++
++#include 
++
++static int
++if_getifflags(int ifindex, int *ifflags)
++{
++  const char  *ifname;
++  struct ifaddrs  *ifa0, *ifa;
++  int  ret = -1;
++
++  ifname = if_getname(ifindex);
++  if (ifname == NULL)
++  return ret;
++
++  if (getifaddrs() != -1) {
++  for (ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next) {
++  if (strcmp(ifa->ifa_name, ifname) == 0) {
++  *ifflags = ifa->ifa_flags;
++  ret = 0;
++  break;
++  }
++  }
++  freeifaddrs(ifa0);
++  }
++
++  return ret;
++}
++
++#else
++
++/*
+  * KAME dependent part 
+  */
+ static int
+@@ -630,6 +668,8 @@ if_getifnet(int idx, struct ifnet *result)
+ return -1;
+ }
+ 
++#endif /* !__OpenBSD__ */
++
+ #if TRUST_IFLASTCHANGE /*untrustable value returned... */
+ #ifdef HAVE_NET_IF_MIB_H
+ #if defined(HAVE_SYS_SYSCTL_H) && defined(CTL_NET)
+@@ -844,86 +884,34 @@ var_ifv6Entry(register struct variable * vp,
+ #endif
+ case IPV6IFPHYSADDRESS:
+ {
+-struct ifnetifnet;
+-struct ifaddr   ifaddr;
+-#if defined(__DragonFly__) && __DragonFly_version >= 197700
+-struct ifaddr_container ifac;
+-struct ifaddrhead head;
+-#endif
+ static struct sockaddr_dl sdl;
+-caddr_t ifa;
++struct ifaddrs *ifa0, *ifa;
++char ifnam[IF_NAMESIZE];
+ 
+-if (if_getifnet(interface, ) < 0)
+-break;
+-#if defined(freebsd3) || defined(darwin)
+-# if defined(__DragonFly__) && __DragonFly_version >= 197700
+-/*
+- * Locate ifaddr head on CPU0
+- */
+-if (!NETSNMP_KLOOKUP(ifnet.if_addrheads, (char *), 
sizeof(head))) {
+-DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup head failed\n"));
+-break;
++if (if_indextoname(interface, ifnam) == NULL) {
++

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2015/12/07 06:11:41

Modified files:
geo/qgis   : Makefile distinfo 
geo/qgis/patches: patch-src_core_qgsapplication_cpp 

Log message:
Bugfix update to QGIS 2.12.1. Fix paths in patch while here.

NEW: games/gnurobbo

[Anthony J. Bentley]

Hi,

GNU Robbo is a free open source reimplementation of Janusz Pelc's
Robbo for the Atari XE/XL which was distributed by LK Avalon in 1989.

Robbo is stranded on an inhospitable planet. Help him to escape by
collecting the parts to repair his capsule whilst avoiding the deadly
animals, guns, bombs, lasers and other unpleasant things.


ok?

-- 
Anthony J. Bentley


gnurobbo.tar.gz
Description: gnurobbo.tar.gz

Re: shells/bash distinfo

[Gleydson Soares]

On Mon, Dec 07, 2015 at 09:57:57PM -0300, Gleydson Soares wrote:
> bash's upstream reroll the patch 042 so seems that distinfo is now broken.
> 
> bash43-042 2015-12-01 16:57 1.5K
> 
> -SHA256 (bash/bash43-042) = t1pTFBqz2P/z+nS189x2RosB6uKZ9Qu8K8ca45XWkK8=
> +SHA256 (bash/bash43-042) = rCGTItsnkdqHpJbubo5VRIRklL2q6iYmJwwvc8EESRk=

diff attached.
Index: Makefile
===
RCS file: /cvs/ports/shells/bash/Makefile,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 Makefile
--- Makefile14 Aug 2015 15:29:12 -  1.95
+++ Makefile8 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
Index: distinfo
===
RCS file: /cvs/ports/shells/bash/distinfo,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 distinfo
--- distinfo14 Aug 2015 15:29:12 -  1.56
+++ distinfo8 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

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2015/12/07 19:22:34

Modified files:
games/hypatia  : Makefile 

Log message:
Update homepage.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 13:51:10

Modified files:
security   : Makefile 
Removed files:
security/antisniff: Makefile distinfo 
security/antisniff/patches: patch-Makefile patch-arpreqtest_c 
patch-bpf_readwrite_c 
patch-etherping_c patch-flood_net_c 
patch-includes_h patch-ip_util_c 
patch-run_etherpingtest_c 
security/antisniff/pkg: DESCR PLIST 

Log message:
remove antisniff, outdated, unmaintained, etc. it hid well in the tree from
way before openbsd 2.7, but now it got smoked out of hiding by the recent 
if_var.h
changes.

ok bentley@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 13:51:24

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
register antisniff removal

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
net/py-websocket-client: Makefile 
net/py-websocket-client/pkg: PLIST 
devel/py-tzlocal: Makefile 
devel/py-tzlocal/pkg: PLIST 

Log message:
plist fixes, MODPY_COMMENT shouldn't have a space after it

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/07 16:42:03

Modified files:
net/librenms   : Makefile distinfo 
net/librenms/patches: patch-daily_sh patch-html_index_php 
  patch-includes_defaults_inc_php 
  patch-includes_definitions_inc_php 
  patch-scripts_distro 
net/librenms/pkg: PLIST 

Log message:
update to LibreNMS-201512

NEW: sysutils/fwa

[Peter Hajdu]

Hi,

Sorry for the previous one, I've forgot the attachment...

fwa is a simple file change notifier keeping unix philosophy
in mind.  It is intended to be a clean and simple application
to watch file changes on systems using kqueue.  It does not
execute any commands, just prints out the changed file's name.
To handle the events, read fwa's output and act as you wish.

I've tested it on amd64 and i386.  This is my first port, so
I would appreciate any comments.  I hope I did not make too many
mistakes.


Best regards,
Peter



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

Re: NetBeans garbage output problem report

[Rafael Sadowski]

On Wed Dec 02, 2015 at 10:57:19PM -0700, Scott Walters wrote:
> On 11/24/15, Rafael Sadowski  wrote:
> > On Sat Nov 14, 2015 at 03:36:36PM -0700, Scott Walters wrote:
> >> Hopefully this is going to the correct place.
> >
> > Hi Scott,
> >
> > could you or maybe other netbeans user test/run the current state of:
> >
> > https://github.com/jasperla/openbsd-wip/tree/master/devel/netbeans
> 
> Hi Rafael,
> 
> Thanks for your work on this, and sorry for the slow response.
> I'm not normally a NetBeans user (or IDE user), so this has been educational.
> 
> I set up OpenBSD Ports and checked out that github repo into it, and
> made the /etc/mk.conf config change suggested by the README.md for
> openbsd-wip.  Java took a good while to build, chewing on a source
> file someone mentioned in this thread.  I uninstalled the other
> NetBeans then pkg_add'd
> /usr/ports/packages/amd64/all/netbeans-8.1.tgz.
> 
> I'm now unable to create a project in NetBeans.  Picking New Project
> -> Java -> Next, I get this screen ("Finding Feature" with the Next
> button greyed out), and it sits for at least hours for me.
> 
> I'm sure that has a lot more to do with my system and NetBeans 8.1
> than it does with the patch for the garbage output issue, but my first
> attempt at testing that patch has been frustrated.
> 
> Blowing away the NetBeans directories in my homedir didn't help.
> 
> I'll try to Google this problem and fix it and get further and report.
> 
> Thanks again,
> -scott

Hi Scott,

thank you for your feedback. Could you check out the new updated version
from github and play with -J-Dawt.useSystemAAFontSettings=XXX in
bin/netbeans. For me lcd works fine without garbage output.

Here are all options for useSystemAAFontSettings: 
http://wiki.netbeans.org/FaqFontRendering

Once again, thank you very much! I hope useSystemAAFontSettings will the
output problem.

Cheers,

Rafael

NEW: sysutils/fwa

[Peter Hajdu]

Hi,

fwa is a simple file change notifier keeping unix philosophy
in mind.  It is intended to be a clean and simple application
to watch file changes on systems using kqueue.  It does not
execute any commands, just prints out the changed file's name.
To handle the events, read fwa's output and act as you wish.

I've tested it on amd64 and i386.  This is my first port, so
I would appreciate any comments.  I hope I did not make too many
mistakes.


Best regards,
Peter

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

[Rafael Sadowski]

Hi @ports,

nobody cares *ping* harder ;-)

Cheers, Rafael

On Sun Nov 22, 2015 at 04:51:14PM +0100, Rafael Sadowski wrote:
> Hi ports@
> 
> after my first attempt here is the new diff to update doxygen.
> 
> doxygen port highlights:
> 
> - switch to CMake
> - Don't use own libmd5 but base md5
> - Use MD5Data() instead of MD5Buffer+MD5SigToString
> 
> I checked all ports with doxygen usage.
> 
> - No changes with 1.8.10:
> 
> audio/liblo
> database/soprano
> devel/simulavr
> devel/tclap
> math/ginac
> graphics/digikam-kde4
> graphics/opencv
> net/libktorrent
> productivit/kmymoney
> productivit/libalkimia
> x11/awesome
> x11/kde4/runtime
> x11/kde4/nepomuk-core
> 
> 
> - REVISION bump and update plist:
> 
> audio/libnjb
> devel/libmtp
> devel/qjson
> geo/geos
> graphics/lensfun
> multimedia/libquicktime
> x11/dbusmenu-qt
> x11/ede/lib
> 
> I am looking forward about your feedback and I hope we will see 1.8.10
> quickly in the tree.
> 
> Best regards, Rafael
> 
> 
> Index: audio/libnjb/Makefile
> ===
> RCS file: /cvs/ports/audio/libnjb/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- audio/libnjb/Makefile 2 May 2015 20:53:18 -   1.12
> +++ audio/libnjb/Makefile 22 Nov 2015 14:44:29 -
> @@ -4,6 +4,7 @@ COMMENT=  communicate with some Creative
>  
>  DISTNAME=libnjb-2.2.7
>  CATEGORIES=  audio devel
> +REVISION =   0
>  
>  SHARED_LIBS +=  njb  0.0  # 6.1
>  
> Index: audio/libnjb/pkg/PLIST
> ===
> RCS file: /cvs/ports/audio/libnjb/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- audio/libnjb/pkg/PLIST2 May 2015 20:53:18 -   1.3
> +++ audio/libnjb/pkg/PLIST22 Nov 2015 14:44:29 -
> @@ -29,6 +29,8 @@ lib/pkgconfig/libnjb.pc
>  share/doc/libnjb/
>  share/doc/libnjb/html/
>  share/doc/libnjb/html/annotated.html
> +share/doc/libnjb/html/arrowdown.png
> +share/doc/libnjb/html/arrowright.png
>  share/doc/libnjb/html/base_8c.html
>  share/doc/libnjb/html/base_8h_source.html
>  share/doc/libnjb/html/bc_s.png
> @@ -44,6 +46,7 @@ share/doc/libnjb/html/defs_8h_source.htm
>  share/doc/libnjb/html/delfile_8c-example.html
>  share/doc/libnjb/html/deltr_8c-example.html
>  share/doc/libnjb/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
> +share/doc/libnjb/html/doc.png
>  share/doc/libnjb/html/doxygen.css
>  share/doc/libnjb/html/doxygen.png
>  share/doc/libnjb/html/dumpeax_8c-example.html
> @@ -55,22 +58,8 @@ share/doc/libnjb/html/examples.html
>  share/doc/libnjb/html/examples_8h_source.html
>  share/doc/libnjb/html/files.html
>  share/doc/libnjb/html/files_8c-example.html
> -share/doc/libnjb/html/ftv2blank.png
> -share/doc/libnjb/html/ftv2cl.png
> -share/doc/libnjb/html/ftv2doc.png
> -share/doc/libnjb/html/ftv2folderclosed.png
> -share/doc/libnjb/html/ftv2folderopen.png
> -share/doc/libnjb/html/ftv2lastnode.png
> -share/doc/libnjb/html/ftv2link.png
> -share/doc/libnjb/html/ftv2mlastnode.png
> -share/doc/libnjb/html/ftv2mnode.png
> -share/doc/libnjb/html/ftv2mo.png
> -share/doc/libnjb/html/ftv2node.png
> -share/doc/libnjb/html/ftv2ns.png
> -share/doc/libnjb/html/ftv2plastnode.png
> -share/doc/libnjb/html/ftv2pnode.png
> -share/doc/libnjb/html/ftv2splitbar.png
> -share/doc/libnjb/html/ftv2vertline.png
> +share/doc/libnjb/html/folderclosed.png
> +share/doc/libnjb/html/folderopen.png
>  share/doc/libnjb/html/functions.html
>  share/doc/libnjb/html/functions_vars.html
>  share/doc/libnjb/html/fwupgrade_8c-example.html
> @@ -79,32 +68,32 @@ share/doc/libnjb/html/getowner_8c-exampl
>  share/doc/libnjb/html/gettr_8c-example.html
>  share/doc/libnjb/html/getusage_8c-example.html
>  share/doc/libnjb/html/globals.html
> -share/doc/libnjb/html/globals_0x64.html
> -share/doc/libnjb/html/globals_0x65.html
> -share/doc/libnjb/html/globals_0x66.html
> -share/doc/libnjb/html/globals_0x67.html
> -share/doc/libnjb/html/globals_0x6c.html
> -share/doc/libnjb/html/globals_0x6d.html
> -share/doc/libnjb/html/globals_0x6e.html
> -share/doc/libnjb/html/globals_0x6f.html
> -share/doc/libnjb/html/globals_0x70.html
> -share/doc/libnjb/html/globals_0x73.html
> -share/doc/libnjb/html/globals_0x74.html
> -share/doc/libnjb/html/globals_0x75.html
> +share/doc/libnjb/html/globals_d.html
>  share/doc/libnjb/html/globals_defs.html
> +share/doc/libnjb/html/globals_e.html
>  share/doc/libnjb/html/globals_enum.html
> +share/doc/libnjb/html/globals_f.html
>  share/doc/libnjb/html/globals_func.html
> -share/doc/libnjb/html/globals_func_0x64.html
> -share/doc/libnjb/html/globals_func_0x65.html
> -share/doc/libnjb/html/globals_func_0x66.html
> -share/doc/libnjb/html/globals_func_0x67.html
> -share/doc/libnjb/html/globals_func_0x6d.html
> -share/doc/libnjb/html/globals_func_0x6e.html
> -share/doc/libnjb/html/globals_func_0x70.html
> -share/doc/libnjb/html/globals_func_0x73.html
> 

Re: NEW: sysutils/fwa

[James Turner]

Peter,

Port looks pretty good, no need for MAKE_FILE or TEST_TARGET as those
are both the defaults. Also make test failed for me. You may need to add
./${TEST} or sh ${TEST} in your Makefile to it executes correctly.

On Mon, Dec 07, 2015 at 08:29:49PM +0100, Peter Hajdu wrote:
> Hi,
> 
> Sorry for the previous one, I've forgot the attachment...
> 
> fwa is a simple file change notifier keeping unix philosophy
> in mind.  It is intended to be a clean and simple application
> to watch file changes on systems using kqueue.  It does not
> execute any commands, just prints out the changed file's name.
> To handle the events, read fwa's output and act as you wish.
> 
> I've tested it on amd64 and i386.  This is my first port, so
> I would appreciate any comments.  I hope I did not make too many
> mistakes.
> 
> 
> Best regards,
> Peter
> 



-- 
James Turner

Re: lang/go-bootstrap

[Kent R. Spillner]

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.  Is it possible to just add /usr/local/go-pkg to GOPATH and then have
Go automatically pick up anything installed correctly under that directory?
Or would we add each dependency installed under /usr/local/go-pkg to GOPATH
separately?  Alternatively, we could just roll & host our own distfiles that
include all of the dependencies.  I thought about doing that for
net/websocketd, but ultimately decided it would be ok to install a library
from the golang.org/x/net package in /usr/local/go.  Sorry!  :)

Re: NEW: sysutils/fwa

[Peter Hajdu]

I've fixed a few things after a discussion with James Turner.

> fwa is a simple file change notifier keeping unix philosophy
> in mind.  It is intended to be a clean and simple application
> to watch file changes on systems using kqueue.  It does not
> execute any commands, just prints out the changed file's name.
> To handle the events, read fwa's output and act as you wish.
> 
> I've tested it on amd64 and i386.  This is my first port, so
> I would appreciate any comments.  I hope I did not make too many
> mistakes.

-- 
Peter Hajdu



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

Re: lang/go-bootstrap

[Dmitrij D. Czarkoff]

Joel Sing said:
> I obviously did not get to look carefully at r1.2 of go.port.mk - there are a 
> number of issues that should be resolved:
> 
> - Running 'go install -x' and piping the results through sed and sh -v is 
> crazy. Firstly, 'go install -x' will *run* those commands, then they're being 
> run a second time around via sh. Not to mention that there are cases where 
> replacing GOROOT is wrong. If Go is writing outside of GOPATH then it is 
> either being called/used incorrectly, or there is a bug that should be fixed.
> 
> - Using -work is going to cause mess since it prints the work directory and 
> leaves the work directory behind. I cannot see anything that is cleaning this 
> up, so we're left with /tmp/go-build*.
> 
> - Using 'go build -a' should be unnecessary - furthermore, the semantics of 
> -a 
> have changed between go1.4 and go1.5. In go1.4 the standard library was 
> excluded from the -a flag whereas for go1.5 it does mean all dependencies 
> including the standard library (this was the same for go1.3). However, there 
> is a blanket 'do not rebuild standard library packages' in place when the -a 
> flag is not specified.

The module was built for go 1.4, and most of it needs rewrite for 1.5.
There are also other issues with it.  I'd rather decouple update of
golang port from update of go ports and this module.

> This brings me to the next issue/topic - installing additional packages under 
> /usr/local/go is probably a bad idea. The biggest issue is that Go treats 
> packages under that path as being 'standard library' and as such, they do not 
> get rebuilt unless the -a flag is used. The Go development model is that you 
> fetch additional packages into your workspace - obviously this does not work 
> that well for prepackaged/compiled code. 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.

I had some issues with this approach with go 1.4.  If it works with 1.5,
I am all for it, albeit I'd rather use location under /usr/local/go
root, eg. /usr/local/go/3rdparty.

> Alternatively, the code is fetched and built when the binary is built
> (for example, when building net/websocketd, net/go-websocket is pulled
> in and compiled at the same time.

This happens during build stage, which should never happen in ports.

-- 
Dmitrij D. Czarkoff

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

[Gleydson Soares]

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),

// gsoares
Index: Makefile
===
RCS file: /cvs/ports/plan9/plan9port/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile4 Dec 2015 04:26:33 -   1.10
+++ Makefile7 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_c7 Dec 2015 21:36:31 -
@@ -0,0 +1,157 @@
+$OpenBSD$
+
+replace kvm(3) with getifaddrs(3)
+
+--- src/cmd/auxstats/OpenBSD.c.origWed 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)
+   Bprint(, "ethererr %lud 1000\n", err);
+   Bprint(, "ether %lud 1000\n", in+out);
+   Bprint(, "etherb %lud 100\n", inb+outb);
++
++  freeifaddrs(ifap);
+ }
+ 
+ void

Re: lang/go-bootstrap

[Stuart Henderson]

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.

games/abuse: remove rundep on timidity

[Anthony J. Bentley]

Hi,

audio/timidity uses proprietary patches and thus is not available as a
package on our mirrors. This has the unfortunate side effect of making
"pkg_add abuse" fail, because it has a run dependency on timidity.

However, when abuse was updated to 0.8, it was switched to a free
distfile that contained no proprietary data--and as a result the
music is no longer part of our package. Therefore, the run dependency
is no longer necessary.

Anyone who knows to download the proprietary music and put it in the
right place can probably figure out to install timidity too.

ok?

Index: Makefile
===
RCS file: /cvs/ports/games/abuse/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile5 Nov 2014 11:43:59 -   1.41
+++ Makefile7 Dec 2015 22:44:09 -
@@ -7,7 +7,7 @@ PKGNAME =   abuse-0.8
 EPOCH =0
 ABUSE_SFX =abuse-free-sounds-20120309
 CATEGORIES =   games x11
-REVISION = 0
+REVISION = 1
 
 HOMEPAGE = http://abuse.zoy.org/
 
@@ -30,7 +30,6 @@ MODULES = converters/libiconv
 BUILD_DEPENDS =devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-RUN_DEPENDS =  audio/timidity
 LIB_DEPENDS =  devel/sdl-mixer \
devel/smpeg \
audio/flac \

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2015/12/07 17:26:28

Modified files:
games/atomix   : Makefile 

Log message:
Update homepage, license marker, master_sites.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 11:00:42

Modified files:
net/wmnet  : Makefile 
net/wmnet/patches: patch-Imakefile patch-drivers_c patch-wmnet_h 
Added files:
net/wmnet/patches: patch-config_h 

Log message:
- use getifaddrs(3)
- stop linking with libkvm now that it's no longer used
- remove some now-unneeded parts of the drivers.c patch

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 11:26:49

Modified files:
security/keepassx: Tag: OPENBSD_5_8 Makefile 
Added files:
security/keepassx/patches: Tag: OPENBSD_5_8 
   patch-src_lib_FileDialogs_cpp 

Log message:
Security fix for CVE-2015-8378

ok steven@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 11:26:01

Modified files:
security/keepassx: Makefile 
Added files:
security/keepassx/patches: patch-src_lib_FileDialogs_cpp 

Log message:
Security fix for CVE-2015-8378

ok steven@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 11:24:11

Modified files:
x11/windowmaker: Makefile 
x11/windowmaker-extra: Makefile 

Log message:
update HOMEPAGE

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/12/07 11:24:32

Modified files:
infrastructure/templates: network.conf.template 

Log message:
update address for MASTER_SITE_WINDOWMAKER

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2015/12/07 11:42:53

Modified files:
devel  : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
devel/py-openbsd: Makefile distinfo 
devel/py-openbsd/patches: patch-openbsd__ifconfig_c 
  patch-openbsd__netstat_c 
  patch-openbsd__pcap_c 
  patch-openbsd__sysvar_c 
  patch-openbsd_packet_py 
  patch-openbsd_pcap_py 
  patch-test_test_packet_realworld_py 
  patch-test_test_pcap_py 
devel/py-openbsd/pkg: DESCR PLIST 

Log message:
Remove: abandoned upstream, we have to fix it each time base changes.

sthen had already warned more than one year ago.

ok sthen@ jasper@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/12/07 17:50:51

Modified files:
security/openssl: Tag: OPENBSD_5_8 Makefile distinfo 
security/openssl/patches: Tag: OPENBSD_5_8 patch-Configure 
security/openssl/pkg: Tag: OPENBSD_5_8 PLIST 

Log message:
update OpenSSL in 5.8-stable to 1.0.1q

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2015/12/07 17:56:20

Modified files:
games/abuse: Makefile 

Log message:
Remove abuse's rundep on timidity; our package has no music anyway.

ok sthen@

shells/bash distinfo

[Gleydson Soares]

bash's upstream reroll the patch 042 so seems that distinfo is now broken.

bash43-042 2015-12-01 16:57 1.5K

-SHA256 (bash/bash43-042) = t1pTFBqz2P/z+nS189x2RosB6uKZ9Qu8K8ca45XWkK8=
+SHA256 (bash/bash43-042) = rCGTItsnkdqHpJbubo5VRIRklL2q6iYmJwwvc8EESRk=