Re: [NEW] textproc/xsv-0.13

2018-12-14 Thread Charles A Daniels
Updated version with noted issue addressed attached.

> It is already partially automated, see port-modules(5) about the
> make targets added by the devel/cargo module (and see the module
> itself, devel/cargo/cargo.port.mk, for more comments and how it
> works).

>This module adds three make(1) targets:
> ...

I am once again burned by not RTFM before beginning the work... these
would have saved a lot of time. Thanks for the breadcrumbs!

> quick comments on Makefile - missing "# $OpenBSD$" at the top, and
> 
> : COMMENT =   A fast CSV command line toolkit written in Rust.

Sorry, I thought this was added by CVS automatically... I guess it has
to already have one there to start with? git was my first (and only)
version tracker, so  I'm not super on on CVS conventions. Or maybe this
is unrelated to CVS and I'm misunderstanding?

> in common with other ports, skip the indefinite article and trailing
> full stop, and the language isn't really relevant for something that
> isn't
> a library/module - usual style would be more like e.g. "fast CSV
> command-line toolkit".

Fixed.

> (also there is a stray blank line at EOF in pkg/DESCR).

Fixed.

Would it be constructive to have portcheck check for this? If so, I can
add that to my backburner.

> Someone more familiar with rust porting probably knows more but IIRC
> the
> WANTLIB in ripgrep is to slightly reduce the risk of missing packages
> getting updated after a change in base, probably worth having, but
> manual bumps are often needed anyway.

I would definitely welcome some oversight from someone who knows
Rust/Rust porting. I don't personally know Rust (though I intend to
learn it). I realize this is rather suboptimal for writing ports, but
I'm hoping if I can at least get things 95% of the way there, it will
save the people who are more knowledgeable a lot of time and we can get
more software ported overall.

~ Charles



xsv.tgz
Description: application/compressed-tar


Re: LLVM 6.0.1p8 fails to compile on 6.4-stable/loongson

2018-12-14 Thread Xiyue Deng

Xiyue Deng writes:

> Brian Callahan writes:
>
>> On 12/12/18 2:51 AM, Xiyue Deng wrote:
>>> Jeremie Courreges-Anglas writes:
>>>
 On Mon, Dec 10 2018, Xiyue Deng  wrote:

 [...]

> Sounds great!  It will be great to have it backported to -stable as
> well.
 "will"

 Please keep in mind that development happens on -current.  Backporting
 diffs from -current to -stable is not always straightforward.

 If you 6.4 users want a backport then why not Do It Yourself?  :)
>>> Well, this attempt failed with an ICE.  The build log is attached.  I
>>> wonder whether it is because of "out of memory".  I did have a 5G swap
>>> besides the 1G memory though (with infinity settings in /etc/logins.conf).
>>>
>>
>> If you're just looking to use clang and clang++ on loongson, you might
>> be better off installing -current, which now includes /usr/bin/clang and
>> /usr/bin/clang++ (and /usr/bin/ld.lld, though I haven't found it to be
>> very useful atm). It'll be much faster than having to debug g++ problems
>> and then actually build llvm.
>>
>> ~Brian
>
> Thanks Brian, though I'd still like to stay at -stable because as I can
> tell the snapshot packages for loongson are actually for -release.  BTW,
> should they also be copied to 6.4/packages as well?
>
> Also, as you mentioned, /usr/bin/clang{,++} are available on loongson
> -current, does that mean that loongson has also migrated to clang in
> 6.5?  (If so that's fantastic news! :)

Hi, just to report back LLVM is finally built successfully using the
ports from -current (and it took 3 days to finish.)  So I guess I got
lucky to have avoided the OOM issue.

-- 
manphiz


signature.asc
Description: PGP signature


Re: powerpc bulk build report

2018-12-14 Thread Charlene Wendling
Hi, 

Marc, i'm CC-ing you because there is a x11/xglobe diff with "surprising"
results (at the bottom). 

Here is another round of macppc fixes that should also help for other gcc4
archs. 


> http://build-failures.rhaalovely.net//powerpc/2018-12-01/net/xprobe.log

Yet another one with missing includes. Build [1] and runtime is ok.
But honestly OS signatures are super old ;) It doesn't break on amd64.

[1] http://ix.io/1vZJ


Index: Makefile
===
RCS file: /cvs/ports/net/xprobe/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile24 Oct 2018 14:28:09 -  1.23
+++ Makefile14 Dec 2018 17:45:07 -
@@ -3,7 +3,7 @@
 COMMENT=   ICMP active OS fingerprint scanner
 
 DISTNAME=  xprobe2-0.3
-REVISION = 3
+REVISION = 4
 CATEGORIES=net security
 
 HOMEPAGE=  http://xprobe.sourceforge.net/
Index: patches/patch-libs-external_USI++_src_ip_cc
===
RCS file: patches/patch-libs-external_USI++_src_ip_cc
diff -N patches/patch-libs-external_USI++_src_ip_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libs-external_USI++_src_ip_cc 14 Dec 2018 17:45:07 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+ip.cc:34:19: error: 'srand' was not declared in this scope with ports-gcc
+Index: libs-external/USI++/src/ip.cc
+--- libs-external/USI++/src/ip.cc.orig
 libs-external/USI++/src/ip.cc
+@@ -16,6 +16,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
Index: patches/patch-libs-external_USI++_usi++_tcp_h
===
RCS file: patches/patch-libs-external_USI++_usi++_tcp_h
diff -N patches/patch-libs-external_USI++_usi++_tcp_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libs-external_USI++_usi++_tcp_h   14 Dec 2018 17:45:07 
-
@@ -0,0 +1,13 @@
+$OpenBSD$
+usi++/tcp.h:175:47: 'memset' was not declared in this scope with ports-gcc
+Index: libs-external/USI++/usi++/tcp.h
+--- libs-external/USI++/usi++/tcp.h.orig
 libs-external/USI++/usi++/tcp.h
+@@ -12,6 +12,7 @@
+ #ifndef _TCP_H_
+ #define _TCP_H_
+ 
++#include 
+ #include "usi-structs.h"
+ #include "datalink.h"
+ #include "ip.h"


> http://build-failures.rhaalovely.net//powerpc/2018-12-01/productivity/devtodo.log

A single missing include. Build is fine [2], and so is runtime [3].
Doesn't break the amd64 build.

[2] http://ix.io/1w03
[3] https://bsd.network/web/statuses/101241080087100263

Index: Makefile
===
RCS file: /cvs/ports/productivity/devtodo/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- Makefile24 Oct 2018 14:28:10 -  1.28
+++ Makefile14 Dec 2018 19:39:36 -
@@ -3,7 +3,7 @@
 COMMENT=   reminder/task program aimed at developers
 
 DISTNAME=  devtodo-0.1.20
-REVISION = 4
+REVISION = 5
 CATEGORIES=productivity devel
 
 HOMEPAGE=  http://swapoff.org/devtodo1.html
Index: patches/patch-src_todoterm_cc
===
RCS file: patches/patch-src_todoterm_cc
diff -N patches/patch-src_todoterm_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_todoterm_cc   14 Dec 2018 19:39:36 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+fix for ports-gcc-4.9
+todoterm.cc:18:38: error: 'getenv' was not declared in this scope
+Index: src/todoterm.cc
+--- src/todoterm.cc.orig
 src/todoterm.cc
+@@ -7,6 +7,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ static char info[2048];
+ static bool term_initialized;


> http://build-failures.rhaalovely.net//powerpc/2018-12-01/x11/xglobe%2Cno_map.log

Once again a missing include. I built the standard [4] and no_map [5]
flavors without issues. Runtime works as expected [6]. 

For some reason an old patch is present in the diff, to me it looks like
the diff(1) algo probably changed meanwhile and it's reflecting that? 

[4] http://ix.io/1w1A
[5] http://ix.io/1w1M
[6] https://bsd.network/@julianaito/101242469086735925


Index: Makefile
===
RCS file: /cvs/ports/x11/xglobe/Makefile,v
retrieving revision 1.77
diff -u -p -u -p -r1.77 Makefile
--- Makefile24 Oct 2018 14:28:14 -  1.77
+++ Makefile15 Dec 2018 00:25:47 -
@@ -9,7 +9,7 @@ HOMEPAGE=   http://www.shaderwrangler.com/
 MASTER_SITES=  https://distfiles.nl/
 DISTNAME=  xglobe-0.5p2
 PKGNAME=   xglobe-0.5
-REVISION=  43
+REVISION=  44
 
 MAINTAINER=Marc Espie 
 
Index: patches/patch-desktopwidget_cpp
===
RCS file: patches/patch-desktopwidget_cpp
diff -N patches/patch-desktopwidget_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patche

Re: [NEW] textproc/xsv-0.13

2018-12-14 Thread Stuart Henderson
On 2018/12/14 17:53, Charles A Daniels wrote:
> As a short aside, enumerating all the dependencies was a massive pain.
> Has there been any work done on at least partially automating generation
> of Cargo ports?

It is already partially automated, see port-modules(5) about the
make targets added by the devel/cargo module (and see the module
itself, devel/cargo/cargo.port.mk, for more comments and how it
works).

quick comments on Makefile - missing "# $OpenBSD$" at the top, and

: COMMENT = A fast CSV command line toolkit written in Rust.

in common with other ports, skip the indefinite article and trailing
full stop, and the language isn't really relevant for something that isn't
a library/module - usual style would be more like e.g. "fast CSV
command-line toolkit".

(also there is a stray blank line at EOF in pkg/DESCR).

Someone more familiar with rust porting probably knows more but IIRC the
WANTLIB in ripgrep is to slightly reduce the risk of missing packages
getting updated after a change in base, probably worth having, but
manual bumps are often needed anyway.

(go and rust's attempts to provide "static" binaries are only really
valid on OS which have a fossilized ABI..)



[NEW] textproc/xsv-0.13

2018-12-14 Thread Charles A Daniels
Hi all,

Using textproc/ripgrep as a starting point, I've written a port for the
very excellent xsv tool by the same author as ripgrep.

Everything seems to work as expected and all tests pass -- I feel this
is ready pending feedback from the list.

As a short aside, enumerating all the dependencies was a massive pain.
Has there been any work done on at least partially automating generation
of Cargo ports? If not, would there be interest? I think I could hack
something that would at least do most of the heavy lifting (i.e.
generate a preliminary port for a human to review, tweak, then send on
to the list). Considering how many great tools are available implemented
in rust, this could open the door to all the sweet oxidized goodness to
be had on crates.io (some other Rust packages I'm planning to work on
over the winter holiday include tokei, tin-summer, and fd-find). 

~ Charles


xsv.tgz
Description: application/compressed-tar


Re: NEW net/traccar

2018-12-14 Thread Renaud Allard



On 14/12/2018 23:39, Stuart Henderson wrote:

On 2018/12/14 23:17, Renaud Allard wrote:



On 14/12/2018 19:05, Landry Breuil wrote:




: -@newuser _traccar:824:_traccar:daemon:Traccar 
user:${PREFIX}/share/traccar/:/sbin/nologin
: +@newuser _traccar:824:_traccar:daemon:Traccar 
user:${PREFIX}/share/traccar:/sbin/nologin


Is this $HOME necessary so that it finds its assets or var/empty would
be better ? minimal testing here seems to show its fine with /var/empty
but if there are valid reasons for it..



Let's say, commit it like this and I will test on prod for some time with
/var/empty and if it works fine, I will submit a patch before the 6.5 freeze
to "correct" this.



once it's installed on somebody's machine, the /etc/passwd line isn't going
to get changed even if it's updated in the package, so better get it right
the first time.



I have been testing it for a few hours only, but it seems right to 
change it to /var/empty. To be honest, I would have expected it to crash 
from the start if this was wrong. I don't really see any reason for it 
to not work with /var/empty as the config files were already tweaked for it.




smime.p7s
Description: S/MIME Cryptographic Signature


SECURITY UPDATE: devel/jenkins-2.150.1/2.155 (fixes multiple CVEs)

2018-12-14 Thread Edward Lopez-Acosta
Version update for multiple security issues including one marked as 
critical.


I was not sure how to update quirks so that is not included in this 
diff. If someone is willing to teach me what to do I can add that in, or 
review changes to quirks after this is merged.


Builds, installs, and runs fine on amd64. No special upgrade steps when 
upgrading from 2.138.3 currently in the tree.


- MAINTAINER CC'ed
- No tests present
- No change to required libs or current PLIST
- Nothing relies on this
- Self tested some projects and did not run into issues
- Diff applies fine with `patch`

CHANGELOG:
https://jenkins.io/changelog-stable/

https://jenkins.io/security/advisory/2018-12-05/

 Severity

SECURITY-595: critical
SECURITY-904: medium
SECURITY-1072: medium
SECURITY-1193: medium

Affected Versions

Jenkins weekly up to and including 2.153
Jenkins LTS up to and including 2.138.3

Fix

Jenkins weekly should be updated to version 2.154
Jenkins LTS should be updated to version either 2.138.4 or 2.150.1

--
Edward Lopez-Acosta
diff --git devel/Makefile devel/Makefile
index 26817c51381..03fb8174712 100644
--- devel/Makefile
+++ devel/Makefile
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile,v 1.31 2018/11/29 14:10:10 rsadowski Exp $
 
-VERSION =	2.152
+VERSION =	2.155
 MASTER_SITES =	http://mirrors.jenkins-ci.org/war/${VERSION}/
 DIST_SUBDIR =	jenkins-devel
 
diff --git devel/distinfo devel/distinfo
index e5c0c28e049..a8b70855619 100644
--- devel/distinfo
+++ devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jenkins/2.152/jenkins.war) = jde/3OIrMtlBsnJ5qFeVQoGxfJu4d02G6H6c1A4UQMM=
-SIZE (jenkins/2.152/jenkins.war) = 75939426
+SHA256 (jenkins/2.155/jenkins.war) = A0xtY7Vb+TjF0btTJ3XZqhj7NL1lqtTj6WgyWXi+hrg=
+SIZE (jenkins/2.155/jenkins.war) = 76037370
diff --git stable/Makefile stable/Makefile
index db693c9e5dd..ba2cdfff6fa 100644
--- stable/Makefile
+++ stable/Makefile
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile,v 1.30 2018/11/29 14:07:02 rsadowski Exp $
 
-VERSION =	2.138.3
+VERSION =	2.150.1
 MASTER_SITES =	http://mirrors.jenkins-ci.org/war-stable/${VERSION}/
 DIST_SUBDIR =	jenkins-stable
 
diff --git stable/distinfo stable/distinfo
index dc95ebe1334..77a061aea34 100644
--- stable/distinfo
+++ stable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jenkins/2.138.3/jenkins.war) = lT5N2i0wZShMABaz6CeeCX+DDBKLH3EthHgP8rB1Hn0=
-SIZE (jenkins/2.138.3/jenkins.war) = 75733340
+SHA256 (jenkins/2.150.1/jenkins.war) = ejhYbVo6GoNJiAmoNxVyi7LwG1in3TqINm8Hbv2vZmk=
+SIZE (jenkins/2.150.1/jenkins.war) = 75938045


Re: NEW net/traccar

2018-12-14 Thread Stuart Henderson
On 2018/12/14 23:17, Renaud Allard wrote:
> 
> 
> On 14/12/2018 19:05, Landry Breuil wrote:
> 
> > 
> > > : -@newuser _traccar:824:_traccar:daemon:Traccar 
> > > user:${PREFIX}/share/traccar/:/sbin/nologin
> > > : +@newuser _traccar:824:_traccar:daemon:Traccar 
> > > user:${PREFIX}/share/traccar:/sbin/nologin
> > 
> > Is this $HOME necessary so that it finds its assets or var/empty would
> > be better ? minimal testing here seems to show its fine with /var/empty
> > but if there are valid reasons for it..
> > 
> 
> Let's say, commit it like this and I will test on prod for some time with
> /var/empty and if it works fine, I will submit a patch before the 6.5 freeze
> to "correct" this.
> 

once it's installed on somebody's machine, the /etc/passwd line isn't going
to get changed even if it's updated in the package, so better get it right
the first time.



Re: NEW net/traccar

2018-12-14 Thread Renaud Allard



On 14/12/2018 19:05, Landry Breuil wrote:




: -@newuser _traccar:824:_traccar:daemon:Traccar 
user:${PREFIX}/share/traccar/:/sbin/nologin
: +@newuser _traccar:824:_traccar:daemon:Traccar 
user:${PREFIX}/share/traccar:/sbin/nologin


Is this $HOME necessary so that it finds its assets or var/empty would
be better ? minimal testing here seems to show its fine with /var/empty
but if there are valid reasons for it..



Let's say, commit it like this and I will test on prod for some time 
with /var/empty and if it works fine, I will submit a patch before the 
6.5 freeze to "correct" this.




smime.p7s
Description: S/MIME Cryptographic Signature


update git to 2.20.0

2018-12-14 Thread Klemens Nanni
Lots of changes:
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.20.0.txt

nghttp2 is needed for git-remote-https.

Tested on amd64.

On update-patches, don't worry about the new patch-t_t4256_1_mailinfo_c
as upstream simply left an .orig file in their tarball.

OK?

Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.195
diff -u -p -r1.195 Makefile
--- Makefile25 Nov 2018 12:41:35 -  1.195
+++ Makefile14 Dec 2018 14:37:41 -
@@ -4,7 +4,7 @@ COMMENT-main =  GIT - Tree History Storag
 COMMENT-svn =  GIT - subversion interoperability tools
 COMMENT-x11 =  GIT - graphical tools
 
-V =2.19.2
+V =2.20.0
 DISTNAME = git-${V}
 PKGNAME-main = ${DISTNAME}
 PKGNAME-svn =  git-svn-${V}
@@ -39,13 +39,14 @@ BUILD_DEPENDS = devel/gettext-tools \
 
 MULTI_PACKAGES =   -main -svn -x11
 
-WANTLIB-main = c crypto curl expat iconv intl pthread ssl z
+WANTLIB-main = c crypto curl expat iconv intl nghttp2 pthread ssl z
 
 RUN_DEPENDS-main = devel/cvsps \
devel/p5-Error \
net/rsync
 LIB_DEPENDS-main = devel/gettext \
-   net/curl
+   net/curl \
+   www/nghttp2
 
 RUN_DEPENDS-svn =  ${BASE_PKGPATH} \
devel/subversion,-perl \
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.148
diff -u -p -r1.148 distinfo
--- distinfo25 Nov 2018 12:41:35 -  1.148
+++ distinfo14 Dec 2018 10:04:07 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.19.2.tar.gz) = 24k61pyayUmLCWd8WDl4frous7fvK8ML+6fmLnfPeFA=
-SHA256 (git-manpages-2.19.2.tar.gz) = 
YDNOzVnuEDGa9KeBUXTRCZHRr6us07MSnVifA4vyVUI=
-SIZE (git-2.19.2.tar.gz) = 7720555
-SIZE (git-manpages-2.19.2.tar.gz) = 702847
+SHA256 (git-2.20.0.tar.gz) = YHb2+Ds8nBKKGxxZh9TCAnMcDMnIT7KV0637B27s2TE=
+SHA256 (git-manpages-2.20.0.tar.gz) = 
gcLmCF3qGyy36l7uOEWJSY3UxEL7xNBWdATPE6d7MMs=
+SIZE (git-2.20.0.tar.gz) = 7961711
+SIZE (git-manpages-2.20.0.tar.gz) = 713955
Index: patches/patch-t_t1450-fsck_sh
===
RCS file: /cvs/ports/devel/git/patches/patch-t_t1450-fsck_sh,v
retrieving revision 1.6
diff -u -p -r1.6 patch-t_t1450-fsck_sh
--- patches/patch-t_t1450-fsck_sh   13 Sep 2018 05:59:22 -  1.6
+++ patches/patch-t_t1450-fsck_sh   14 Dec 2018 10:04:16 -
@@ -5,7 +5,7 @@ Avoid GNU grep syntax
 Index: t/t1450-fsck.sh
 --- t/t1450-fsck.sh.orig
 +++ t/t1450-fsck.sh
-@@ -594,7 +594,7 @@ test_expect_success 'fsck --name-objects' '
+@@ -629,7 +629,7 @@ test_expect_success 'fsck --name-objects' '
remove_object $(git rev-parse julius:caesar.t) &&
test_must_fail git fsck --name-objects >out &&
tree=$(git rev-parse --verify julius:) &&
Index: patches/patch-t_test-lib_sh
===
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.28
diff -u -p -r1.28 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 14 Jun 2018 17:43:48 -  1.28
+++ patches/patch-t_test-lib_sh 14 Dec 2018 10:04:13 -
@@ -6,9 +6,9 @@ wants it badly.
 Index: t/test-lib.sh
 --- t/test-lib.sh.orig
 +++ t/test-lib.sh
-@@ -61,6 +61,11 @@ fi
- . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
- export PERL_PATH SHELL_PATH
+@@ -71,6 +71,11 @@ then
+   exit 1
+ fi
  
 +if [ -n "${TEST_TAR}" ]; then
 +  TAR=${TEST_TAR}
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.85
diff -u -p -r1.85 PLIST-main
--- pkg/PLIST-main  13 Sep 2018 05:59:22 -  1.85
+++ pkg/PLIST-main  14 Dec 2018 10:35:08 -
@@ -80,6 +80,7 @@ libexec/git/git-filter-branch
 @bin libexec/git/git-init-db
 libexec/git/git-instaweb
 @bin libexec/git/git-interpret-trailers
+libexec/git/git-legacy-rebase
 @bin libexec/git/git-log
 @bin libexec/git/git-ls-files
 @bin libexec/git/git-ls-remote
@@ -101,6 +102,7 @@ libexec/git/git-mergetool
 libexec/git/git-mergetool--lib
 @bin libexec/git/git-mktag
 @bin libexec/git/git-mktree
+@bin libexec/git/git-multi-pack-index
 @bin libexec/git/git-mv
 @bin libexec/git/git-name-rev
 @bin libexec/git/git-notes
@@ -117,10 +119,10 @@ libexec/git/git-parse-remote
 libexec/git/git-quiltimport
 @bin libexec/git/git-range-diff
 @bin libexec/git/git-read-tree
-libexec/git/git-rebase
+@bin libexec/git/git-rebase
 libexec/git/git-rebase--am
-@bin libexec/git/git-rebase--helper
-libexec/git/git-rebase--interactive
+libexec/git/git-rebase--common
+@bin libexec/git/git-rebase--interactive
 libexec/git/git-rebase--merge
 libexec/git/git-rebase--preserve-merges
 @bin libexec/git/git-receive-pack
@@ -2

Re: powerpc bulk build report

2018-12-14 Thread Landry Breuil
On Thu, Dec 13, 2018 at 03:26:55AM +0100, Charlene Wendling wrote:
> 
> Sorry for the extra noise, but i managed to unbreak more of them. It 
> should do the job on other gcc4 arches as well. 
> 
> 
> > http://build-failures.rhaalovely.net//powerpc/2018-12-01/converters/lastools.log
> 
> 
> The log explains itself the issue, i added it, it builds [1] and
> runs fine. It doesn't break the build on amd64.

Fwiw i've put those 3 diffs in the macppc bulk that started now.



Re: install portslist?

2018-12-14 Thread Marc Espie
On Fri, Dec 14, 2018 at 05:40:20PM +0100, Marcus MERIGHI wrote:
> Hello, 
> 
> rsyk...@disroot.org (Rudolf Sykora), 2018.12.14 (Fri) 15:40 (CET):
> > odin$ pwd
> > /usr/ports
> > 
> > odin$ make search key=texmacs  
> > Please install portslist
> >  pkg_add portslist
> > *** Error 1 in /usr/ports (Makefile:80 '/usr/local/share/ports-INDEX': 
> > @exit 1)
> > 
> > odin$ doas pkg_add portslist
> > portslist-6.8: ok
> > odin$ make search key=texmacs 
> > Please install portslist
> 
> portslist does not bring back "make search key=" but gives you a flat
> text file:
> 
> $ pkg_info -L portslist
> $ less /usr/local/share/sqlports.list
> 
> Marcus

Nope, wrong answer.

Don't mix -current and 6.4-release.



Re: [UPDATE] www/hugo 0.51 -> 0.52

2018-12-14 Thread fredl

You are right :-) Thanks!
Attached is the new diff.

--
fredl

On 12/13/18 3:13 AM, Edward Lopez-Acosta wrote:

Should this have `NO_TEST = Yes` in the Makefile?

I checked on GitHub and there are no tests for Hugo and running `make 
test` results in the following:


/usr/ports/www/hugo $ make test
===>  Regression tests for hugo-0.52
/usr/bin/env -i GOCACHE=off 
GOPATH="/usr/ports/pobj/hugo-0.52/go:/usr/local/go-pkg" 
PATH="/usr/ports/pobj/hugo-0.52/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin" 
go test -v -p 1  github.com/gohugoio/hugo

?   github.com/gohugoio/hugo    [no test files]

Please let me know if I am missing something here.
Thank you,
Index: Makefile
===
RCS file: /cvs/ports/www/hugo/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile	15 Nov 2018 21:12:05 -	1.5
+++ Makefile	14 Dec 2018 18:26:25 -
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS =	${GO_ARCHS}
 
 COMMENT =	fast and flexible static site generator
 
-DISTNAME =	hugo-0.51
+DISTNAME =	hugo-0.52
 
 CATEGORIES =	www
 
@@ -19,6 +19,8 @@ WANTLIB +=	c pthread
 MASTER_SITES =	https://files.fairydust.space/
 
 MODULES =	lang/go
+
+NO_TEST =	Yes
 
 ALL_TARGET =	github.com/gohugoio/hugo
 
Index: distinfo
===
RCS file: /cvs/ports/www/hugo/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	15 Nov 2018 21:12:05 -	1.5
+++ distinfo	14 Dec 2018 18:26:25 -
@@ -1,2 +1,2 @@
-SHA256 (hugo-0.51.tar.gz) = 8A7FNK8uSsIkPOXF/s1ZG6SFiUzhQKxL3Dm78R+aQI4=
-SIZE (hugo-0.51.tar.gz) = 22613513
+SHA256 (hugo-0.52.tar.gz) = dkDphu/o7nQKQB0sgwC6yqTRJ5KkR4WIvEtGNPOR9NU=
+SIZE (hugo-0.52.tar.gz) = 22622962


Re: NEW net/traccar

2018-12-14 Thread Renaud Allard



On 14/12/2018 19:05, Landry Breuil wrote:


Here's a slightly cleaned up one. Comments inline, new tar.gz attached.


This version starts fine on 6.3 (yeah; i know) in a quick test,
proxyfied by nginx. Now i need to figure out this websocket stuff and
how to push some data to it.


For nginx in https mode:

location / {
proxy_pass http://127.0.0.1:8082/;
proxy_set_header Host $host;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_buffering off;
proxy_connect_timeout 4320;
proxy_send_timeout4320;
proxy_read_timeout4320;
proxy_redirect off;
proxy_set_header Proxy "";
proxy_cookie_path /api "/api; secure; HttpOnly"; 


}




the worrying thing: the java process listens on 169 tcp ports and 34 udp
ports. this feels crazy, so i'll have to look into upstream docs.



Ports are in default.xml. The problem (that has been extensively 
discussed with the main dev) is that it's not trivial to make overrides 
in traccar.xml to only listen on requested ports. But this may happen in 
a later version.
In fact there is one port for each protocol, and those may be be in tcp 
or udp depending on the device and its config. I firewall those I don't use.



: -@newuser _traccar:824:_traccar:daemon:Traccar 
user:${PREFIX}/share/traccar/:/sbin/nologin
: +@newuser _traccar:824:_traccar:daemon:Traccar 
user:${PREFIX}/share/traccar:/sbin/nologin


Is this $HOME necessary so that it finds its assets or var/empty would
be better ? minimal testing here seems to show its fine with /var/empty
but if there are valid reasons for it..


I have more or less hardcoded the assets in the patch for default.xml. I 
haven't tested it extensively with /var/empty, but it could indeed be 
changed.





smime.p7s
Description: S/MIME Cryptographic Signature


Re: NEW net/traccar

2018-12-14 Thread Landry Breuil
On Fri, Dec 14, 2018 at 05:19:29PM +, Stuart Henderson wrote:
> On 2018/12/14 16:43, Renaud Allard wrote:
> > 
> > 
> > On 12/14/18 4:38 PM, Renaud Allard wrote:
> > > 
> > > 
> > > On 12/14/18 3:52 PM, Landry Breuil wrote:
> > > > 
> > > > cp -r /usr/obj/ports/traccar-4.2/tracker-server.jar
> > > > /usr/obj/ports/traccar-4.2/fake-amd64/usr/local/share/traccar/
> > > > /usr/obj/ports/traccar-4.2/bin/install -d -m 755 /etc/traccar
> > > > install: /etc/traccar: Permission denied
> > > > 
> > > > not yet..  as other ports, use @sample for the dir and the file..
> > > > 
> > > 
> > > I tried to reproduce this error, but I got no luck in doing it. Fully
> > > new and freshly installed -current machine with a freshly downloaded
> > > ports.tar.gz and pkg_add unzip javaPathHelper jre.
> > > Can you tell me how you got this error?
> > > 
> > 
> > Does a trailing / helps?
> 
> Here's a slightly cleaned up one. Comments inline, new tar.gz attached.

This version starts fine on 6.3 (yeah; i know) in a quick test,
proxyfied by nginx. Now i need to figure out this websocket stuff and
how to push some data to it.

the worrying thing: the java process listens on 169 tcp ports and 34 udp
ports. this feels crazy, so i'll have to look into upstream docs.

> : -@newuser _traccar:824:_traccar:daemon:Traccar 
> user:${PREFIX}/share/traccar/:/sbin/nologin
> : +@newuser _traccar:824:_traccar:daemon:Traccar 
> user:${PREFIX}/share/traccar:/sbin/nologin

Is this $HOME necessary so that it finds its assets or var/empty would
be better ? minimal testing here seems to show its fine with /var/empty
but if there are valid reasons for it..

Landry



Re: NEW net/traccar

2018-12-14 Thread Renaud Allard



On 14/12/2018 18:19, Stuart Henderson wrote:



Here's a slightly cleaned up one. Comments inline, new tar.gz attached.



This one seems perfect to me.

I wasn't sure about the category, but indeed, it would probably fit 
better in geo.


The default.xml should indeed not be modified by the user. This is 
something a little bit on the edge, but anyway, if one need to modify 
it, he can modify the traccar.xml conf to reflect this. Because this 
file can and probably will change in almost every version.




smime.p7s
Description: S/MIME Cryptographic Signature


Re: NEW net/traccar

2018-12-14 Thread Stuart Henderson
On 2018/12/14 16:43, Renaud Allard wrote:
> 
> 
> On 12/14/18 4:38 PM, Renaud Allard wrote:
> > 
> > 
> > On 12/14/18 3:52 PM, Landry Breuil wrote:
> > > 
> > > cp -r /usr/obj/ports/traccar-4.2/tracker-server.jar
> > > /usr/obj/ports/traccar-4.2/fake-amd64/usr/local/share/traccar/
> > > /usr/obj/ports/traccar-4.2/bin/install -d -m 755 /etc/traccar
> > > install: /etc/traccar: Permission denied
> > > 
> > > not yet..  as other ports, use @sample for the dir and the file..
> > > 
> > 
> > I tried to reproduce this error, but I got no luck in doing it. Fully
> > new and freshly installed -current machine with a freshly downloaded
> > ports.tar.gz and pkg_add unzip javaPathHelper jre.
> > Can you tell me how you got this error?
> > 
> 
> Does a trailing / helps?

Here's a slightly cleaned up one. Comments inline, new tar.gz attached.

: diff --git Makefile Makefile
: index 6d667e3..d598d3b 100644
: --- Makefile
: +++ Makefile
: @@ -1,15 +1,13 @@
:  # $OpenBSD: Makefile,v 1.23 2018/12/13 12:46:19 renaud Exp $
:  
: -COMMENT =Modern GPS Tracking Platform
: -
: +COMMENT =modern GPS tracking platform

ports standard is to lowercase unless proper nouns.

:  V =  4.2
: -DISTNAME =   traccar-${V}
: +PKGNAME =traccar-${V}
: +DISTNAME =   traccar-other-${V}
:  EXTRACT_SUFX =   .zip
: -DISTFILES =  traccar-other-${V}${EXTRACT_SUFX}
:  WRKDIST =${WRKDIR}

tidy

: -REVISION =   0

start with no REVISION
 
: -CATEGORIES = net
: +CATEGORIES = geo

this category is a better fit (net could maybe be added as a secondary
category)

:  HOMEPAGE =   https://www.traccar.org/
:  
:  MAINTAINER = Renaud Allard 
: @@ -28,17 +26,13 @@ RUN_DEPENDS=  java/javaPathHelper
:  NO_BUILD =  Yes
:  NO_TEST =   Yes
:  
: +do-configure:
: + ${SUBST_CMD} ${WRKSRC}/conf/{default,traccar}.xml
: +

don't hardcode /usr/local

: 
:  do-install:
:   ${INSTALL_DATA_DIR} ${PREFIX}/share/traccar/
: - cp -r ${WRKSRC}/conf ${PREFIX}/share/traccar/
: - cp -r ${WRKSRC}/lib ${PREFIX}/share/traccar/
: - cp -r ${WRKSRC}/schema ${PREFIX}/share/traccar/
: - cp -r ${WRKSRC}/templates ${PREFIX}/share/traccar/
: - cp -r ${WRKSRC}/web ${PREFIX}/share/traccar/
: - cp -r ${WRKSRC}/tracker-server.jar ${PREFIX}/share/traccar/
: - ${INSTALL_DATA_DIR} ${SYSCONFDIR}/traccar/

${SYSCONFDIR} isn't under ${PREFIX} so doesn't make it into the package.
it has to be copied at install time by pkg_add via the @sample mechanism.

: - cp ${WRKSRC}/conf/default.xml ${SYSCONFDIR}/traccar
: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/traccar/
: - cp ${WRKSRC}/conf/traccar.xml ${PREFIX}/share/examples/traccar/
: + cd ${WRKSRC}; cp -r conf lib schema templates web tracker-server.jar \
: + ${PREFIX}/share/traccar/
: + rm ${PREFIX}/share/traccar/conf/{default,traccar}.xml.*

simplify, remove .orig files etc to stop update-plist complaining,
no need for share/examples/ as the files are already copied to
share/traccar/ so can be @sample'd from there

:  
:  .include 
: diff --git patches/patch-conf-default_xml patches/patch-conf_default_xml
: similarity index 77%
: rename from patches/patch-conf-default_xml
: rename to patches/patch-conf_default_xml

patches should be generated by copying the file with a .orig extension
and editing, then "make update-patches", which uses a standard filename
format and adds the $OpenBSD$ tag (that gets replaced automatically with
the full tag including committer account name etc by cvs when committing).

: index 9930144..c9633be 100644
: --- patches/patch-conf-default_xml
: +++ patches/patch-conf_default_xml
: @@ -1,11 +1,14 @@
:  conf/default.xml.origFri Dec 14 08:26:52 2018
: -+++ conf/default.xml Fri Dec 14 08:27:51 2018
: +$OpenBSD$
: +
: +Index: conf/default.xml
: +--- conf/default.xml.orig
:  conf/default.xml
:  @@ -12,7 +12,7 @@
:   
:   true
:   8082
:  -./web
: -+/usr/local/share/traccar/web
: ++${LOCALBASE}/share/traccar/web

as above, don't hardcode

:   max-age=3600,public
:   
:   false
: @@ -23,7 +26,7 @@
:   true
:   
:  -./media
: -+/usr/local/share/traccar/media
: ++${LOCALBASE}/share/traccar/media
:   
:   web,mail
:   
: @@ -32,7 +35,7 @@
:   true
:   true
:  -./schema/changelog-master.xml
: -+/usr/local/share/traccar/schema/changelog-master.xml
: ++${LOCALBASE}/share/traccar/schema/changelog-master.xml
:
:   
:   SELECT * FROM tc_users
: diff --git patches/patch-conf-traccar_xml patches/patch-conf_traccar_xml
: similarity index 71%
: rename from patches/patch-conf-traccar_xml
: rename to patches/patch-conf_traccar_xml
: index a5dc7f3..6260c75 100644
: --- patches/patch-conf-traccar_xml
: +++ patches/patch-conf_traccar_xml
: @@ -1,11 +1,14 @@
:  conf/traccar.xml.origFri Dec 14 07:55:53 2018
: -+++ conf/traccar.xml Fri Dec 14 08:26:37 2018
: +$OpenBSD$
: +
: +Index: conf/traccar.xml
: +--- conf/traccar.xml.orig
:

Re: NEW: net/vf1

2018-12-14 Thread Paco Esteban
On Fri, 14 Dec 2018, Edd Barrett wrote:

> I think we can make the README more concise, like this:
> 
> --- README.orig Fri Dec 14 16:48:13 2018
> +++ README  Fri Dec 14 16:49:45 2018
> @@ -4,6 +4,5 @@
>  | Running ${PKGSTEM} on OpenBSD
>  +---
>  
> -If you get encoding errors, be sure you have set the LC_CTYPE
> -environment variable in your system to an UTF-8 variant, like
> -en_US.UTF-8, zh_CN-UTF-8, etc.
> +To avoid character encoding issues, ensure that you have your LC_CTYPE
> +environment set to one of the UTF-8 variants. E.g. en_US.UTF-8.

Applied, here's the tar attached for convenience.

Cheers,

-- 
Paco Esteban
https://onna.be/gpgkey.asc


vf1.tgz
Description: Binary data


Re: NEW: net/vf1

2018-12-14 Thread Edd Barrett
On Fri, Dec 14, 2018 at 05:31:47PM +0100, Paco Esteban wrote:
> Find attached the port with the README instead of a patch.

Good.

I think we can make the README more concise, like this:

--- README.orig Fri Dec 14 16:48:13 2018
+++ README  Fri Dec 14 16:49:45 2018
@@ -4,6 +4,5 @@
 | Running ${PKGSTEM} on OpenBSD
 +---
 
-If you get encoding errors, be sure you have set the LC_CTYPE
-environment variable in your system to an UTF-8 variant, like
-en_US.UTF-8, zh_CN-UTF-8, etc.
+To avoid character encoding issues, ensure that you have your LC_CTYPE
+environment set to one of the UTF-8 variants. E.g. en_US.UTF-8.

Then I think this is ready.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: NEW: net/vf1

2018-12-14 Thread Paco Esteban
On Fri, 14 Dec 2018, Edd Barrett wrote:

> Do we know if this is an OpenBSD-specific issue?

As far as I know, yes. At least I could not reproduce it on a linux box
I have here unsetting LC_*

> If it is, or if we are not sure, I suggest adding that message instead
> to a package README that gets installed in
> /usr/local/share/doc/pkg-readmes/.
> 
> Search the tree for examples of pkg/README.
> 
> That was actually what I was suggesting all along, but I wasn't totally
> clear. Sorry!

No worries, I'm learning all of this process, so I appreciate you take
the time to review this port.

Find attached the port with the README instead of a patch.

Cheers,

-- 
Paco Esteban
https://onna.be/gpgkey.asc


vf1.tgz
Description: Binary data


Re: NEW net/traccar

2018-12-14 Thread Renaud Allard



On 12/14/18 4:38 PM, Renaud Allard wrote:



On 12/14/18 3:52 PM, Landry Breuil wrote:


cp -r /usr/obj/ports/traccar-4.2/tracker-server.jar 
/usr/obj/ports/traccar-4.2/fake-amd64/usr/local/share/traccar/

/usr/obj/ports/traccar-4.2/bin/install -d -m 755 /etc/traccar
install: /etc/traccar: Permission denied

not yet..  as other ports, use @sample for the dir and the file..



I tried to reproduce this error, but I got no luck in doing it. Fully 
new and freshly installed -current machine with a freshly downloaded 
ports.tar.gz and pkg_add unzip javaPathHelper jre.

Can you tell me how you got this error?



Does a trailing / helps?


traccar.tar.gz
Description: application/gzip


smime.p7s
Description: S/MIME Cryptographic Signature


Re: NEW: net/vf1

2018-12-14 Thread Edd Barrett
On Thu, Dec 13, 2018 at 06:52:14PM +0100, Paco Esteban wrote:
> I guess a note on the README is enough. Here's the port with a patch for
> that. If you think something else should be done, I can maybe contact
> with the author. We've talked a couple of times on IRC and is a nice
> guy.

Do we know if this is an OpenBSD-specific issue?

If it is, or if we are not sure, I suggest adding that message instead
to a package README that gets installed in
/usr/local/share/doc/pkg-readmes/.

Search the tree for examples of pkg/README.

That was actually what I was suggesting all along, but I wasn't totally
clear. Sorry!

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: NEW net/traccar

2018-12-14 Thread Renaud Allard



On 12/14/18 3:52 PM, Landry Breuil wrote:


cp -r /usr/obj/ports/traccar-4.2/tracker-server.jar 
/usr/obj/ports/traccar-4.2/fake-amd64/usr/local/share/traccar/
/usr/obj/ports/traccar-4.2/bin/install -d -m 755 /etc/traccar
install: /etc/traccar: Permission denied

not yet..  as other ports, use @sample for the dir and the file..



I tried to reproduce this error, but I got no luck in doing it. Fully 
new and freshly installed -current machine with a freshly downloaded 
ports.tar.gz and pkg_add unzip javaPathHelper jre.

Can you tell me how you got this error?



smime.p7s
Description: S/MIME Cryptographic Signature


Re: NEW net/traccar

2018-12-14 Thread Landry Breuil
On Fri, Dec 14, 2018 at 03:39:34PM +0100, Renaud Allard wrote:
> 
> 
> On 12/14/18 1:10 PM, Stuart Henderson wrote:
> 
> > 
> > should be more like this:
> > 
> > @owner _traccar
> > @group _traccar
> > @sample /var/db/traccar/
> > @sample /var/log/traccar/
> > @group
> > @owner
> > 
> > 
> > daemon="/usr/local/jre-1.8.0/bin/java -XX:-UsePerfData -jar 
> > /usr/local/share/traccar/tracker-server.jar /etc/traccar/traccar.xml"
> > 
> > look at how other java ports do this using javaPathHelper to
> > fetch the correct java binary (it could be jre or jdk and potentially
> > a newer version in future) - see e.g. net/unifi.
> > 
> > don't hardcode /usr/local in the port at all (rc script or Makefile -
> > use variables directly for those - or patches - needs passing through
> > ${SUBST_CMD} after patching). again look at other ports for examples.
> > 
> Attached a fully corrected port with better permissions.

cp -r /usr/obj/ports/traccar-4.2/tracker-server.jar 
/usr/obj/ports/traccar-4.2/fake-amd64/usr/local/share/traccar/  
  
/usr/obj/ports/traccar-4.2/bin/install -d -m 755 /etc/traccar
install: /etc/traccar: Permission denied

not yet..  as other ports, use @sample for the dir and the file..

Landry



Re: NEW net/traccar

2018-12-14 Thread Renaud Allard



On 12/14/18 1:10 PM, Stuart Henderson wrote:



should be more like this:

@owner _traccar
@group _traccar
@sample /var/db/traccar/
@sample /var/log/traccar/
@group
@owner


daemon="/usr/local/jre-1.8.0/bin/java -XX:-UsePerfData -jar 
/usr/local/share/traccar/tracker-server.jar /etc/traccar/traccar.xml"

look at how other java ports do this using javaPathHelper to
fetch the correct java binary (it could be jre or jdk and potentially
a newer version in future) - see e.g. net/unifi.

don't hardcode /usr/local in the port at all (rc script or Makefile -
use variables directly for those - or patches - needs passing through
${SUBST_CMD} after patching). again look at other ports for examples.


Attached a fully corrected port with better permissions.


traccar.tar.gz
Description: application/gzip


smime.p7s
Description: S/MIME Cryptographic Signature


[UPDATE] math/z3

2018-12-14 Thread Remi Pointel

Hi,

this diff updates z3 to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/math/z3/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile	24 Nov 2018 00:57:15 -	1.9
+++ Makefile	14 Dec 2018 13:01:40 -
@@ -2,14 +2,13 @@
 
 COMMENT =	Z3 theorem prover
 
-VERSION =	4.7.1
+VERSION =	4.8.3
 DISTNAME =	z3-${VERSION}
-REVISION =	1
 
 GH_ACCOUNT =	Z3Prover
 GH_PROJECT =	z3
 
-SHARED_LIBS =	z3			0.0
+SHARED_LIBS =	z3			1.0
 
 CATEGORIES =	math
 
Index: distinfo
===
RCS file: /cvs/ports/math/z3/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo	18 Jun 2018 08:15:11 -	1.3
+++ distinfo	14 Dec 2018 13:01:40 -
@@ -1,2 +1,2 @@
-SHA256 (z3-4.7.1.tar.gz) = o1Pj2gDNr/0lgFLMFAbvyFRgaFUiKrS/1WecWK9cEcc=
-SIZE (z3-4.7.1.tar.gz) = 4015416
+SHA256 (z3-4.8.3.tar.gz) = IWILaMNzzeoNOyzyQCC+Ts+yLt3GYpZj9unOMc/ceN4=
+SIZE (z3-4.8.3.tar.gz) = 4119116
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/z3/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST	15 Sep 2018 13:27:29 -	1.3
+++ pkg/PLIST	14 Dec 2018 13:01:40 -
@@ -7,13 +7,13 @@ include/z3_api.h
 include/z3_ast_containers.h
 include/z3_fixedpoint.h
 include/z3_fpa.h
-include/z3_interp.h
 include/z3_macros.h
 include/z3_optimization.h
 include/z3_polynomial.h
 include/z3_rcf.h
 include/z3_spacer.h
 include/z3_v1.h
+include/z3_version.h
 @lib lib/libz3.so.${LIBz3_VERSION}
 lib/python${MODPY_VERSION}/site-packages/z3/
 lib/python${MODPY_VERSION}/site-packages/z3/__init__.py


Re: NEW net/traccar

2018-12-14 Thread Renaud Allard

Hi Stuart,

On 12/14/18 1:10 PM, Stuart Henderson wrote:




@owner _traccar
@group _traccar
@dir var/db/traccar/
@dir var/log/traccar/
@exec chown _traccar:_traccar /var/db/traccar/ /var/log/traccar/
@group
@owner

should be more like this:

@owner _traccar
@group _traccar
@sample /var/db/traccar/
@sample /var/log/traccar/
@group
@owner



Agreed, that's what I did in the first place, but it did not work. Those 
directories don't exist in the archive.
I hoped someone would come with a better way to do it because I didn't 
like my way, but @sample didn't work when I tested it.




daemon="/usr/local/jre-1.8.0/bin/java -XX:-UsePerfData -jar 
/usr/local/share/traccar/tracker-server.jar /etc/traccar/traccar.xml"

look at how other java ports do this using javaPathHelper to
fetch the correct java binary (it could be jre or jdk and potentially
a newer version in future) - see e.g. net/unifi.

don't hardcode /usr/local in the port at all (rc script or Makefile -
use variables directly for those - or patches - needs passing through
${SUBST_CMD} after patching). again look at other ports for examples.



Attached a better version


traccar.tar.gz
Description: application/gzip


smime.p7s
Description: S/MIME Cryptographic Signature


[UPDATE] security/py-ropper

2018-12-14 Thread Remi Pointel

Hi,

this diff updates ropper to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/security/py-ropper/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile	4 May 2018 05:31:15 -	1.1.1.1
+++ Makefile	14 Dec 2018 12:35:34 -
@@ -2,7 +2,7 @@
 
 COMMENT =	rop gadget finder and binary information tool
 
-MODPY_EGG_VERSION =	1.11.6
+MODPY_EGG_VERSION =	1.11.10
 DISTNAME =	ropper-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 
@@ -25,5 +25,9 @@ RUN_DEPENDS =	devel/py-filebytes${MODPY_
 
 FLAVORS =	python3
 FLAVOR ?=
+
+# permit installing py- and py3- on same machine
+post-install:
+	mv ${PREFIX}/bin/ropper ${PREFIX}/bin/ropper${MODPY_BIN_SUFFIX}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/security/py-ropper/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo	4 May 2018 05:31:15 -	1.1.1.1
+++ distinfo	14 Dec 2018 12:35:34 -
@@ -1,2 +1,2 @@
-SHA256 (ropper-1.11.6.tar.gz) = M3d9DD3dnKe8SPU9vixKIipWfxElxDscNPsbNg0LGdw=
-SIZE (ropper-1.11.6.tar.gz) = 64364
+SHA256 (ropper-1.11.10.tar.gz) = uNFDnYpu97k3GEcrAojuiKWVNyMEZ3LwNf6YmxweXW4=
+SIZE (ropper-1.11.10.tar.gz) = 65765
Index: pkg/PFRAG.no-python3
===
RCS file: pkg/PFRAG.no-python3
diff -N pkg/PFRAG.no-python3
--- pkg/PFRAG.no-python3	4 May 2018 05:31:15 -	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.no-python3,v 1.1.1.1 2018/05/04 05:31:15 rpointel Exp $
-bin/ropper2
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/py-ropper/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST	4 May 2018 05:31:15 -	1.1.1.1
+++ pkg/PLIST	14 Dec 2018 12:35:34 -
@@ -1,16 +1,18 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2018/05/04 05:31:15 rpointel Exp $
-!%%python3%%
-${MODPY_COMMENT}bin/ropper
+bin/ropper${MODPY_BIN_SUFFIX}
 lib/python${MODPY_VERSION}/site-packages/ropper/
 lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
 lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ropper/__init__.py
+lib/python${MODPY_VERSION}/site-packages/ropper/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}arch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}gadget.${MODPY_PYC_MAGIC_TAG}pyc


Re: uninstalling packages

2018-12-14 Thread Marc Espie
On Fri, Dec 14, 2018 at 11:36:11AM +, Craig Skinner wrote:
> On Thu, 13 Dec 2018 11:20:37 +0100 Sebastian Benoit wrote:
> > --- -cups-2.2.8p1 ---
> > You should also run rm -rf /etc/cups/*.conf.O /var/log/cups
> > You should also remove /etc/cups/cupsd.conf (which was modified)
> > You should also remove /etc/cups/classes.conf (which was modified)
> > You should also remove /etc/cups/printers.conf (which was modified)
> > You should also remove /etc/cups/subscriptions.conf (which was modified)
> > You should also remove /etc/cups/snmp.conf (which was modified)
> > You should also run rm -rf /var/cache/cups
> > You should also run rm -rf /var/spool/cups
> > 
> > If I want to actually delete all that stuff, thats a lot of
> > copy&paste. Are we actually expecting users to do that?
> 
> It is trying to help by not deleting modified, cached & spooled
> files/logs. If /etc/cups/snmp.conf wasn't modified, it would already
> have been removed. The remove list depends on what the admin changed,
> which varies from machine to machine.
> 
> If everything is backed up and you want to re-install it later,
> everything can be nuked. Simple version:
> 
> rm -rf /etc/cups/ /var/cache/cups/ /var/log/cups/ /var/spool/cups/
> 
> or even:
> 
> rm -rf /etc/cups/ /var/{cache,log,spool}/cups/

Well, I'll admit the current messages are less than perfect.

Getting them better is not "just" simple.  There's a shitload of info
that will require actually changing in individual ports.


And it also requires better logic in some cases.

A lot of people seem to easily forget about the sheer size of the thing.
Roughly 1 packages. It's often not "just" write another shell-script or
whatever, but slightly more complicated...

(Note that the situation is not any better in base, where changing base
tools often leaves you with odd files and ends)

Basically, pkg_check can help a lot in cleaning up various things
all over the file system. (or semarie@'s sysclean)

If people are interested in actually getting the ports tree cleaner, 
there are *lots* of things to do.


I would very much like people to look at texinfo's info files.

We have a shitload of them that do not register properly and give spurious
"blablabla not registered" or bogus index lines.

THAT would be swell to not have to worry about that.



Re: NEW net/traccar

2018-12-14 Thread Stuart Henderson
On 2018/12/14 09:44, Renaud Allard wrote:
> Hello,
> 
> Here is a new port for traccar. This is a GPS tracker server written in
> java. https://traccar.org
> I have only tested it on amd64, but there is no reason it wouldn't work on
> any platform which supports jre.
> 
> This port needs a new user:
> --- ports/infrastructure/db/user.list   3 Dec 2018 12:20:01 - 1.331
> +++ ports/infrastructure/db/user.list   14 Dec 2018 07:54:58 -
> @@ -332,3 +332,4 @@ id  usergroup   port options
>  821 _tenshi_tenshi sysutils/tenshi
>  822 _apertium-apy  _apertium-apy   www/apertium-apy
>  823 _opendkim  _opendkim   mail/opendkim
> +824 _traccar   _traccarnet/traccar
> 
> 
> Best Regards


@owner _traccar
@group _traccar
@dir var/db/traccar/
@dir var/log/traccar/
@exec chown _traccar:_traccar /var/db/traccar/ /var/log/traccar/
@group
@owner

should be more like this:

@owner _traccar
@group _traccar
@sample /var/db/traccar/
@sample /var/log/traccar/
@group
@owner


daemon="/usr/local/jre-1.8.0/bin/java -XX:-UsePerfData -jar 
/usr/local/share/traccar/tracker-server.jar /etc/traccar/traccar.xml"

look at how other java ports do this using javaPathHelper to 
fetch the correct java binary (it could be jre or jdk and potentially
a newer version in future) - see e.g. net/unifi.

don't hardcode /usr/local in the port at all (rc script or Makefile -
use variables directly for those - or patches - needs passing through
${SUBST_CMD} after patching). again look at other ports for examples.


COMMENT =   Modern GPS Tracking Platform
V = 4.2
DISTNAME =  traccar-${V}
EXTRACT_SUFX =  .zip
DISTFILES = traccar-other-${V}${EXTRACT_SUFX}
WRKSRC =${WRKDIR}
WRKDIST =   ${WRKDIR}
REVISION =  0

simpler:

COMMENT =   modern GPS tracking platform
V = 4.2
PKGNAME =   traccar-${V}
DISTNAME =  traccar-other-${V}
EXTRACT_SUFX =  .zip
WRKDIST =   ${WRKDIR}



Re: uninstalling packages

2018-12-14 Thread Stuart Henderson
On 2018/12/14 11:36, Craig Skinner wrote:
> On Thu, 13 Dec 2018 11:20:37 +0100 Sebastian Benoit wrote:
> > --- -cups-2.2.8p1 ---
> > You should also run rm -rf /etc/cups/*.conf.O /var/log/cups
> > You should also remove /etc/cups/cupsd.conf (which was modified)
> > You should also remove /etc/cups/classes.conf (which was modified)
> > You should also remove /etc/cups/printers.conf (which was modified)
> > You should also remove /etc/cups/subscriptions.conf (which was modified)
> > You should also remove /etc/cups/snmp.conf (which was modified)
> > You should also run rm -rf /var/cache/cups
> > You should also run rm -rf /var/spool/cups
> > 
> > If I want to actually delete all that stuff, thats a lot of
> > copy&paste. Are we actually expecting users to do that?
> 
> It is trying to help by not deleting modified, cached & spooled
> files/logs. If /etc/cups/snmp.conf wasn't modified, it would already
> have been removed. The remove list depends on what the admin changed,
> which varies from machine to machine.
> 
> If everything is backed up and you want to re-install it later,
> everything can be nuked. Simple version:
> 
> rm -rf /etc/cups/ /var/cache/cups/ /var/log/cups/ /var/spool/cups/
> 
> or even:
> 
> rm -rf /etc/cups/ /var/{cache,log,spool}/cups/

To get from "You should also remove /etc/cups/cupsd.conf (which was
modified)" to "rm /etc/cups/cupsd.conf" or "rm -rf /etc/cups" requires
error-prone copy/paste/edit or retyping. The point is that the displayed
text could be given in a more ready-to-use form.

What I usually do in this situation is reinstall the package, then
remove it again with pkg_delete -c. Bit of a waste of bandwidth and
there's room for improvement in the tools, but that is effective.



Re: uninstalling packages

2018-12-14 Thread Craig Skinner
On Thu, 13 Dec 2018 11:20:37 +0100 Sebastian Benoit wrote:
> --- -cups-2.2.8p1 ---
> You should also run rm -rf /etc/cups/*.conf.O /var/log/cups
> You should also remove /etc/cups/cupsd.conf (which was modified)
> You should also remove /etc/cups/classes.conf (which was modified)
> You should also remove /etc/cups/printers.conf (which was modified)
> You should also remove /etc/cups/subscriptions.conf (which was modified)
> You should also remove /etc/cups/snmp.conf (which was modified)
> You should also run rm -rf /var/cache/cups
> You should also run rm -rf /var/spool/cups
> 
> If I want to actually delete all that stuff, thats a lot of
> copy&paste. Are we actually expecting users to do that?

It is trying to help by not deleting modified, cached & spooled
files/logs. If /etc/cups/snmp.conf wasn't modified, it would already
have been removed. The remove list depends on what the admin changed,
which varies from machine to machine.

If everything is backed up and you want to re-install it later,
everything can be nuked. Simple version:

rm -rf /etc/cups/ /var/cache/cups/ /var/log/cups/ /var/spool/cups/

or even:

rm -rf /etc/cups/ /var/{cache,log,spool}/cups/


Cheers,
-- 
Craig Skinner | http://linkd.in/yGqkv7



Re: pkg_mgr not working

2018-12-14 Thread Marc Espie
On Fri, Dec 14, 2018 at 09:07:00AM +0300, �?ак�?им wrote:
> Hello,
> In  the OpenBSD current after the latest upgrade the package pkg_mgr doesn't 
> work.
> When I run "pkg_mgr" it shows the following:
> DBD::SQLite::db selectall_arrayref failed: no such table: _Ports at 
> /usr/local/libdata/perl5/site_perl/OpenBSD/PackageManager/DBIModel.pm line 
> 144.
> DBD::SQLite::db selectcol_arrayref failed: no such table: _Paths at 
> /usr/local/libdata/perl5/site_perl/OpenBSD/PackageManager/DBIModel.pm line 
> 152.
> Can't use an undefined value as an ARRAY reference at 
> /usr/local/libdata/perl5/site_perl/OpenBSD/PackageManager/DBIModel.pm line 
> 153.
> 
> Reinstalling the application didn't help.
> 
> -- 
> Best regards,
> Maksim Rodin

My bad, I didn't update the database name after the change.

I also fixed the connection itself to be read-only, so that this kind of
errors is more obvious.



Re: pkg_mgr not working

2018-12-14 Thread Charlene Wendling
Hi, 

On Fri, 14 Dec 2018 09:07:00 +0300
Максим wrote:

> Hello,
> In  the OpenBSD current after the latest upgrade the package pkg_mgr
> doesn't work. When I run "pkg_mgr" it shows the following:
> DBD::SQLite::db selectall_arrayref failed: no such table: _Ports
> at /usr/local/libdata/perl5/site_perl/OpenBSD/PackageManager/DBIModel.pm
> line 144. DBD::SQLite::db selectcol_arrayref failed: no such table:
> _Paths
> at /usr/local/libdata/perl5/site_perl/OpenBSD/PackageManager/DBIModel.pm
> line 152. Can't use an undefined value as an ARRAY reference
> at /usr/local/libdata/perl5/site_perl/OpenBSD/PackageManager/DBIModel.pm
> line 153.
> 

I can reproduce the issue. It appears that pkg_mgr uses the removed [1]
sqlports-compact.

I'm joining a diff that makes it working again here.

Charlène. 

[1] https://marc.info/?l=openbsd-ports-cvs&m=154341707417775&w=2



Index: Makefile
===
RCS file: /cvs/ports/sysutils/pkg_mgr/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile28 Nov 2018 14:57:45 -  1.14
+++ Makefile14 Dec 2018 09:51:39 -
@@ -4,7 +4,7 @@ COMMENT=user-friendly package browser a
 
 DISTNAME=  pkg_mgr-0.2.3
 CATEGORIES=sysutils
-REVISION=  1
+REVISION=  2
 
 HOMEPAGE=  https://rhaalovely.net/pkg_mgr/
 MAINTAINER=Landry Breuil 
Index: patches/patch-OpenBSD_PackageManager_DBIModel_pm
===
RCS file: 
/cvs/ports/sysutils/pkg_mgr/patches/patch-OpenBSD_PackageManager_DBIModel_pm,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-OpenBSD_PackageManager_DBIModel_pm
--- patches/patch-OpenBSD_PackageManager_DBIModel_pm28 Nov 2018 14:57:45 
-  1.2
+++ patches/patch-OpenBSD_PackageManager_DBIModel_pm14 Dec 2018 09:51:39 
-
@@ -7,7 +7,7 @@ Index: OpenBSD/PackageManager/DBIModel.p
$self->{portslist} = undef; # key=category id, value=port id array
$self->{dbh}->disconnect if defined $self->{dbh};
 -  $self->{dbh} = 
DBI->connect("dbi:SQLite:/usr/local/share/sqlports-compact");
-+  $self->{dbh} = 
DBI->connect("dbi:SQLite:${LOCALBASE}/share/sqlports-compact");
++  $self->{dbh} = DBI->connect("dbi:SQLite:${LOCALBASE}/share/sqlports");
$self->get_allports;
$self->update_installed;
  }



[NEW] security/cyberchef

2018-12-14 Thread Remi Pointel

Hi,

attached is the port of cyberchef: a web app for encryption, encoding, 
compression and data analysis.



$ pkg_info cyberchef
Information for inst:cyberchef-8.12.3

Comment:
web app for encryption, encoding, and other data analysis

Description:
CyberChef is a simple, intuitive web app for carrying out all manner of 
"cyber"
operations within a web browser. These operations include simple 
encoding like
XOR or Base64, more complex encryption like AES, DES and Blowfish, 
creating
binary and hexdumps, compression and decompression of data, calculating 
hashes
and checksums, IPv6 and X.509 parsing, changing character encodings, and 
much

more.

Maintainer: Remi Pointel 


Cheers,

Remi.


cyberchef-8.12.3.tar.gz
Description: GNU Zip compressed data


NEW net/traccar

2018-12-14 Thread Renaud Allard

Hello,

Here is a new port for traccar. This is a GPS tracker server written in 
java. https://traccar.org
I have only tested it on amd64, but there is no reason it wouldn't work 
on any platform which supports jre.


This port needs a new user:
--- ports/infrastructure/db/user.list   3 Dec 2018 12:20:01 - 
1.331

+++ ports/infrastructure/db/user.list   14 Dec 2018 07:54:58 -
@@ -332,3 +332,4 @@ id  usergroup   port options
 821 _tenshi_tenshi sysutils/tenshi
 822 _apertium-apy  _apertium-apy   www/apertium-apy
 823 _opendkim  _opendkim   mail/opendkim
+824 _traccar   _traccarnet/traccar


Best Regards


traccar.tar.gz
Description: application/gzip


smime.p7s
Description: S/MIME Cryptographic Signature


UPDATE: archivers/lzip/tarlz to 0.7

2018-12-14 Thread Sascha Paunovic

Hi,

here an update of archivers/lzip/tarlz to version 0.7.

Tested on amd64, working ok for me.

Index: Makefile
===
RCS file: /cvs/ports/archivers/lzip/tarlz/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile26 Oct 2018 06:17:23 -  1.4
+++ Makefile14 Dec 2018 08:12:35 -
@@ -2,7 +2,7 @@

 COMMENT =  archiver based on tar and lzip multimembers

-DISTNAME = tarlz-0.6
+DISTNAME = tarlz-0.7

 HOMEPAGE = http://lzip.nongnu.org/tarlz.html
 MASTER_SITES = ${MASTER_SITE_SAVANNAH:=lzip/tarlz/}
Index: distinfo
===
RCS file: /cvs/ports/archivers/lzip/tarlz/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo26 Oct 2018 06:17:23 -  1.3
+++ distinfo14 Dec 2018 08:12:35 -
@@ -1,2 +1,2 @@
-SHA256 (lzip/tarlz-0.6.tar.lz) = 
V5J5UYvkYjqPFRK/NSk3ZcwrZuvyRKS803swnIwI8jc=

-SIZE (lzip/tarlz-0.6.tar.lz) = 55242
+SHA256 (lzip/tarlz-0.7.tar.lz) = 
VI87gFlqX4TxxlLVBM2VtvwZeJ3joaO5pS9RRqQqz/Y=

+SIZE (lzip/tarlz-0.7.tar.lz) = 56967