UPDATE: databases/influxd

2019-10-20 Thread Rafael Sadowski
Simple update to the latest stable version in the 1.6 branch.

I've had some problems with 161 and after updating to 1.6.4 and later to
1.6.6 there are gone.  However, this version works fine for me with
collected and grafana.

BTW, the "hackish" target to bundle/vendor dependencies is really handy.

OK?

Index: Makefile
===
RCS file: /cvs/ports/databases/influxdb/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:43:53 -  1.10
+++ Makefile21 Oct 2019 05:33:33 -
@@ -2,13 +2,12 @@
 
 COMMENT =  time-series datastore for metrics, events, and analytics
 
-V =1.6.1
+V =1.6.6
 DISTNAME = influxdb-${V}
-REVISION = 0
 
 HOMEPAGE = https://influxdata.com
 # selfhosted because we bundle go deps
-MASTER_SITES = https://rhaalovely.net/stuff/
+MASTER_SITES = https://sizeofvoid.org/pub/OpenBSD/distfiles/
 
 CATEGORIES =   databases
 
Index: distinfo
===
RCS file: /cvs/ports/databases/influxdb/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo19 Aug 2018 20:23:25 -  1.3
+++ distinfo21 Oct 2019 05:33:33 -
@@ -1,2 +1,2 @@
-SHA256 (influxdb-1.6.1.tar.gz) = O63l8wKY3Lj/aoVhydQfxO8O4W7SJFsy9SnBcABJI7o=
-SIZE (influxdb-1.6.1.tar.gz) = 10202830
+SHA256 (influxdb-1.6.6.tar.gz) = y0M55cV5hNBGjSGWTrwCfPJM+Uycc/kD6P0vmRCTpTQ=
+SIZE (influxdb-1.6.6.tar.gz) = 10370147



Re: valgrind diff to fix run memcheck on amd64

2019-10-20 Thread Masato Asou
From: Stuart Henderson 
Subject: Re: valgrind diff to fix run memcheck on amd64
Date: Fri, 18 Oct 2019 21:58:25 +0100

> On 2019/10/18 15:08, Masato Asou wrote:
>> From: YASUOKA Masahiko 
>> Date: Wed, 02 Oct 2019 23:29:05 +0900 (JST)
>> 
>> > I looked into the problem more.
>> > 
>> >  - unveil(2) itself fails
>> >  - so file system related system calls are not restricted (yet)
>> > 
>> > valgrind complains:
>> > 
>> > ==13326==
>> > --13326-- WARNING: unhandled syscall: 114
>> > --13326-- You may be able to write your own handler.
>> > --13326-- Read the file README_MISSING_SYSCALL_OR_IOCTL.
>> > --13326-- Nevertheless we consider this a bug.  Please report
>> > --13326-- it at http://valgrind.org/support/bug_reports.html.
>> > 
>> > valgrind doesn't support unveil(2) yet.  I suppose Asou can add that.
>> 
>> I was added unveil(2).
> 
> Please set REVISION = 14 in ports/devel/valgrind/Makefile so that
> "pkg_add -u" will find the update.
> 
> Otherwise OK sthen@

Modified REVISION.
--
ASOU Masato

Index: Makefile
===
RCS file: /cvs/ports/devel/valgrind/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile2 Oct 2019 17:19:29 -   1.20
+++ Makefile21 Oct 2019 01:58:47 -
@@ -9,7 +9,7 @@ CATEGORIES =devel
 
 V =3.10.1
 PV =   20160331
-REVISION = 13
+REVISION = 14
 DISTNAME = valgrind-${V}
 EXTRACT_SUFX = .tar.bz2
 
Index: patches/patch-coregrind_m_syswrap_priv_syswrap_openbsd_h
===
RCS file: patches/patch-coregrind_m_syswrap_priv_syswrap_openbsd_h
diff -N patches/patch-coregrind_m_syswrap_priv_syswrap_openbsd_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-coregrind_m_syswrap_priv_syswrap_openbsd_h21 Oct 2019 
01:58:47 -
@@ -0,0 +1,10 @@
+--- coregrind/m_syswrap/priv_syswrap-openbsd.h.orig
 coregrind/m_syswrap/priv_syswrap-openbsd.h
+@@ -144,6 +144,7 @@
+ DECL_TEMPLATE(openbsd, sys_pledge);
+ DECL_TEMPLATE(openbsd, sys_ppoll);
+ DECL_TEMPLATE(openbsd, sys_pselect);
++DECL_TEMPLATE(openbsd, sys_unveil);
+ DECL_TEMPLATE(openbsd, sys_sigsuspend);
+ DECL_TEMPLATE(openbsd, sys_gettimeofday);
+ DECL_TEMPLATE(openbsd, sys_getrusage);
Index: patches/patch-coregrind_m_syswrap_syswrap_openbsd_c
===
RCS file: patches/patch-coregrind_m_syswrap_syswrap_openbsd_c
diff -N patches/patch-coregrind_m_syswrap_syswrap_openbsd_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-coregrind_m_syswrap_syswrap_openbsd_c 21 Oct 2019 01:58:47 
-
@@ -0,0 +1,30 @@
+--- coregrind/m_syswrap/syswrap-openbsd.c.orig
 coregrind/m_syswrap/syswrap-openbsd.c
+@@ -575,6 +579,17 @@
+ // XXXTBD
+ }
+ 
++PRE(sys_unveil)
++{
++   PRINT("sys_unveil ( %#lx(%s), %#lx(%s) )",
++ ARG1,(char *)ARG1,ARG2,(char*)ARG2);
++   PRE_REG_READ2(long, "unveil", const char *, path, const char *, 
permissions);
++   if (ARG1 != (UWord)NULL)
++ PRE_MEM_RASCIIZ( "unveil(path)", ARG1 );
++   if (ARG2 != (UWord)NULL)
++ PRE_MEM_RASCIIZ( "unveil(permissions)", ARG2 );
++}
++
+ PRE(sys_getsockname)
+ {
+PRINT("sys_getsockname ( %ld, %#lx, %#lx )",ARG1,ARG2,ARG3);
+@@ -4079,7 +4093,7 @@
+   BSDX_(__NR_sigsuspend,  sys_sigsuspend),// 111
+   BSDX_(__NR_sendsyslog,  sys_sendsyslog),// 112
+   // obsol orecvmsg   // 113
+-  // obsol osendmsg   // 114
++  BSDX_(__NR_unveil,  sys_unveil),// 114
+   // obsol vtrace // 115
+ 
+   BSDX_(__NR_getsockopt,  sys_getsockopt),// 118
+Only in pobj/valgrind-3.10.1/valgrind-3.10.1/coregrind/m_syswrap: 
syswrap-openbsd.c.orig
Index: patches/patch-include_vki_vki_scnums_openbsd_h
===
RCS file: patches/patch-include_vki_vki_scnums_openbsd_h
diff -N patches/patch-include_vki_vki_scnums_openbsd_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-include_vki_vki_scnums_openbsd_h  21 Oct 2019 01:58:47 
-
@@ -0,0 +1,10 @@
+--- include/vki/vki-scnums-openbsd.h.orig
 include/vki/vki-scnums-openbsd.h
+@@ -146,6 +146,7 @@
+ #define   __NR_pselect110
+ #define   __NR_sigsuspend 111
+ #define   __NR_sendsyslog 112
++#define   __NR_unveil 114
+ #define   __NR_getsockopt 118
+ #define   __NR_thrkill119
+ #define   __NR_readv  120



Re: Firefox: unwanted network connections

2019-10-20 Thread Johnathan M.
On Sat, Oct 19, 2019 at 2:36 PM Claus Assmann  wrote:
>
> Can someone point in me in the right direction how to prevent firefox
> from making lots of unwanted network connections, e.g., to
> amazonaws.com
> cloudfront.net
> even if I didn't open any website yet?
>
> I disabled "pingsender" and all "telemetry" options I could find,
> and in OpenBSD 6.5 I simply used tcpdrop on all web connections a
> bit after startup, but now I updated to OpenBSD 6.6 and those
> connections come back again and again even if just let it "sit"
> idle.
>
> I strongly prefer that firefox only makes network connections which
> I initiated instead of possibly giving away my data to some places...
>

Mozilla has a rather long list of steps to perform should you as a user
be concerned about privacy:
https://support.mozilla.org/en-US/kb/how-stop-firefox-making-automatic-connections

If you want to restrict FireFox as much as possible, it may be
worthwhile to maintain your own user.js file using the following
repository as a reference:
https://github.com/pyllyukko/user.js

I've not confirmed that what I've proposed will give you the desired
effect, but good luck.



Port py-ldap core dump on OpenBSD 6.6: "in free(): bogus pointer (double free?)"

2019-10-20 Thread Zhang Huangbin
Dear all,

Seems i'm experiencing a bug of py-ldap (version 3.2.0) with both Python-2.7
and 3.7 which is caught on OpenBSD 6.6 (amd64), any help is appreciated.

Steps to reproduce:

- Setup a working LDAP server, make sure connection/query from other 
applications or ldap command line tools works fine.
- Run below Python code with correct bind dn and password, error raised while 
running `bind_s()`:

--
import ldap

uri = 'ldap://127.0.0.1:389'
dn = 'cn=vmail,dc=a,dc=io'
pw = 'f70c8f378fa49c3684b84637d790da37'

conn = ldap.ldapobject.ReconnectLDAPObject(uri)
conn.bind_s(dn, pw)
--

The error message is:

---
python2(92014) in free(): bogus pointer (double free?) 0x
Abort trap (core dumped) 
---

I'm not sure whether it's a py-ldap bug of OpenLDAP client library bug.
Can anyone help investigate this issue? Thank you very much. :)


CVS: cvs.openbsd.org: ports

2019-10-20 Thread Anthony J . Bentley
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2019/10/20 16:07:03

Modified files:
emulators/openmsx: Makefile distinfo 
emulators/openmsx/patches: patch-build_main_mk 
emulators/openmsx/pkg: PLIST 
Removed files:
emulators/openmsx/patches: patch-src_utils_DivModBySame_hh 

Log message:
Update to openmsx-0.15.0.

Release notes:
https://raw.githubusercontent.com/openMSX/openMSX/RELEASE_0_15_0/doc/release-notes.txt



Re: Firefox: unwanted network connections

2019-10-20 Thread Landry Breuil
On Sat, Oct 19, 2019 at 10:10:32AM -0700, Claus Assmann wrote:
> Can someone point in me in the right direction how to prevent firefox
> from making lots of unwanted network connections, e.g., to
> amazonaws.com
> cloudfront.net
> even if I didn't open any website yet?

There are probably other calls to various update systems, check urls for
app.update.url, media.gmp-manager.url,
extensions.systemAddon.update.url, all those in about:config.. or check
for all values containing 'https://' in there. Iirc snippets on the new
tab page, 'safebrowsing' (which calls google) and normandy/shield are
disabled by all-openbsd.js, but there might be more,
http://kb.mozillazine.org/About:config_entries is a good (up to date?)
resource about those.

Or check the interwebs for what tor browser (or other paranoid
derivates) disables ?

Landry



UPDATE: net/telegram-purple

2019-10-20 Thread Giovanni Bechis
Update to latest version, atm it is BROKEN-powerpc, can anybody try if it hash 
been fixed ?

 Giovanni
Index: Makefile
===
RCS file: /cvs/ports/net/telegram-purple/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:48:50 -  1.6
+++ Makefile20 Oct 2019 13:47:39 -
@@ -2,8 +2,7 @@
 
 BROKEN-powerpc =   assertion "get_int () == TLS_SCHEMA_V2" failed: file 
"generate.c", line 2831, function "parse_tlo_file"
 
-V =1.3.1
-REVISION = 2
+V =1.4.2
 COMMENT =  Telegram support for Pidgin
 DISTNAME = telegram-purple_$V.orig
 PKGNAME =  telegram-purple-$V
@@ -12,7 +11,7 @@ CATEGORIES =  net
 # GPLv2+
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += gcrypt glib-2.0 intl purple webp z
+WANTLIB += gcrypt glib-2.0 intl png purple webp z
 
 MASTER_SITES = https://github.com/majn/telegram-purple/releases/download/v$V/
 
Index: distinfo
===
RCS file: /cvs/ports/net/telegram-purple/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo24 Jun 2017 00:20:17 -  1.1.1.1
+++ distinfo20 Oct 2019 13:47:39 -
@@ -1,2 +1,2 @@
-SHA256 (telegram-purple_1.3.1.orig.tar.gz) = 
hpYnwitP1WyH1V0FQ1NTnzi4rhaSoBEebmaCr+ZUd9c=
-SIZE (telegram-purple_1.3.1.orig.tar.gz) = 509083
+SHA256 (telegram-purple_1.4.2.orig.tar.gz) = 
vpkLXKwlzNpPuMBFotQjKW9K8Vhz9mwpk/uazz0eSWI=
+SIZE (telegram-purple_1.4.2.orig.tar.gz) = 484790
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/telegram-purple/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in   24 Jun 2017 00:20:17 -  1.1.1.1
+++ patches/patch-Makefile_in   20 Oct 2019 13:47:39 -
@@ -3,18 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -22,8 +22,8 @@ datarootdir=@datarootdir@
- localedir=@localedir@
- gettext_package=@GETTEXT_PACKAGE@
- 
--CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS 
-DLOCALEDIR='"$(localedir)"' -Wall -Wextra -Wno-deprecated-declarations 
-Wno-unused-parameter -I${srcdir} -I. -fno-strict-aliasing -fPIC 
-D_FORTIFY_SOURCE=2
--LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic -ggdb
-+CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS 
-DLOCALEDIR='"$(localedir)"' -I${srcdir} -I. -fno-strict-aliasing -fPIC
-+LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic
- DIR_PERM=0755
- FILE_PERM=0644
- 
-@@ -81,7 +81,7 @@ tgl/Makefile.in:
+@@ -116,7 +116,7 @@ tgl/Makefile.in:
@echo "tgl/Makefile.in not found. Maybe you need to 'git submodule 
update --init --recursive' ?" && exit 1
  
  tgl/Makefile: tgl/Makefile.in Makefile
Index: patches/patch-tgl_Makefile_in
===
RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tgl_Makefile_in
--- patches/patch-tgl_Makefile_in   24 Jun 2017 00:20:17 -  1.1.1.1
+++ patches/patch-tgl_Makefile_in   20 Oct 2019 13:47:39 -
@@ -7,8 +7,8 @@ Index: tgl/Makefile.in
  LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@
  CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
  DEFS=@DEFS@
--COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Werror 
-Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb 
-Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
-+COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -fno-strict-aliasing 
-fno-omit-frame-pointer -fPIC
+-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra 
-Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb 
-Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
++COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra 
-Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer 
-Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
  
  EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@
 -LOCAL_LDFLAGS=-rdynamic -ggdb ${EXTRA_LIBS}
Index: patches/patch-tgl_configure
===
RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tgl_configure
--- patches/patch-tgl_configure 4 Sep 2018 10:01:05 -   1.1
+++ patches/patch-tgl_configure 20 Oct 2019 13:47:39 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-tgl_configure,v 1.1 2018
 Index: tgl/configure
 --- tgl/configure.orig
 +++ tgl/configure
-@@ -4188,19 +4188,8 @@ fi
+@@ -4281,19 +4281,8 @@ fi
  
  done
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/telegram-purple/pkg/PLIST,v

[PATCH] net/obfs4proxy: update 0.0.7 to 0.0.11

2019-10-20 Thread Vinícius Zavam
this port's update depends on changes made to the Go module (lang/go). if
it's not "elegant" to use many MASTER_SITE vars, one could create the
missing ports (dependencies).

files' names say what each patch does :-)

PS: for the lazy ones (like me):
https://github.com/egypcio/openbsd-ports/commits/obfs4proxy-0.0.11


-- 
Vinícius Zavam
keybase.io/egypcio
Index: lang/go/go.port.mk
===
RCS file: /cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.26
diff -u -p -u -a -r1.26 go.port.mk
--- lang/go/go.port.mk  6 Oct 2019 15:37:15 -   1.26
+++ lang/go/go.port.mk  19 Oct 2019 20:18:14 -
@@ -56,7 +56,7 @@ TEST_TARGET ?=${ALL_TARGET}
 SEPARATE_BUILD ?=  Yes
 WRKSRC ?=  ${MODGO_WORKSPACE}/src/${ALL_TARGET}
 
-MODGO_SETUP_WORKSPACE =mkdir -p ${WRKSRC:H}; mv ${MODGO_SUBDIR} 
${WRKSRC};
+MODGO_SETUP_WORKSPACE ?=   mkdir -p ${WRKSRC:H}; mv ${MODGO_SUBDIR} 
${WRKSRC};
 
 CATEGORIES +=  lang/go
 
@@ -96,7 +96,10 @@ RUN_DEPENDS +=   ${MODGO_RUN_DEPENDS}
 MODGO_TEST_TARGET =${MODGO_TEST_CMD} ${TEST_TARGET}
 
 .if empty(CONFIGURE_STYLE)
+
+.  if !empty(MODGO_SETUP_WORKSPACE)
 MODGO_pre-configure += ${MODGO_SETUP_WORKSPACE}
+.  endif
 
 .  if !target(do-build)
 do-build:
@@ -112,4 +115,5 @@ do-install:
 do-test:
${MODGO_TEST_TARGET}
 .  endif
+
 .endif
Index: net/obfs4proxy/Makefile
===
RCS file: /cvs/ports/net/obfs4proxy/Makefile,v
retrieving revision 1.5
diff -u -p -u -a -r1.5 Makefile
--- net/obfs4proxy/Makefile 12 Jul 2019 20:48:34 -  1.5
+++ net/obfs4proxy/Makefile 19 Oct 2019 20:18:14 -
@@ -2,17 +2,23 @@
 
 COMMENT =  a look-like nothing obfuscation protocol for TCP
 
-DISTNAME = obfs4proxy-0.0.7
+DISTNAME = obfs4proxy-0.0.11
 
-REVISION = 2
+REVISION = 0
 
 MASTER_SITES = https://people.torproject.org/~yawning/releases/obfs4proxy/
-EXTRACT_SUFX = .tar.xz
+MASTER_SITES0 =https://gitlab.com/yawning/utls/-/archive/v0.0.11-1/
+MASTER_SITES1 = 
https://gitlab.com/yawning/bsaes/-/archive/${ALL_TARGET_BSAES_TAG}/
+MASTER_SITES2 = https://github.com/dsnet/compress/archive/
+   
+DISTFILES =obfs4proxy-0.0.11.tar.xz \
+   utls-v0.0.11-1.tar.gz:0 \
+   bsaes-${ALL_TARGET_BSAES_TAG}.tar.gz:1 \
+   ${ALL_TARGET_COMPRESS_T}.tar.gz:2   # dsnet/compress
 
 CATEGORIES =   net www
 
-HOMEPAGE = \
-https://gitweb.torproject.org/pluggable-transports/obfs4.git/tree/README.md
+HOMEPAGE = https://gitlab.com/yawning/obfs4/blob/master/README.md
 
 MAINTAINER =   Sean Levy 
 
@@ -22,22 +28,37 @@ PERMIT_PACKAGE =Yes
 WANTLIB += c pthread
 
 MODULES += lang/go
-ALL_TARGET_BASE =  git.torproject.org/pluggable-transports/obfs4.git
-WRKSRC =   ${MODGO_WORKSPACE}/src/${ALL_TARGET_BASE}
-ALL_TARGET =   ${ALL_TARGET_BASE}/obfs4proxy \
-   ${ALL_TARGET_BASE}/common/log \
-   ${ALL_TARGET_BASE}/common/socks5 \
-   ${ALL_TARGET_BASE}/transports \
-   ${ALL_TARGET_BASE}/transports/base
 
-BUILD_DEPENDS +=   net/go-net \
+ALL_TARGET =   gitlab.com/yawning/obfs4.git
+ALL_TARGET_BSAES = git.schwanenlied.me/yawning/bsaes.git
+ALL_TARGET_BSAES_TAG = 0a714cd429ec754482b4001e918db30cd2094405
+ALL_TARGET_COMPRESS =  github.com/dsnet/compress
+ALL_TARGET_COMPRESS_T =da652975a8eea9fa0735aba8056747a751db0bd3
+
+BUILD_DEPENDS +=   devel/go-goptlib \
+   devel/go-sys \
+   net/go-net \
security/go-crypto \
security/go-ed25519 \
security/go-siphash \
-   devel/go-goptlib
+   textproc/go-text
 
-post-install:
-   ${INSTALL_MAN} ${WRKSRC}/doc/obfs4proxy.1 \
-   ${PREFIX}/man/man1/obfs4proxy.1
+MODGO_SUBDIR = ${WRKDIR}
+MODGO_WORKSPACE =  ${WRKDIR}
+MODGO_GOPATH = ${WRKDIR}:${MODGO_PACKAGE_PATH}
+
+MODGO_SETUP_WORKSPACE = mkdir -p ${WRKSRC:H} ; \
+   mkdir -p ${WRKDIR}/src/${ALL_TARGET_BSAES:H} ; \
+   mkdir -p ${WRKDIR}/src/${ALL_TARGET_COMPRESS:H} ; \
+   ln -sf ${WRKDIR}/bsaes-${ALL_TARGET_BSAES_TAG} 
${WRKDIR}/src/${ALL_TARGET_BSAES} ; \
+   ln -sf ${WRKDIR}/bsaes-${ALL_TARGET_BSAES_TAG} ${WRKSRC:H}/bsaes.git ; \
+   ln -sf ${WRKDIR}/compress-${ALL_TARGET_COMPRESS_T} 
${WRKDIR}/src/${ALL_TARGET_COMPRESS} ; \
+   ln -sf ${WRKDIR}/utls-v0.0.11-1 ${WRKSRC:H}/utls.git ; \
+   ln -sf ${WRKDIR} ${WRKSRC} 
+
+do-build:
+   cd ${WRKSRC} ; \
+   ${MODGO_CMD} build ${MODGO_FLAGS} \
+   -o ${WRKDIR}/bin/obfs4proxy ./obfs4proxy
 
 .include 
Index: net/obfs4proxy/distinfo

[UPDATE] Python 2.7.17

2019-10-20 Thread Remi Pointel

Hi,

this is the diff to update Python to 2.7.17.

We need to modify the Makefile.inc to add ${LOCALBASE}/lib/ because it 
does not find libintl.


-MAKE_FLAGS +=  LDFLAGS='-L${WRKSRC}'
+MAKE_FLAGS +=  LDFLAGS='-L${WRKSRC} -L${LOCALBASE}/lib/'

Ok?

Cheers,

Remi.
--- Makefile.inc.orig   Wed Oct 16 12:00:19 2019
+++ Makefile.incSun Oct 20 12:23:28 2019
@@ -124,7 +124,7 @@
LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 MAKE_ENV +=LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 MAKE_FLAGS +=  LD_LIBRARY_PATH=${WRKSRC} PATH="${WRKDIST}:${PORTPATH}"
-MAKE_FLAGS +=  LDFLAGS='-L${WRKSRC}'
+MAKE_FLAGS +=  LDFLAGS='-L${WRKSRC} -L${LOCALBASE}/lib/'
 FAKE_FLAGS +=  RANLIB=:
 
 # Python itself is clean, but some extensions e.g. py-cryptography
Index: Makefile
===
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 Makefile
--- Makefile	20 May 2019 22:15:15 -	1.62
+++ Makefile	20 Oct 2019 11:46:23 -
@@ -6,12 +6,9 @@
 # Python itself.
 
 VERSION =		2.7
-PATCHLEVEL =		.16
+PATCHLEVEL =		.17
 SHARED_LIBS =		python2.7 0.0
 VERSION_SPEC =		>=2.7,<2.8
-
-REVISION-main =		1
-REVISION-tools =	0
 
 CONFIGURE_ARGS += --with-ensurepip=no
 
Index: distinfo
===
RCS file: /cvs/ports/lang/python/2.7/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- distinfo	3 Apr 2019 05:23:40 -	1.16
+++ distinfo	20 Oct 2019 11:46:23 -
@@ -1,2 +1,2 @@
-SHA256 (Python-2.7.16.tgz) = AdqBOjYAh28D9G2xHMXECBdemfA68rqULvMkOJqDutU=
-SIZE (Python-2.7.16.tgz) = 17431748
+SHA256 (Python-2.7.17.tgz) = 8iBZ0JzfliXgpyhNJKEwYgRPW/Wdk6fzOCGQ36lM7N4=
+SIZE (Python-2.7.17.tgz) = 17535962
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 PLIST-main
--- pkg/PLIST-main	3 Apr 2019 05:23:40 -	1.23
+++ pkg/PLIST-main	20 Oct 2019 11:46:23 -
@@ -713,6 +713,7 @@ lib/python2.7/distutils/tests/Setup.samp
 lib/python2.7/distutils/tests/__init__.py
 lib/python2.7/distutils/tests/__init__.pyc
 lib/python2.7/distutils/tests/__init__.pyo
+lib/python2.7/distutils/tests/includetest.rst
 lib/python2.7/distutils/tests/setuptools_build_ext.py
 lib/python2.7/distutils/tests/setuptools_build_ext.pyc
 lib/python2.7/distutils/tests/setuptools_build_ext.pyo
@@ -1376,8 +1377,8 @@ lib/python2.7/ensurepip/__main__.py
 lib/python2.7/ensurepip/__main__.pyc
 lib/python2.7/ensurepip/__main__.pyo
 lib/python2.7/ensurepip/_bundled/
-lib/python2.7/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whl
-lib/python2.7/ensurepip/_bundled/setuptools-40.6.2-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl
 lib/python2.7/ensurepip/_uninstall.py
 lib/python2.7/ensurepip/_uninstall.pyc
 lib/python2.7/ensurepip/_uninstall.pyo
@@ -1551,7 +1552,7 @@ lib/python2.7/keyword.py
 lib/python2.7/keyword.pyc
 lib/python2.7/keyword.pyo
 lib/python2.7/lib-dynload/
-lib/python2.7/lib-dynload/Python-2.7.16-py2.7.egg-info
+lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info
 lib/python2.7/lib-dynload/_bisect.so
 lib/python2.7/lib-dynload/_codecs_cn.so
 lib/python2.7/lib-dynload/_codecs_hk.so
@@ -1614,9 +1615,9 @@ lib/python2.7/lib-dynload/unicodedata.so
 lib/python2.7/lib-dynload/zlib.so
 lib/python2.7/lib2to3/
 lib/python2.7/lib2to3/Grammar.txt
-lib/python2.7/lib2to3/Grammar2.7.16.final.0.pickle
+lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle
 lib/python2.7/lib2to3/PatternGrammar.txt
-lib/python2.7/lib2to3/PatternGrammar2.7.16.final.0.pickle
+lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle
 lib/python2.7/lib2to3/__init__.py
 lib/python2.7/lib2to3/__init__.pyc
 lib/python2.7/lib2to3/__init__.pyo
Index: pkg/PLIST-tests
===
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-tests,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 PLIST-tests
--- pkg/PLIST-tests	3 Apr 2019 05:23:40 -	1.16
+++ pkg/PLIST-tests	20 Oct 2019 11:46:23 -
@@ -59,6 +59,7 @@ lib/python2.7/test/capath/5ed36f99.0
 lib/python2.7/test/capath/6e88d7b8.0
 lib/python2.7/test/capath/99d0fa06.0
 lib/python2.7/test/capath/ce7b8643.0
+lib/python2.7/test/capath/efa5f9c3.0
 lib/python2.7/test/cfgparser.1
 lib/python2.7/test/cjkencodings/
 lib/python2.7/test/cjkencodings/big5-utf8.txt


Re: [new] net/barrier 2.3.2

2019-10-20 Thread Erling Westenvik
On Wed, Oct 16, 2019 at 07:08:09PM -0600, Aaron Bieber wrote:
> This is a fork of synergy from the 1.9 code base. I have been using it for a
> while without issue. 

Thank you for this port. Compiles, installs and runs without issues on
my amd64 current. Unfortunately it turns out that Barrier does not
support 32 bit Windows and is not very likely ever going to:

https://github.com/debauchee/barrier/issues/92#issuecomment-402906369

Thus I cant test for actual connection to my 32 bit Windows 7 laptop and
is stuck with synergy(1) for now. A pity since I was hoping Barrier
would resolve the one annoying issue I have with Synergy - namely that
every second time the synergy client resumes, it won't take input from
the server mouse or keyboard and I have to use a connected phsyical
mouse to click "Switch User" to have input restored.

Regards,
Erling

> I don't use the gui app, but it starts up and lets me diddle various things.
> 
> Description:
>   Barrier is KVM software forked from Symless's synergy 1.9 codebase. Synergy
> was a commercialized reimplementation of the original CosmoSynergy written by
> Chris Schoeneman.
> 
> Cluesticks? OKs?
> 
> Latest version is here and attached:
>   https://github.com/jasperla/openbsd-wip/tree/master/net/barrier
> 
> Cheers,
> Aaron
> 
> -- 
> PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE



CVS: cvs.openbsd.org: ports

2019-10-20 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/10/20 04:57:14

Modified files:
security/clamav: Makefile 
security/clamav/pkg: clamd.rc 

Log message:
Increase daemon_timeout to 120s; loading signatures on startup takes an
insane amount of time...

ok sthen@ (maintainer)



Re: UPDATE: TeX Live 2019

2019-10-20 Thread Edd Barrett
On Sun, Oct 20, 2019 at 10:35:05AM +0100, Edd Barrett wrote:
> Attached is a mega-diff to update TeX Live.

Forgot to say: I've tested this with a partial bulk on yesterday's
snapshot. No issues.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



CVS: cvs.openbsd.org: ports

2019-10-20 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/10/20 02:03:05

Modified files:
games/oolite   : Makefile 
net/openvpn-auth-ldap: Makefile 
www/sogo   : Makefile 
www/sope   : Makefile 
x11/gnustep: gnustep.port.mk 
x11/gnustep/aclock: Makefile 
x11/gnustep/addresses: Makefile 
x11/gnustep/affiche: Makefile 
x11/gnustep/back: Makefile 
x11/gnustep/base: Makefile 
x11/gnustep/batmon: Makefile 
x11/gnustep/camera: Makefile 
x11/gnustep/camerakit: Makefile 
x11/gnustep/cdplayer: Makefile 
x11/gnustep/corebase: Makefile 
x11/gnustep/cynthiune: Makefile 
x11/gnustep/databasin: Makefile 
x11/gnustep/databasinkit: Makefile 
x11/gnustep/dbuskit: Makefile 
x11/gnustep/displaycalibrator: Makefile 
x11/gnustep/edenmath: Makefile 
x11/gnustep/examples: Makefile 
x11/gnustep/fisicalab: Makefile 
x11/gnustep/ftp: Makefile 
x11/gnustep/gemas: Makefile 
x11/gnustep/gmastermind: Makefile 
x11/gnustep/gmines: Makefile 
x11/gnustep/gnumail: Makefile 
x11/gnustep/gomoku: Makefile 
x11/gnustep/gorm: Makefile 
x11/gnustep/graphos: Makefile 
x11/gnustep/grr: Makefile 
x11/gnustep/gshisen: Makefile 
x11/gnustep/gspdf: Makefile 
x11/gnustep/gui: Makefile 
x11/gnustep/gworkspace: Makefile 
x11/gnustep/highlighterkit: Makefile 
x11/gnustep/imageviewer: Makefile 
x11/gnustep/impersonatortoolkit: Makefile 
x11/gnustep/jigsaw: Makefile 
x11/gnustep/lapispuzzle: Makefile 
x11/gnustep/laternamagica: Makefile 
x11/gnustep/libobjc2: Makefile 
x11/gnustep/make: Makefile 
x11/gnustep/matharray: Makefile 
x11/gnustep/mpdcon: Makefile 
x11/gnustep/neos-theme: Makefile 
x11/gnustep/netclasses: Makefile 
x11/gnustep/paje: Makefile 
x11/gnustep/pantomime: Makefile 
x11/gnustep/pcapkit: Makefile 
x11/gnustep/pdfkit: Makefile 
x11/gnustep/performance: Makefile 
x11/gnustep/price: Makefile 
x11/gnustep/projectcenter: Makefile 
x11/gnustep/remotedesk: Makefile 
x11/gnustep/renaissance: Makefile 
x11/gnustep/rsskit: Makefile 
x11/gnustep/silver-theme: Makefile 
x11/gnustep/simpleagenda: Makefile 
x11/gnustep/sqlclient: Makefile 
x11/gnustep/sudoku: Makefile 
x11/gnustep/systempreferences: Makefile 
x11/gnustep/terminal: Makefile 
x11/gnustep/timemon: Makefile 
x11/gnustep/webserver: Makefile 
x11/gnustep/webservices: Makefile 
x11/gnustep/zipper: Makefile 

Log message:
Revert previous and add ICU support back now that the port has been fixed.

tested in a bulk



CVS: cvs.openbsd.org: ports

2019-10-20 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2019/10/20 00:53:26

Modified files:
devel/pycharm  : Makefile 
devel/pycharm/pkg: PLIST 

Log message:
tweak do-install target

The jbr directory contains a JDK for Linux, so it has to be deleted.
In addition clean up some delete operations.

Diff from Caspar Schutijser, Thnaks!