Re: [NEW] net/sniproxy 0.6.0

2020-04-07 Thread Stuart Henderson
On 2020/04/07 15:06, Renaud Allard wrote:
> Hi,
> 
> Here is the port, corrected with nice suggestions from sthen@ and bket@,
> including the patch which was in the original branch from github instead of
> my own patches. This seems to solve the table test problem.
> 
> Any more comments? OK to import?

OK to import, I've reserved an entry in user.list for the uid.

Some tests require listening on 8080-8082 where I had daemons already
(at least on 8080); as these are fairly common ports to use it's
probably worth moving them to alternatives with this:

TEST_ENV =  SNI_PROXY_PORT=18080 \
TEST_HTTPD_PORT=18081 \
TEST_FALLBACK_PORT=18082

No need for a new tar, whoever commits can just add it.



Re: sysutils/rofi: fix crash

2020-04-07 Thread Edd Barrett
On Tue, Apr 07, 2020 at 09:29:31PM +0100, Raf Czlonka wrote:
> Given that the above redirects to https://github.com/davatorium/rofi,
> shouldn't HOMEPAGE be adjusted at the same time?

Sure.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/rofi/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile12 Jul 2019 20:49:50 -  1.29
+++ Makefile7 Apr 2020 20:45:15 -
@@ -4,9 +4,10 @@ COMMENT =  window switcher, run dialog a
 
 V =1.5.4
 DISTNAME = rofi-${V}
+REVISION = 0
 
 CATEGORIES =   sysutils x11
-HOMEPAGE = https://github.com/DaveDavenport/rofi
+HOMEPAGE = https://github.com/davatorium/rofi
 
 MAINTAINER =   Jasper Lievisse Adriaanse 
 
Index: patches/patch-source_dialogs_script_c
===
RCS file: patches/patch-source_dialogs_script_c
diff -N patches/patch-source_dialogs_script_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-source_dialogs_script_c   7 Apr 2020 20:08:54 -
@@ -0,0 +1,30 @@
+$OpenBSD$
+
+Fix a crash in dmenu mode:
+https://github.com/davatorium/rofi/issues/1083
+
+Index: source/dialogs/script.c
+--- source/dialogs/script.c.orig
 source/dialogs/script.c
+@@ -78,10 +78,10 @@ typedef struct
+ void dmenuscript_parse_entry_extras ( G_GNUC_UNUSED Mode *sw, 
DmenuScriptEntry *entry, char *buffer, size_t length )
+ {
+ size_t   length_key = 0;//strlen ( line );
+-while ( length_key <= length && buffer[length_key] != '\x1f' ) {
++while ( length_key < length && buffer[length_key] != '\x1f' ) {
+ length_key++;
+ }
+-if ( length_key < length ) {
++if ( (length_key+1) < length ) {
+ buffer[length_key] = '\0';
+ char *value = buffer + length_key + 1;
+ if ( strcasecmp(buffer, "icon" ) == 0 ) {
+@@ -98,7 +98,7 @@ static void parse_header_entry ( Mode *sw, char *line,
+ {
+ ScriptModePrivateData *pd= (ScriptModePrivateData *) 
sw->private_data;
+ ssize_t   length_key = 0;//strlen ( line );
+-while ( length_key <= length && line[length_key] != '\x1f' ) {
++while ( length_key < length && line[length_key] != '\x1f' ) {
+ length_key++;
+ }
+ 

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: sysutils/rofi: fix crash

2020-04-07 Thread Raf Czlonka
On Tue, Apr 07, 2020 at 09:17:15PM BST, Edd Barrett wrote:
> Hi,
> 
> rofi kept crashing on me. Reported to upstream and got a fix!
> 
> OK?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/rofi/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- Makefile  12 Jul 2019 20:49:50 -  1.29
> +++ Makefile  7 Apr 2020 12:57:11 -
> @@ -4,6 +4,7 @@ COMMENT = window switcher, run dialog a
>  
>  V =  1.5.4
>  DISTNAME =   rofi-${V}
> +REVISION =   0
>  
>  CATEGORIES = sysutils x11
>  HOMEPAGE =   https://github.com/DaveDavenport/rofi
   ^

Hi Edd,

Given that the above redirects to https://github.com/davatorium/rofi,
shouldn't HOMEPAGE be adjusted at the same time?

Regards,

Raf

> Index: patches/patch-source_dialogs_script_c
> ===
> RCS file: patches/patch-source_dialogs_script_c
> diff -N patches/patch-source_dialogs_script_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-source_dialogs_script_c 7 Apr 2020 20:08:54 -
> @@ -0,0 +1,30 @@
> +$OpenBSD$
> +
> +Fix a crash in dmenu mode:
> +https://github.com/davatorium/rofi/issues/1083
> +
> +Index: source/dialogs/script.c
> +--- source/dialogs/script.c.orig
>  source/dialogs/script.c
> +@@ -78,10 +78,10 @@ typedef struct
> + void dmenuscript_parse_entry_extras ( G_GNUC_UNUSED Mode *sw, 
> DmenuScriptEntry *entry, char *buffer, size_t length )
> + {
> + size_t   length_key = 0;//strlen ( line );
> +-while ( length_key <= length && buffer[length_key] != '\x1f' ) {
> ++while ( length_key < length && buffer[length_key] != '\x1f' ) {
> + length_key++;
> + }
> +-if ( length_key < length ) {
> ++if ( (length_key+1) < length ) {
> + buffer[length_key] = '\0';
> + char *value = buffer + length_key + 1;
> + if ( strcasecmp(buffer, "icon" ) == 0 ) {
> +@@ -98,7 +98,7 @@ static void parse_header_entry ( Mode *sw, char *line,
> + {
> + ScriptModePrivateData *pd= (ScriptModePrivateData *) 
> sw->private_data;
> + ssize_t   length_key = 0;//strlen ( line );
> +-while ( length_key <= length && line[length_key] != '\x1f' ) {
> ++while ( length_key < length && line[length_key] != '\x1f' ) {
> + length_key++;
> + }
> + 
> 
> -- 
> Best Regards
> Edd Barrett
> 
> http://www.theunixzoo.co.uk
> 



Re: NEW: devel/mkspiffs 0.2.3

2020-04-07 Thread Tracey Emery
On Mon, Apr 06, 2020 at 09:01:46AM -0600, Tracey Emery wrote:
> Hello,
> 
> This new port is a tool specifically patched to build and upack SPIFFS
> images for ESP32 and ESP8266 embedded devices, using SPIFFS as the
> submodule. It is a runtime dependency for the next two arduino-core
> ports I'll be sending.
> 
> I've been using this on amd64 for a few months.
> 
> OK?
> 
> -- 
> 
> Tracey Emery

New port has kmos suggested comment and change for COMPILER.
Thanks.

-- 

Tracey Emery


mkspiffs-0.2.3.tgz
Description: Binary data


sysutils/rofi: fix crash

2020-04-07 Thread Edd Barrett
Hi,

rofi kept crashing on me. Reported to upstream and got a fix!

OK?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/rofi/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile12 Jul 2019 20:49:50 -  1.29
+++ Makefile7 Apr 2020 12:57:11 -
@@ -4,6 +4,7 @@ COMMENT =   window switcher, run dialog a
 
 V =1.5.4
 DISTNAME = rofi-${V}
+REVISION = 0
 
 CATEGORIES =   sysutils x11
 HOMEPAGE = https://github.com/DaveDavenport/rofi
Index: patches/patch-source_dialogs_script_c
===
RCS file: patches/patch-source_dialogs_script_c
diff -N patches/patch-source_dialogs_script_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-source_dialogs_script_c   7 Apr 2020 20:08:54 -
@@ -0,0 +1,30 @@
+$OpenBSD$
+
+Fix a crash in dmenu mode:
+https://github.com/davatorium/rofi/issues/1083
+
+Index: source/dialogs/script.c
+--- source/dialogs/script.c.orig
 source/dialogs/script.c
+@@ -78,10 +78,10 @@ typedef struct
+ void dmenuscript_parse_entry_extras ( G_GNUC_UNUSED Mode *sw, 
DmenuScriptEntry *entry, char *buffer, size_t length )
+ {
+ size_t   length_key = 0;//strlen ( line );
+-while ( length_key <= length && buffer[length_key] != '\x1f' ) {
++while ( length_key < length && buffer[length_key] != '\x1f' ) {
+ length_key++;
+ }
+-if ( length_key < length ) {
++if ( (length_key+1) < length ) {
+ buffer[length_key] = '\0';
+ char *value = buffer + length_key + 1;
+ if ( strcasecmp(buffer, "icon" ) == 0 ) {
+@@ -98,7 +98,7 @@ static void parse_header_entry ( Mode *sw, char *line,
+ {
+ ScriptModePrivateData *pd= (ScriptModePrivateData *) 
sw->private_data;
+ ssize_t   length_key = 0;//strlen ( line );
+-while ( length_key <= length && line[length_key] != '\x1f' ) {
++while ( length_key < length && line[length_key] != '\x1f' ) {
+ length_key++;
+ }
+ 

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: do-install hook fails

2020-04-07 Thread Stuart Henderson
Please fix your MUA, it has screwed up To/CC lines.

On 2020/04/08 00:46, putridsou...@gmail.com wrote:
> I can't seem to get /etc/tripwire/twpol-OpenBSD.txt to be a part
> of package.tgz, after "make fake" twpol-OpenBSD.txt is rightly
> in ${WRKINST}/etc/tripwire/, but "make package" excludes the 
> configuration file from package.tgz and includes only files within 
> ${PREFIX}. How do I install configuration files which go into /etc? 

Files for /etc should be installed to e.g. ${PREFIX}/share/examples/tripwire
and then in the PLIST you use @sample on the following line to copy at install
time.



Re: do-install hook fails

2020-04-07 Thread putridsoul66
I can't seem to get /etc/tripwire/twpol-OpenBSD.txt to be a part
of package.tgz, after "make fake" twpol-OpenBSD.txt is rightly
in ${WRKINST}/etc/tripwire/, but "make package" excludes the 
configuration file from package.tgz and includes only files within 
${PREFIX}. How do I install configuration files which go into /etc? 

Makefile
# $OpenBSD: Makefile.template,v 1.87 2020/03/22 17:18:01 cwen Exp $

COMMENT=verify the integrity of the files on a given system 

V=  2.4.3.7
DISTNAME=   tripwire-open-source-${V}

PKGNAME=tripwire-${V}
REVISION=   0

CATEGORIES= security

# GPLv2
PERMIT_PACKAGE= Yes 

MASTER_SITES=   
https://github.com/Tripwire/tripwire-open-source/releases/download/${V}/

CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --sysconfdir=/etc/tripwire

do-install:
# This package doesn't have a typical make ${INSTALL_TARGET}, so we do 
it by hand.
#  
#create var/db directories
${INSTALL_DATA_DIR} ${WRKINST}/var/db/tripwire/
${INSTALL_DATA_DIR} ${WRKINST}/var/db/tripwire/report/

#install bin/binaries
${INSTALL_SCRIPT} ${WRKSRC}/bin/siggen ${PREFIX}/bin/
${INSTALL_SCRIPT} ${WRKSRC}/bin/tripwire ${PREFIX}/bin/
${INSTALL_SCRIPT} ${WRKSRC}/bin/twadmin ${PREFIX}/bin/
${INSTALL_SCRIPT} ${WRKSRC}/bin/twprint ${PREFIX}/bin/

#copy install files for use by user after install, and fix a path
${INSTALL_DATA_DIR} ${PREFIX}/share/tripwire/
${INSTALL_SCRIPT} ${WRKSRC}/installer/install.sh 
${PREFIX}/share/tripwire/
${INSTALL_DATA} ${WRKSRC}/installer/install.cfg 
${PREFIX}/share/tripwire/
sed -i 's#./install/install.cfg#./install.cfg#' 
${PREFIX}/share/tripwire/install.sh
${INSTALL_DATA} ${WRKSRC}/policy/policyguide.txt 
${PREFIX}/share/tripwire/
${INSTALL_DATA} ${WRKSRC}/COMMERCIAL ${PREFIX}/share/tripwire/
${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/tripwire/
${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/tripwire/
${INSTALL_DATA} ${WRKSRC}/ReadMe-2.4.3 ${PREFIX}/share/tripwire/
${INSTALL_DATA} ${WRKSRC}/TRADEMARK ${PREFIX}/share/tripwire/

#install man/man pages
${INSTALL_DATA} ${WRKSRC}/man/man4/*.4 ${PREFIX}/man/man4/
${INSTALL_DATA} ${WRKSRC}/man/man5/*.5 ${PREFIX}/man/man5/
${INSTALL_DATA} ${WRKSRC}/man/man8/*.8 ${PREFIX}/man/man8/

#install configuration files
${INSTALL_DATA_DIR} ${WRKINST}/etc/tripwire/
${INSTALL_DATA} ${WRKSRC}/policy/twpol-OpenBSD.txt 
${WRKINST}/etc/tripwire/

.include 



Re: [update] net/wiresep 0.10.1 => 0.11.1

2020-04-07 Thread Klemens Nannie
On Tue, Apr 07, 2020 at 07:23:31PM +0200, Tim Kuijsten wrote:
> Whoops, the previous patch was based on an old tree, here the same patch based
> on the latest ports tree.
Thanks, as already discussed off-list, 0.11.0 was the first version that
allowed me to tunnel between boxes with different endianness.

I've been running this on both amd64 and sparc64, it's been working great
so far after recent changes, wiresep-keygen(1) is now also much nicer
to use.

Committed.



Re: [update] net/wiresep 0.10.1 => 0.11.1

2020-04-07 Thread Tim Kuijsten
Whoops, the previous patch was based on an old tree, here the same patch based
on the latest ports tree.

Tim Kuijsten  wrote:
> This is the latest and greatest.
> 
> Please note I've moved away from GitHub to my own domain.
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/wiresep/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile  18 Mar 2020 22:22:25 -  1.3
> +++ Makefile  7 Apr 2020 16:40:40 -
> @@ -2,11 +2,12 @@
>  
>  COMMENT  =   privilege separated implementation of WireGuard
>  
> -GH_ACCOUNT = timkuijsten
> -GH_PROJECT = wiresep
> -GH_TAGNAME = v0.9.0
> +DISTNAME =   wiresep-0.11.1
> +MASTER_SITES =   https://netsend.nl/wiresep/archive/
>  
> -CATEGORIES = net
> +CATEGORIES = net security
> +
> +HOMEPAGE =   https://netsend.nl/wiresep/
>  
>  MAINTAINER = Tim Kuijsten 
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/wiresep/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  18 Mar 2020 22:22:25 -  1.2
> +++ distinfo  7 Apr 2020 16:40:40 -
> @@ -1,2 +1,2 @@
> -SHA256 (wiresep-0.9.0.tar.gz) = SNdzSCMFfvRsssMRW3DbkbVj+H3pq9NpJQcNiR0oTEE=
> -SIZE (wiresep-0.9.0.tar.gz) = 97932
> +SHA256 (wiresep-0.11.1.tar.gz) = CpaX21JT7q5RAteZCy2VDJNtZ/35NzZpBHFqxNCIxEI=
> +SIZE (wiresep-0.11.1.tar.gz) = 396242
> Index: pkg/README
> ===
> RCS file: /cvs/ports/net/wiresep/pkg/README,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 README
> --- pkg/README15 Mar 2020 22:02:04 -  1.1.1.1
> +++ pkg/README7 Apr 2020 16:40:40 -
> @@ -8,8 +8,7 @@ Basics
>  ==
>  
>  Create a new configuration file in ${SYSCONFDIR}/wiresep/wiresep.conf and 
> create
> -a new private key with wiresep-keygen(1) and store it in
> -${SYSCONFDIR}/wiresep/tun0.key.
> +a new private key with wiresep-keygen(1).
>  
>  See wiresep.conf(5) and ${PREFIX}/share/examples/wiresep/wiresep.conf.example
>  for a basic example configuration.
> @@ -18,4 +17,4 @@ After you have created a config file and
>  started with `rcctl start wiresep`. If you want to enable wiresep on startup 
> run
>  `rcctl enable wiresep`.
>  
> -Additional information on wiresep can be found in wiresep(8).
> +Additional information can be found in wiresep(8).


Index: Makefile
===
RCS file: /cvs/ports/net/wiresep/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile31 Mar 2020 19:00:59 -  1.4
+++ Makefile7 Apr 2020 17:14:51 -
@@ -2,11 +2,12 @@
 
 COMMENT =  privilege separated implementation of WireGuard
 
-GH_ACCOUNT =   timkuijsten
-GH_PROJECT =   wiresep
-GH_TAGNAME =   v0.10.1
+DISTNAME = wiresep-0.11.1
+MASTER_SITES = https://netsend.nl/wiresep/archive/
 
-CATEGORIES =   net
+CATEGORIES =   net security
+
+HOMEPAGE = https://netsend.nl/wiresep
 
 MAINTAINER =   Tim Kuijsten 
 
Index: distinfo
===
RCS file: /cvs/ports/net/wiresep/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo31 Mar 2020 19:00:59 -  1.3
+++ distinfo7 Apr 2020 17:14:51 -
@@ -1,2 +1,2 @@
-SHA256 (wiresep-0.10.1.tar.gz) = Dps3BN8zgtwKGbiG8mAAGMZ5jqA5oooVEHQhpdm8a48=
-SIZE (wiresep-0.10.1.tar.gz) = 99830
+SHA256 (wiresep-0.11.1.tar.gz) = CpaX21JT7q5RAteZCy2VDJNtZ/35NzZpBHFqxNCIxEI=
+SIZE (wiresep-0.11.1.tar.gz) = 396242
Index: pkg/README
===
RCS file: /cvs/ports/net/wiresep/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- pkg/README  15 Mar 2020 22:02:04 -  1.1.1.1
+++ pkg/README  7 Apr 2020 17:14:51 -
@@ -8,8 +8,7 @@ Basics
 ==
 
 Create a new configuration file in ${SYSCONFDIR}/wiresep/wiresep.conf and 
create
-a new private key with wiresep-keygen(1) and store it in
-${SYSCONFDIR}/wiresep/tun0.key.
+a new private key with wiresep-keygen(1).
 
 See wiresep.conf(5) and ${PREFIX}/share/examples/wiresep/wiresep.conf.example
 for a basic example configuration.
@@ -18,4 +17,4 @@ After you have created a config file and
 started with `rcctl start wiresep`. If you want to enable wiresep on startup 
run
 `rcctl enable wiresep`.
 
-Additional information on wiresep can be found in wiresep(8).
+Additional information can be found in wiresep(8).


[update] net/wiresep 0.10.1 => 0.11.1

2020-04-07 Thread Tim Kuijsten
This is the latest and greatest.

Please note I've moved away from GitHub to my own domain.
Index: Makefile
===
RCS file: /cvs/ports/net/wiresep/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile18 Mar 2020 22:22:25 -  1.3
+++ Makefile7 Apr 2020 16:40:40 -
@@ -2,11 +2,12 @@
 
 COMMENT=   privilege separated implementation of WireGuard
 
-GH_ACCOUNT =   timkuijsten
-GH_PROJECT =   wiresep
-GH_TAGNAME =   v0.9.0
+DISTNAME = wiresep-0.11.1
+MASTER_SITES = https://netsend.nl/wiresep/archive/
 
-CATEGORIES =   net
+CATEGORIES =   net security
+
+HOMEPAGE = https://netsend.nl/wiresep/
 
 MAINTAINER =   Tim Kuijsten 
 
Index: distinfo
===
RCS file: /cvs/ports/net/wiresep/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Mar 2020 22:22:25 -  1.2
+++ distinfo7 Apr 2020 16:40:40 -
@@ -1,2 +1,2 @@
-SHA256 (wiresep-0.9.0.tar.gz) = SNdzSCMFfvRsssMRW3DbkbVj+H3pq9NpJQcNiR0oTEE=
-SIZE (wiresep-0.9.0.tar.gz) = 97932
+SHA256 (wiresep-0.11.1.tar.gz) = CpaX21JT7q5RAteZCy2VDJNtZ/35NzZpBHFqxNCIxEI=
+SIZE (wiresep-0.11.1.tar.gz) = 396242
Index: pkg/README
===
RCS file: /cvs/ports/net/wiresep/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- pkg/README  15 Mar 2020 22:02:04 -  1.1.1.1
+++ pkg/README  7 Apr 2020 16:40:40 -
@@ -8,8 +8,7 @@ Basics
 ==
 
 Create a new configuration file in ${SYSCONFDIR}/wiresep/wiresep.conf and 
create
-a new private key with wiresep-keygen(1) and store it in
-${SYSCONFDIR}/wiresep/tun0.key.
+a new private key with wiresep-keygen(1).
 
 See wiresep.conf(5) and ${PREFIX}/share/examples/wiresep/wiresep.conf.example
 for a basic example configuration.
@@ -18,4 +17,4 @@ After you have created a config file and
 started with `rcctl start wiresep`. If you want to enable wiresep on startup 
run
 `rcctl enable wiresep`.
 
-Additional information on wiresep can be found in wiresep(8).
+Additional information can be found in wiresep(8).


[update] sysutils/neofetch 6.1.0 -> 7.0.0

2020-04-07 Thread Charlene Wendling
Hi!

Here is an update for neofetch to 7.0.0.

Upstream is under the process of refactoring/debloating the code,
this release brings only a few functional changes [0].

I added an interesting post-release commit [1] i've found, allowing to
report OpenBSD flavors.

I've found no regression on all my machines.

Comments/feedback are welcome,

Charlène.


[0] https://github.com/dylanaraps/neofetch/releases/tag/7.0.0
[1] https://github.com/dylanaraps/neofetch/pull/1426


Index: Makefile
===
RCS file: /cvs/ports/sysutils/neofetch/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile16 Sep 2019 20:23:48 -  1.7
+++ Makefile7 Apr 2020 13:14:37 -
@@ -5,7 +5,7 @@ CATEGORIES =sysutils misc
 
 GH_ACCOUNT =   dylanaraps
 GH_PROJECT =   neofetch
-GH_TAGNAME =   6.1.0
+GH_TAGNAME =   7.0.0
 
 MAINTAINER =   Charlene Wendling 
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/neofetch/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo16 Sep 2019 20:23:48 -  1.3
+++ distinfo7 Apr 2020 13:14:37 -
@@ -1,2 +1,2 @@
-SHA256 (neofetch-6.1.0.tar.gz) = 7ONR41KGtk02IADUCbJ1l/y9z3fo5g+gra4fKdPCljc=
-SIZE (neofetch-6.1.0.tar.gz) = 118346
+SHA256 (neofetch-7.0.0.tar.gz) = jGvSF89tNPwfPcuw6LETdlW8E/uyEWUnPbsqe84NMTA=
+SIZE (neofetch-7.0.0.tar.gz) = 90892
Index: patches/patch-neofetch
===
RCS file: patches/patch-neofetch
diff -N patches/patch-neofetch
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-neofetch  7 Apr 2020 13:14:37 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+From https://github.com/dylanaraps/neofetch/pull/1426
+Can be removed >7.0.0
+
+Index: neofetch
+--- neofetch.orig
 neofetch
+@@ -1032,6 +1032,11 @@ get_distro() {
+ *) distro="Guix System $(guix system -V | awk 
'NR==1{printf $5}')"
+ esac
+ 
++# Display whether using '-current' or '-release' on OpenBSD.
++elif [[ $kernel_name = OpenBSD ]] ; then
++read -ra kernel_info <<< "$(sysctl -n kern.version)"
++distro=${kernel_info[*]:0:2}
++
+ else
+ for release_file in /etc/*-release; do
+ distro+=$(< "$release_file")



Re: [NEW] net/sniproxy 0.6.0

2020-04-07 Thread Renaud Allard

Hi,

Here is the port, corrected with nice suggestions from sthen@ and bket@, 
including the patch which was in the original branch from github instead 
of my own patches. This seems to solve the table test problem.


Any more comments? OK to import?

Regards

On 4/7/20 2:04 PM, Stuart Henderson wrote:

Here's a diff with some fixes/tidying on top. (-c used in rc script
because the default path is a hardcoded /etc and it's easier to do this
than patch+SUBST_CMD :)

diff b7a3662a673d3be3318e448e144b808cc0159d8f /usr/ports/mystuff
blob - f5412a15261fab82c2ec2bbe9a9630896e3e95a4
file + net/sniproxy/Makefile
--- net/sniproxy/Makefile
+++ net/sniproxy/Makefile
@@ -12,18 +12,14 @@ HOMEPAGE =  https://github.com/dlundquist/sniproxy
  
  MAINTAINER =	Renaud Allard 
  
-# BSD2CLAUSE

+# BSD
  PERMIT_PACKAGE = Yes
  
-WANTLIB += c

+WANTLIB += c ev pcre udns
  
-# Dependencies

-BUILD_DEPENDS =net/udns \
-   devel/libev \
-   devel/pcre \
-   devel/gettext,-tools
+BUILD_DEPENDS =devel/gettext,-tools
  
-RUN_DEPENDS =	net/udns \

+LIB_DEPENDS =  net/udns \
devel/libev \
devel/pcre
  
@@ -33,12 +29,12 @@ CONFIGURE_STYLE =	autoreconf

  AUTORECONF =  ./autogen.sh
  
  CONFIGURE_ARGS =	--disable-rpath

-CONFIGURE_ENV =CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
  
  post-install:

${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sniproxy
-   cd ${WRKSRC}; \
-  cp sniproxy.conf ${PREFIX}/share/examples/sniproxy
+   ${INSTALL_DATA} ${WRKSRC}/sniproxy.conf \
+   ${PREFIX}/share/examples/sniproxy
  
  .include 

blob - eb4e3707821a5330807784704349fab97c735dab
file + net/sniproxy/pkg/DESCR
--- net/sniproxy/pkg/DESCR
+++ net/sniproxy/pkg/DESCR
@@ -1,19 +1,12 @@
-SNIproxy - Proxies incoming HTTP and TLS connections based on the
-hostname contained in the initial request of the TCP session. This
-enables HTTPS name-based virtual hosting to separate backend servers
-without installing the private key on the proxy machine.
+Proxies incoming HTTP and TLS connections based on the hostname
+contained in the initial request of the TCP session without decrypting
+traffic. This enables HTTPS name-based virtual hosting to separate
+backend servers without installing the private key on the proxy machine.
  
-Features:

-
-Name-based proxying of HTTPS without decrypting traffic. No keys or
-certificates required.
-
-Supports both TLS and HTTP protocols.
-
-Supports IPv4, IPv6 and Unix domain sockets for both back end
+- Supports IPv4, IPv6 and Unix domain sockets for both back end
  servers and listeners.
  
-Supports multiple listening sockets per instance.

+- Supports multiple listening sockets per instance.
  
-Supports HAProxy proxy protocol to propagate original source address

-to backend servers.
+- Supports HAProxy protocol to propagate original source address to
+backend servers.
blob - 05ad720023af0204f35bdcea18f19b4d30af2b0e
file + net/sniproxy/pkg/PLIST
--- net/sniproxy/pkg/PLIST
+++ net/sniproxy/pkg/PLIST
@@ -1,9 +1,10 @@
  @comment $OpenBSD: PLIST,v$
-@newgroup _sniproxy:852
-@newuser _sniproxy:852:852:daemon:sniproxy daemon:/var/empty:/sbin/nologin
+@newgroup _sniproxy:853
+@newuser _sniproxy:853:853:daemon:sniproxy daemon:/var/empty:/sbin/nologin
  @rcscript ${RCDIR}/sniproxy
  @man man/man5/sniproxy.conf.5
  @man man/man8/sniproxy.8
  @bin sbin/sniproxy
  share/examples/sniproxy/
  share/examples/sniproxy/sniproxy.conf
+@sample ${SYSCONFDIR}/sniproxy.conf
blob - c3518a2e4a98c46864fd79e6de4f90d660b0a41e
file + net/sniproxy/pkg/sniproxy.rc
--- net/sniproxy/pkg/sniproxy.rc
+++ net/sniproxy/pkg/sniproxy.rc
@@ -3,6 +3,7 @@
  # $OpenBSD: rc.template,v 1.12 2018/01/11 19:30:18 rpe Exp $
  
  daemon="${TRUEPREFIX}/sbin/sniproxy"

+daemon_flags="-c ${SYSCONFDIR}/sniproxy.conf"
  
  . /etc/rc.d/rc.subr
  



sniproxy.tgz
Description: application/compressed-tar


smime.p7s
Description: S/MIME Cryptographic Signature


Re: do-install hook fails

2020-04-07 Thread Stuart Henderson
On 2020/04/07 18:23, putridsou...@gmail.com wrote:
> I'm trying import a package called tripwire. It calls a install-sh script 
> during
> "make fake" which requires user intervention to set some defaults, which can 
> be
> done later. To get around I added the following "do-install" part in the 
> Makefile
> ,but I get an error. I've read the do-install part of bsd.port.mk, It doesn't 
> mention
> anything related to an operator, besides I looked at another port, and the 
> do-install
> is similar. Please help me out.

Missing tabs.

> 
> *Makefile*
> # $OpenBSD: Makefile.template,v 1.87 2020/03/22 17:18:01 cwen Exp $
> #
> COMMENT=  contains programs used to verify the integrity of the files on 
> a given system   
> V=2.4.3.7
> DISTNAME= tripwire-open-source-${V}
> PKGNAME=  tripwire-${V}
> REVISION= 0
> CATEGORIES=   security
> # GPLv2
> PERMIT_PACKAGE=   Yes 
> MASTER_SITES= 
> https://github.com/Tripwire/tripwire-open-source/releases/download/${V}/
> CONFIGURE_STYLE=simple

Should use CONFIGURE_STYLE=gnu.

> CONFIGURE_ARGS=   --sysconfdir=/etc/tripwire
> do-install:
> # This package doesn't have a typical make ${INSTALL_TARGET}, so we do it by 
> hand.
> #  
> #create var/lib directories
> ${INSTALL_DATA_DIR} ${PREFIX}/var/db/tripwire
> ${INSTALL_DATA_DIR} ${PREFIX}/var/db/tripwire/report

${PREFIX} includes the /usr/local bit. Skip creating them here, just
@sample them in the PLIST.

> 
> #install bin/binaries
> ${INSTALL_SCRIPT} ${WRKSRC}/bin/siggen ${PREFIX}/usr/local/bin/

${PREFIX}/bin etc.

> ${INSTALL_SCRIPT} ${WRKSRC}/bin/tripwire ${PREFIX}/usr/local/bin/
> ${INSTALL_SCRIPT} ${WRKSRC}/bin/twadmin ${PREFIX}/usr/local/bin/
> ${INSTALL_SCRIPT} ${WRKSRC}/bin/twprint ${PREFIX}/usr/local/bin/
> 
> #copy install files for use by user after install, and fix a path
> ${INSTALL_DATA_DIR} ${WRKSRC}/usr/local/share/tripwire
> ${INSTALL_SCRIPT} ${WRKSRC}/installer/install.sh 
> ${PREFIX}/usr/local/share/tripwire/
> ${INSTALL_DATA} ${WRKSRC}/installer/install.cfg 
> ${PREFIX}/usr/local/share/tripwire/
> sed -i 's#./install/install.cfg#./install.cfg#' 
> ${PREFIX}/usr/local/share/tripwire/install.sh
> 
> #install man/man pages
> ${INSTALL_DATA} ${WRKSRC}/man/man4/*.4 ${PREFIX}/usr/local/share/man/man4/
> ${INSTALL_DATA} ${WRKSRC}/man/man5/*.5 ${PREFIX}/usr/local/share/man/man5/
> ${INSTALL_DATA} ${WRKSRC}/man/man8/*.8 ${PREFIX}/usr/local/share/man/man8/

${PREFIX}/man/manX/ (no "share").

> 
> #install configuration files
> ${INSTALL_DATA_DIR} ${PREFIX}/etc/tripwire
> ${INSTALL_DATA} ${WRKSRC}/policy/twpol-OpenBSD.txt  
> ${PREFIX}/etc/tripwire/twpol-OpenBSD.txt 
> 
> .include 
> 
> *Error*
> *** Parse error in /usr/ports/mystuff/security/tripwire: Need an operator in 
> '/var/db/tripwire' (Makefile:18)
> *** Parse error: Need an operator in '/var/db/tripwire/report' (Makefile:19)
> *** Parse error: Need an operator in '/usr/local/bin/' (Makefile:22)
> *** Parse error: Need an operator in '/usr/local/bin/' (Makefile:23)
> *** Parse error: Need an operator in '/usr/local/bin/' (Makefile:24)
> *** Parse error: Need an operator in '/usr/local/bin/' (Makefile:25)
> *** Parse error: Need an operator in '/usr/local/share/tripwire' (Makefile:28)
> *** Parse error: Need an operator in '/usr/local/share/tripwire/' 
> (Makefile:29)
> *** Parse error: Need an operator in '/usr/local/share/tripwire/' 
> (Makefile:30)
> *** Parse error: Need an operator in ''s' (Makefile:31)
> *** Parse error: Need an operator in '/usr/local/share/man/man4/' 
> (Makefile:34)
> *** Parse error: Need an operator in '/usr/local/share/man/man5/' 
> (Makefile:35)
> *** Parse error: Need an operator in '/usr/local/share/man/man8/' 
> (Makefile:36)
> *** Parse error: Need an operator in '/etc/tripwire' (Makefile:39)
> *** Parse error: Missing dependency operator (Makefile:40)
> 



do-install hook fails

2020-04-07 Thread putridsoul66
I'm trying import a package called tripwire. It calls a install-sh script during
"make fake" which requires user intervention to set some defaults, which can be
done later. To get around I added the following "do-install" part in the 
Makefile
,but I get an error. I've read the do-install part of bsd.port.mk, It doesn't 
mention
anything related to an operator, besides I looked at another port, and the 
do-install
is similar. Please help me out.

*Makefile*
# $OpenBSD: Makefile.template,v 1.87 2020/03/22 17:18:01 cwen Exp $
#
COMMENT=contains programs used to verify the integrity of the files on 
a given system   
V=  2.4.3.7
DISTNAME=   tripwire-open-source-${V}
PKGNAME=tripwire-${V}
REVISION=   0
CATEGORIES= security
# GPLv2
PERMIT_PACKAGE= Yes 
MASTER_SITES=   
https://github.com/Tripwire/tripwire-open-source/releases/download/${V}/
CONFIGURE_STYLE=simple
CONFIGURE_ARGS= --sysconfdir=/etc/tripwire
do-install:
# This package doesn't have a typical make ${INSTALL_TARGET}, so we do it by 
hand.
#  
#create var/lib directories
${INSTALL_DATA_DIR} ${PREFIX}/var/db/tripwire
${INSTALL_DATA_DIR} ${PREFIX}/var/db/tripwire/report

#install bin/binaries
${INSTALL_SCRIPT} ${WRKSRC}/bin/siggen ${PREFIX}/usr/local/bin/
${INSTALL_SCRIPT} ${WRKSRC}/bin/tripwire ${PREFIX}/usr/local/bin/
${INSTALL_SCRIPT} ${WRKSRC}/bin/twadmin ${PREFIX}/usr/local/bin/
${INSTALL_SCRIPT} ${WRKSRC}/bin/twprint ${PREFIX}/usr/local/bin/

#copy install files for use by user after install, and fix a path
${INSTALL_DATA_DIR} ${WRKSRC}/usr/local/share/tripwire
${INSTALL_SCRIPT} ${WRKSRC}/installer/install.sh 
${PREFIX}/usr/local/share/tripwire/
${INSTALL_DATA} ${WRKSRC}/installer/install.cfg 
${PREFIX}/usr/local/share/tripwire/
sed -i 's#./install/install.cfg#./install.cfg#' 
${PREFIX}/usr/local/share/tripwire/install.sh

#install man/man pages
${INSTALL_DATA} ${WRKSRC}/man/man4/*.4 ${PREFIX}/usr/local/share/man/man4/
${INSTALL_DATA} ${WRKSRC}/man/man5/*.5 ${PREFIX}/usr/local/share/man/man5/
${INSTALL_DATA} ${WRKSRC}/man/man8/*.8 ${PREFIX}/usr/local/share/man/man8/

#install configuration files
${INSTALL_DATA_DIR} ${PREFIX}/etc/tripwire
${INSTALL_DATA} ${WRKSRC}/policy/twpol-OpenBSD.txt  
${PREFIX}/etc/tripwire/twpol-OpenBSD.txt 

.include 

*Error*
*** Parse error in /usr/ports/mystuff/security/tripwire: Need an operator in 
'/var/db/tripwire' (Makefile:18)
*** Parse error: Need an operator in '/var/db/tripwire/report' (Makefile:19)
*** Parse error: Need an operator in '/usr/local/bin/' (Makefile:22)
*** Parse error: Need an operator in '/usr/local/bin/' (Makefile:23)
*** Parse error: Need an operator in '/usr/local/bin/' (Makefile:24)
*** Parse error: Need an operator in '/usr/local/bin/' (Makefile:25)
*** Parse error: Need an operator in '/usr/local/share/tripwire' (Makefile:28)
*** Parse error: Need an operator in '/usr/local/share/tripwire/' (Makefile:29)
*** Parse error: Need an operator in '/usr/local/share/tripwire/' (Makefile:30)
*** Parse error: Need an operator in ''s' (Makefile:31)
*** Parse error: Need an operator in '/usr/local/share/man/man4/' (Makefile:34)
*** Parse error: Need an operator in '/usr/local/share/man/man5/' (Makefile:35)
*** Parse error: Need an operator in '/usr/local/share/man/man8/' (Makefile:36)
*** Parse error: Need an operator in '/etc/tripwire' (Makefile:39)
*** Parse error: Missing dependency operator (Makefile:40)



Re: [NEW] net/sniproxy 0.6.0

2020-04-07 Thread Stuart Henderson
Here's a diff with some fixes/tidying on top. (-c used in rc script
because the default path is a hardcoded /etc and it's easier to do this
than patch+SUBST_CMD :)

diff b7a3662a673d3be3318e448e144b808cc0159d8f /usr/ports/mystuff
blob - f5412a15261fab82c2ec2bbe9a9630896e3e95a4
file + net/sniproxy/Makefile
--- net/sniproxy/Makefile
+++ net/sniproxy/Makefile
@@ -12,18 +12,14 @@ HOMEPAGE =  https://github.com/dlundquist/sniproxy
 
 MAINTAINER =   Renaud Allard 
 
-# BSD2CLAUSE
+# BSD
 PERMIT_PACKAGE = Yes
 
-WANTLIB += c
+WANTLIB += c ev pcre udns
 
-# Dependencies
-BUILD_DEPENDS =net/udns \
-   devel/libev \
-   devel/pcre \
-   devel/gettext,-tools
+BUILD_DEPENDS =devel/gettext,-tools
 
-RUN_DEPENDS =  net/udns \
+LIB_DEPENDS =  net/udns \
devel/libev \
devel/pcre
 
@@ -33,12 +29,12 @@ CONFIGURE_STYLE =   autoreconf
 AUTORECONF =   ./autogen.sh
 
 CONFIGURE_ARGS =   --disable-rpath
-CONFIGURE_ENV =CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sniproxy
-   cd ${WRKSRC}; \
-  cp sniproxy.conf ${PREFIX}/share/examples/sniproxy
+   ${INSTALL_DATA} ${WRKSRC}/sniproxy.conf \
+   ${PREFIX}/share/examples/sniproxy
 
 .include 
blob - eb4e3707821a5330807784704349fab97c735dab
file + net/sniproxy/pkg/DESCR
--- net/sniproxy/pkg/DESCR
+++ net/sniproxy/pkg/DESCR
@@ -1,19 +1,12 @@
-SNIproxy - Proxies incoming HTTP and TLS connections based on the
-hostname contained in the initial request of the TCP session. This
-enables HTTPS name-based virtual hosting to separate backend servers
-without installing the private key on the proxy machine.
+Proxies incoming HTTP and TLS connections based on the hostname
+contained in the initial request of the TCP session without decrypting
+traffic. This enables HTTPS name-based virtual hosting to separate
+backend servers without installing the private key on the proxy machine.
 
-Features:
-
-Name-based proxying of HTTPS without decrypting traffic. No keys or
-certificates required.
-
-Supports both TLS and HTTP protocols.
-
-Supports IPv4, IPv6 and Unix domain sockets for both back end
+- Supports IPv4, IPv6 and Unix domain sockets for both back end
 servers and listeners.
 
-Supports multiple listening sockets per instance.
+- Supports multiple listening sockets per instance.
 
-Supports HAProxy proxy protocol to propagate original source address
-to backend servers.
+- Supports HAProxy protocol to propagate original source address to
+backend servers.
blob - 05ad720023af0204f35bdcea18f19b4d30af2b0e
file + net/sniproxy/pkg/PLIST
--- net/sniproxy/pkg/PLIST
+++ net/sniproxy/pkg/PLIST
@@ -1,9 +1,10 @@
 @comment $OpenBSD: PLIST,v$
-@newgroup _sniproxy:852
-@newuser _sniproxy:852:852:daemon:sniproxy daemon:/var/empty:/sbin/nologin
+@newgroup _sniproxy:853
+@newuser _sniproxy:853:853:daemon:sniproxy daemon:/var/empty:/sbin/nologin
 @rcscript ${RCDIR}/sniproxy
 @man man/man5/sniproxy.conf.5
 @man man/man8/sniproxy.8
 @bin sbin/sniproxy
 share/examples/sniproxy/
 share/examples/sniproxy/sniproxy.conf
+@sample ${SYSCONFDIR}/sniproxy.conf
blob - c3518a2e4a98c46864fd79e6de4f90d660b0a41e
file + net/sniproxy/pkg/sniproxy.rc
--- net/sniproxy/pkg/sniproxy.rc
+++ net/sniproxy/pkg/sniproxy.rc
@@ -3,6 +3,7 @@
 # $OpenBSD: rc.template,v 1.12 2018/01/11 19:30:18 rpe Exp $
 
 daemon="${TRUEPREFIX}/sbin/sniproxy"
+daemon_flags="-c ${SYSCONFDIR}/sniproxy.conf"
 
 . /etc/rc.d/rc.subr
 



Re: UPDATE: libdvdread / libdvdnav 6.1.0

2020-04-07 Thread Stuart Henderson
On 2020/04/07 05:44, Brad Smith wrote:
> On Mon, Mar 23, 2020 at 01:33:04PM -0400, Brad Smith wrote:
> > Here are updates to libdvdread and libdvdnav 6.1.0.
> 
> Updated to libdvdread 6.1.1. No change at all as it only includes the
> missing major bump from 6.1.0.

Portswise OK for both, but I have no way to do runtime tests.



Re: [NEW] net/sniproxy 0.6.0

2020-04-07 Thread Renaud Allard

On 4/7/20 7:22 AM, Bjorn Ketelaars wrote:

On Mon 06/04/2020 10:47, Renaud Allard wrote:

Hello,
Here is a port of sniproxy 0.6.0

It does Name-based proxying of HTTPS without decrypting traffic. It's quite
lighter than some other alternatives when you only need this feature.

Any comments? OK?


Upstream has a branch, which provides OpenBSD-specific bits:
https://github.com/dlundquist/sniproxy/tree/openbsd.
Did you know about this branch? If so, why are your patches better?




Hi,

I didn't notice that branch. It's marked as stale, but I suppose it 
won't need huge changes any time soon as it defines all the STAIL_* 
functions. I don't know if my patch is better or not, but I have been 
testing sniproxy with HD streaming with my patch and didn't get any 
problems. And my patch avoids redefining functions OpenBSD choose to not 
have.

All the m4 stuff is not really needed as it's handled within the CFLAGS.

So, honestly, I don't know which one is best, what is your opinion?

Concerning the failed test, it seems it's in the regex handler for the 
tables. But I must admit I don't know why it fails with a core dump and 
I have been using regexes in my config without issues.


I have attached here a corrected version with all your suggestions 
(apart from the patches).


Thanks


sniproxy.tgz
Description: application/compressed-tar


smime.p7s
Description: S/MIME Cryptographic Signature


Re: UPDATE: libdvdread / libdvdnav 6.1.0

2020-04-07 Thread Brad Smith
On Mon, Mar 23, 2020 at 01:33:04PM -0400, Brad Smith wrote:
> Here are updates to libdvdread and libdvdnav 6.1.0.

Updated to libdvdread 6.1.1. No change at all as it only includes the
missing major bump from 6.1.0.


Index: devel/libdvdread/Makefile
===
RCS file: /home/cvs/ports/devel/libdvdread/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- devel/libdvdread/Makefile   21 Mar 2020 18:58:07 -  1.31
+++ devel/libdvdread/Makefile   7 Apr 2020 09:36:52 -
@@ -2,13 +2,13 @@
 
 COMMENT =  accessing DVD files
 
-VER =  6.0.2
+VER =  6.1.1
 DISTNAME = libdvdread-${VER}
 CATEGORIES =   devel
 MASTER_SITES = https://download.videolan.org/pub/videolan/libdvdread/${VER}/
 EXTRACT_SUFX = .tar.bz2
 
-SHARED_LIBS =  dvdread 8.0
+SHARED_LIBS =  dvdread 9.0
 
 HOMEPAGE = http://dvdnav.mplayerhq.hu/
 
Index: devel/libdvdread/distinfo
===
RCS file: /home/cvs/ports/devel/libdvdread/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- devel/libdvdread/distinfo   21 Mar 2020 18:58:07 -  1.13
+++ devel/libdvdread/distinfo   7 Apr 2020 09:38:13 -
@@ -1,2 +1,2 @@
-SHA256 (libdvdread-6.0.2.tar.bz2) = 
+RQBryE7IZzd4ktGxQpX8pMB/rf5ZWePHX7UYyzG/rA=
-SIZE (libdvdread-6.0.2.tar.bz2) = 405298
+SHA256 (libdvdread-6.1.1.tar.bz2) = 
PjVzCaF8W+NzE4W56r2mt+P6AQ9GAioG8QRVO/jiF5Y=
+SIZE (libdvdread-6.1.1.tar.bz2) = 392134
Index: devel/libdvdread/patches/patch-src_dvd_input_c
===
RCS file: /home/cvs/ports/devel/libdvdread/patches/patch-src_dvd_input_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_dvd_input_c
--- devel/libdvdread/patches/patch-src_dvd_input_c  1 May 2019 03:51:17 
-   1.4
+++ devel/libdvdread/patches/patch-src_dvd_input_c  23 Mar 2020 16:22:43 
-
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_dvd_input_c,v 1.4 20
 Index: src/dvd_input.c
 --- src/dvd_input.c.orig
 +++ src/dvd_input.c
-@@ -282,7 +282,7 @@ int dvdinput_setup(void)
+@@ -324,7 +324,7 @@ int dvdinput_setup(void *priv, dvd_logger_cb *logcb)
  #elif defined(__OS2__)
#define CSS_LIB "dvdcss2.dll"
  #else
Index: devel/libdvdread/pkg/PLIST
===
RCS file: /home/cvs/ports/devel/libdvdread/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- devel/libdvdread/pkg/PLIST  1 May 2019 03:51:17 -   1.8
+++ devel/libdvdread/pkg/PLIST  23 Mar 2020 16:34:22 -
@@ -10,7 +10,7 @@ include/dvdread/nav_print.h
 include/dvdread/nav_read.h
 include/dvdread/nav_types.h
 include/dvdread/version.h
-lib/libdvdread.a
+@static-lib lib/libdvdread.a
 lib/libdvdread.la
 @lib lib/libdvdread.so.${LIBdvdread_VERSION}
 lib/pkgconfig/dvdread.pc
Index: multimedia/libdvdnav/Makefile
===
RCS file: /home/cvs/ports/multimedia/libdvdnav/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- multimedia/libdvdnav/Makefile   21 Mar 2020 18:58:07 -  1.27
+++ multimedia/libdvdnav/Makefile   7 Apr 2020 09:39:39 -
@@ -2,23 +2,23 @@
 
 COMMENT=   DVD navigation library
 
-VER=   6.0.1
+VER=   6.1.0
 DISTNAME=  libdvdnav-${VER}
 EPOCH= 0
 CATEGORIES=multimedia
 MASTER_SITES=  https://download.videolan.org/pub/videolan/libdvdnav/${VER}/
 EXTRACT_SUFX=  .tar.bz2
 
-SHARED_LIBS=   dvdnav  7.1
+SHARED_LIBS=   dvdnav  7.2
 
 HOMEPAGE=  http://dvdnav.mplayerhq.hu/
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   dvdread>=8.0 pthread
+WANTLIB=   dvdread>=9.0 pthread
 
-LIB_DEPENDS=   devel/libdvdread>=6.0.2
+LIB_DEPENDS=   devel/libdvdread>=6.1.1
 
 CONFIGURE_STYLE= gnu
 
Index: multimedia/libdvdnav/distinfo
===
RCS file: /home/cvs/ports/multimedia/libdvdnav/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- multimedia/libdvdnav/distinfo   21 Mar 2020 18:58:07 -  1.11
+++ multimedia/libdvdnav/distinfo   23 Mar 2020 16:31:06 -
@@ -1,2 +1,2 @@
-SHA256 (libdvdnav-6.0.1.tar.bz2) = 5WajlvGVABcIi/12A5WwVl20QjQZWtpUEzZsnSOSZzM=
-SIZE (libdvdnav-6.0.1.tar.bz2) = 378491
+SHA256 (libdvdnav-6.1.0.tar.bz2) = 9pexXqn3Xp82vfbsNyYwgWnxVOKx6Zhl0LvoI3IM7ls=
+SIZE (libdvdnav-6.1.0.tar.bz2) = 370145
Index: multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in
===
RCS file: /home/cvs/ports/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-misc_dvdnav_pc_in
--- multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in21 Mar 2020 
18:58:07 -  1.4
+++ multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in23 Mar 2020 
16:32:26 -00

[UPDATE] math/abs

2020-04-07 Thread putridsoul66
Update math/abs 0.8 -> 0.908

Index: Makefile
===
RCS file: /cvs/ports/math/abs/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 21:02:23 -  1.20
+++ Makefile7 Apr 2020 09:21:30 -
@@ -2,16 +2,18 @@
 
 COMMENT=   free spreadsheet with graphical user interface
 
-DISTNAME=  abs-src-0.8
-PKGNAME=   ${DISTNAME:S/-src//}
-REVISION=  5
+DISTNAME=  abs-src-0908
+PKGNAME=   ${DISTNAME:S/-src-0908/-0.908/}
+REVISION=  0
 CATEGORIES=math
 
 PERMIT_PACKAGE=Yes
 WANTLIB=   X11 Xaw Xext Xmu Xpm Xt c>=35 m
 
-MASTER_SITES=  http://www.ping.be/bertin/
+MASTER_SITES=   http://utenti.gufi.org/~gmarco/files/distfiles/ \
+http://fresh.t-systems-sfr.com/unix/src/privat2/
 
+WRKDIST=   ${WRKDIR}/abs-src-0.908
 NO_TEST=   Yes
 
 do-install:
Index: distinfo
===
RCS file: /cvs/ports/math/abs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:14:26 -  1.4
+++ distinfo7 Apr 2020 09:21:30 -
@@ -1,2 +1,2 @@
-SHA256 (abs-src-0.8.tar.gz) = eqAvRsSmIfLVLqfum3iinCs2MA2pakFO8i2UhTrdEpg=
-SIZE (abs-src-0.8.tar.gz) = 287965
+SHA256 (abs-src-0908.tar.gz) = iaUlMO85/Rxk+o6ifCmp3d4eZE5D56w7FtlONMSH+V4=
+SIZE (abs-src-0908.tar.gz) = 314891
Index: patches/patch-ABV_io_c
===
RCS file: /cvs/ports/math/abs/patches/patch-ABV_io_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ABV_io_c
--- patches/patch-ABV_io_c  23 Feb 2002 23:32:31 -  1.1
+++ patches/patch-ABV_io_c  7 Apr 2020 09:21:30 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-ABV_io_c,v 1.1 2002/02/23 23:32:31 pvalchev Exp $
 --- ABV/io.c.orig  Wed Nov 15 14:09:54 2000
 +++ ABV/io.c   Sat Feb 23 16:26:54 2002
-@@ -178,7 +178,7 @@ obj io_input (int unit)
+@@ -199,7 +199,7 @@ obj io_input (int unit)
obj o;
FILE *fp;
char buf[256];
Index: patches/patch-Database_cell_c
===
RCS file: /cvs/ports/math/abs/patches/patch-Database_cell_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Database_cell_c
--- patches/patch-Database_cell_c   3 Apr 2005 16:14:44 -   1.1
+++ patches/patch-Database_cell_c   7 Apr 2020 09:21:30 -
@@ -1,51 +1,38 @@
-$OpenBSD: patch-Database_cell_c,v 1.1 2005/04/03 16:14:44 espie Exp $
 Database/cell.c.orig   Sun Apr  3 18:06:33 2005
-+++ Database/cell.cSun Apr  3 18:07:48 2005
-@@ -1306,47 +1306,6 @@ copymod3 (cell1, cell2, incr)
-   return 0;
+--- Database/cell.c.orig   Wed Nov 15 22:10:42 2000
 Database/cell.cSun Apr  3 18:06:11 2005
+@@ -1456,7 +1456,7 @@ tolower (char *s)
  }
  
--char *
--tolower (char *s)
--{
--  int j;
--  int len;
--  len = strlen (s);
--  for (j = 0; j < len; j++)
--if (s[j] >= 'A' && s[j] <= 'Z')
--  s[j] = 'a' + s[j] - 'A';
--  return s;
--}
--
--char *
+ char *
 -strcasestr (char *str1, char *str2)
--{
--  char *s1;
--  char *s2;
--  char *pos = NULL;
--  int l1;
--  s1 = strdup (str1);
--  if (s1 == NULL)
--return NULL;
--  s2 = strdup (str2);
--  if (s2 == NULL)
--{
--  free (s1);
--  return NULL;
--}
--
--  tolower (s1);
--  tolower (s2);
--  pos = strstr (s1, s2);
--  l1 = pos - s1;
--  free (s1);
--  free (s2);
--  if (pos == NULL)
--return NULL;
--
--  return str1 + l1;
--}
--
- int
- cell_chgwksname (Cell * cell, char *oldname, char *newname)
++trcasestr (char *str1, char *str2)
  {
+   char *s1;
+   char *s2;
+@@ -1504,7 +1464,7 @@ cell_chgwksname (Cell * cell, char *oldname, char *new
+ return -1;
+   if (!strcmp (oldname, newname))
+ return 0;
+-  if (strcasestr (cell->formula, oldname) == NULL)
++  if (trcasestr (cell->formula, oldname) == NULL)
+ return 0;
+ 
+   
+@@ -1512,7 +1472,7 @@ cell_chgwksname (Cell * cell, char *oldname, char *new
+   old = absmalloc ((strlen (oldname) + 2) * sizeof (char), 
"cell_chgwksname:old");
+   sprintf (old, "%s!", oldname);
+ 
+-  pos = strcasestr (cell->formula, old);
++  pos = trcasestr (cell->formula, old);
+   while (pos != NULL)
+ {
+   len = strlen (cell->formula);
+@@ -1523,7 +1483,7 @@ cell_chgwksname (Cell * cell, char *oldname, char *new
+   sprintf (newformula, "%s%s%s", cell->formula, newname, end);
+   absfree (cell->formula, "cell_chgwksname:cell->formula");
+   cell->formula = newformula;
+-  end = strcasestr (cell->formula, old);
++  end = trcasestr (cell->formula, old);
+   if (end > cell->formula + i)
+   pos = end;
+   else
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/math/abs/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  3 Apr 2005 16:14:44 -   1.2