CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/09/13 23:52:25

Modified files:
sysutils/u-boot: Makefile distinfo 
Removed files:
sysutils/u-boot/patches: patch-board_kosagi_novena_novena_c 
 patch-board_solidrun_mx6cuboxi_mx6cuboxi_c 
 patch-common_image-fit_c 
 patch-include_compiler_h 
 patch-include_configs_cm_fx6_h 

Log message:
update to U-Boot 2016.09

Remove patches to set board ids on novena and cubox/hummingboard we no
longer require.  Also remove some OpenBSD build fix patches that were
accepted upstream and the cm-fx6/utilite distro_bootcmd patch which
no longer cleanly applies.

Tested on CuBox-i4Pro, BeagleBone Black and PandaBoard ES.

[UPDATE] plan9/u9fs: update maintainer e-mail

[stanley lieber]

‎Moving away from Google services. Could someone please finally commit
this change?
Thanks,

sl


Index: Makefile
===
RCS file: /cvs/ports/plan9/u9fs/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 11 Mar 2013 11:37:53 - 1.2
+++ Makefile 14 Sep 2016 04:43:17 -
@@ -9,7 +9,7 @@ MASTER_SITES= http://plan9.bell-labs.com
http://openbsd.stanleylieber.com/u9fs/
EXTRACT_SUFX= -src.tgz

-MAINTAINER= Stanley Lieber 
+MAINTAINER= Stanley Lieber 

# MIT
PERMIT_PACKAGE_CDROM= Yes
cvs server: Diffing patches
cvs server: Diffing pkg

[update] games/stone-soup

[Henrique N. Lengler]

Hi,

This is a update to games/stone-soup to the latest version.

I'm not too experienced on porting.
I uncommented the BROKEN lines, but I didn't test if there still problems since
I don't have that hardware, so there will be need for testing.

I only tested on amd64 and it is working well, both x11 an no_x11.

Patch attached;
diff -u -p -N -r /usr/ports/games/stone-soup/Makefile 
/usr/ports/mystuff/games/stone-soup/Makefile
--- /usr/ports/games/stone-soup/MakefileFri Dec  4 18:47:53 2015
+++ /usr/ports/mystuff/games/stone-soup/MakefileWed Sep 14 01:42:54 2016
@@ -1,14 +1,11 @@
 # $OpenBSD: Makefile,v 1.23 2015/12/04 20:47:53 landry Exp $
 
-BROKEN-hppa =  ICE on dgn-shoals.cc:638
-BROKEN-arm=tilegen.elf loops burning cpu
-
 COMMENT =  dungeon crawl stone soup
 CATEGORIES =   games
 
 HOMEPAGE = http://crawl.develz.org/
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=crawl-ref/}
-VERSION =  0.15.2
+MASTER_SITES = http://crawl.develz.org/release/
+VERSION =  0.18.1
 DISTNAME=  stone_soup-${VERSION}-nodeps
 EXTRACT_SUFX=  .tar.xz
 PKGNAME=   stone-soup-${VERSION}
@@ -17,35 +14,31 @@ REVISION=   0
 WRKDIST =  ${WRKDIR}/stone_soup-${VERSION}
 WRKSRC =   ${WRKDIST}/source
 USE_GMAKE =Yes
-CFLAGS +=  "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL"
-CXXFLAGS +="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL"
-MAKE_FLAGS =   CC="${CC}" CXX="${CXX}" \
+CFLAGS +=  "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2"
+CXXFLAGS +="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2"
+MAKE_FLAGS =   CC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}" \
LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
LUA_LIB=${MODLUA_LIB} \
SQLITE_INCLUDE_DIR=/usr/include \
LDFLAGS=-L${LOCALBASE}/lib \
INSTALL_UGRP=root:wheel \
prefix=${PREFIX} \
-   SAVEDIR="~/.crawl" \
-   PROPORTIONAL_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf" 
\
-   
MONOSPACED_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSansMono.ttf" \
NO_YACC=1 \
-   V=1
+   SAVEDIR="~/.crawl"
 
 MAKE_ENV +=MODLUA_DEP_VERSION=${MODLUA_DEP_VERSION}
 MODGCC4_ARCHS = *
 MODGCC4_LANGS = c++
 MODULES =  gcc4 lang/lua
+MODLUA_VERSION =5.1
 WANTLIB =  c m ${MODLUA_WANTLIB} sqlite3
 
-BUILD_DEPENDS = devel/bison \
-   graphics/pngcrush
+BUILD_DEPENDS = graphics/pngcrush
 
-# Almost nethack...
-PERMIT_PACKAGE_FTP =   Yes
-PERMIT_PACKAGE_CDROM = No gain
+# License GPLv2+
+PERMIT_PACKAGE_CDROM = Yes
 
-FLAVORS =  no_x11
+FLAVORS =   no_x11
 FLAVOR ?=
 
 .if ${FLAVOR:Mno_x11}
@@ -57,12 +50,11 @@ CFLAGS +=   -DUSE_TILE
 CXXFLAGS +=-DUSE_TILE
 
 MAKE_FLAGS +=  TILES=y \
-   YACC=yacc \
-   LDFLAGS="-L${LOCALBASE}/lib -lSDL -lSDL_image -lpng -pthread"
-WANTLIB += GL GLU SDL SDL_image freetype png pthread z
+   LDFLAGS="-L${LOCALBASE}/lib -lSDL2 -lSDL2_image -lpng -pthread"
+WANTLIB += GL GLU SDL2 SDL2_image freetype png pthread z
 RUN_DEPENDS =  devel/desktop-file-utils
-LIB_DEPENDS += devel/sdl \
-   devel/sdl-image \
+LIB_DEPENDS += devel/sdl2 \
+   devel/sdl2-image \
graphics/png
 .endif
 
@@ -70,13 +62,12 @@ post-install:
mv ${PREFIX}/bin/crawl ${PREFIX}/bin/crawl-ss
chmod 755 ${PREFIX}/bin/crawl-ss
${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6
-   ${INSTALL_DATA} ${WRKDIST}/README.txt ${PREFIX}/share/crawl/docs
 .if ! ${FLAVOR:Mno_x11}
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${PREFIX}/share/applications
${INSTALL_DATA} \
${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \
${PREFIX}/share/pixmaps/stone-soup.png
-   ${INSTALL_DATA} ${FILESDIR}/stone-soup.desktop \
+   ${INSTALL_DATA} ${WRKDIST}/source/debian/crawl-tiles.desktop \
${PREFIX}/share/applications
 .endif
 
diff -u -p -N -r /usr/ports/games/stone-soup/distinfo 
/usr/ports/mystuff/games/stone-soup/distinfo
--- /usr/ports/games/stone-soup/distinfoTue Apr  7 07:10:28 2015
+++ /usr/ports/mystuff/games/stone-soup/distinfoTue Sep 13 01:52:37 2016
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.15.2-nodeps.tar.xz) = 
6TqCiAgB+2B5TJwFzLqwPVx+HxBeWWjSzrx2DTh6IeI=
-SIZE (stone_soup-0.15.2-nodeps.tar.xz) = 8979684
+SHA256 (stone_soup-0.18.1-nodeps.tar.xz) = 
S9rXd4+IqZRwxyX/dKgUW91gAy+a5Izll/dLiueE2FA=
+SIZE (stone_soup-0.18.1-nodeps.tar.xz) = 9716104
diff -u -p -N -r /usr/ports/games/stone-soup/patches/patch-source_Makefile 
/usr/ports/mystuff/games/stone-soup/patches/patch-source_Makefile
--- /usr/ports/games/stone-soup/patches/patch-source_Makefile   Tue Apr  7 
07:10:28 2015
+++ /usr/ports/mystuff/games/stone-soup/patches/patch-source_Makefile   Tue Sep 
13 11:32:35 2016
@@ -1,23 +1,25 @@
-$OpenBSD: 

security/snort2pf does not show table entries from pf

[Dave Peter]

Good day.

I am running OpenBSD 6.0 GENERIC.MP#2319 amd64 and have followed instructions 
from pkg-readmes for
snort-2.9.8.2 and snort2pf-4.5p2.

I can verify snort & snort2pf running -
# ps aux | grep snort
_snort   45480  0.0  0.2 562640 14292 ??  Ss 8:38AM0:00.42 /usr/local/bi
root 21193  0.0  0.0   336  1252 p0  S+p8:59AM0:00.00 grep snort
root 75674  0.0  0.1  4780  9980 C0- S  8:38AM0:00.33 perl: snort2p

Here is my table entry as per snort2pf README -

# pfctl -sr | head -n 4
block drop in quick on re0 from  to any
block drop in quick on re0 from  to any
block drop in quick from  to any
block drop quick from  to any

When I try to check entries in snort2pf with 'pfctl -t snort2pf -T show' it 
says table does not exist.

# pfctl -t snort2pf -T show
pfctl: Table does not exist.

Even if the entries are 0 in snort2pf table there shouldn't be an error like 
table does not exist.

Please let me know whether it is a default behaviour of the program or I messed 
it up.

Re: lftp man page broken

[Ingo Schwarze]

Hi,

Jiri B wrote on Tue, Sep 13, 2016 at 05:49:35PM -0400:
> On Tue, Sep 13, 2016 at 11:25:56PM +0200, Rafael Sadowski wrote:

>> $ man -w lftp
>> /usr/local/man/man1/lftp.1

> I have no idea why this differs:
> 
> $ pkg_info -L lftp | grep man
> /usr/local/man/cat1/lftp.0
> /usr/local/man/cat1/lftpget.0
> /usr/local/man/cat5/lftp.conf.0
> 
> jirib:/home/jirib
> $ grep man cvs/openbsd-ports/net/lftp/pkg/PLIST
> @man man/man1/lftp.1
> @man man/man1/lftpget.1
> @man man/man5/lftp.conf.5

Any sufficiently espied technology is indistinguishable from magic.

http://man.openbsd.org/bsd.port.mk

look for USE_GROFF

documentation is terse, so RTFS:

http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm?rev=HEAD

look at package OpenBSD::PackingElement::Manpage, makesum_plist()

http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.sbin/pkg_add/OpenBSD/PackingElement.pm?rev=HEAD

look at source_to_dest() and format()

Yours,
  Ingo

Re: openvpn broken caused by a change in route add and delete

[Stuart Henderson]

There's clearly some problem, others have seen breakage too, but I don't 
see why replacing -netmask to /prefix would change anything..



On 13 September 2016 22:35:54 Sander van Kranenburg  
wrote:



Hi,

GMBL so it's probably my vpn provider that doesn't work with 6.0.
Thx for your time and the great support.

Best regards,

Sander van Kranenburg

-Oorspronkelijk bericht-
Van: Stuart Henderson [mailto:s...@spacehopper.org]
Verzonden: dinsdag 13 september 2016 23:26
Aan: Sander van Kranenburg 
CC: ports@openbsd.org
Onderwerp: Re: openvpn broken caused by a change in route add and delete

On 2016/09/13 21:20, Sander van Kranenburg wrote:

Hi,

Are you at openbsd 6.0 at the moment?
This is my uname -a OpenBSD openbsd.HOME.local 6.0 GENERIC#0 i386.
-netmask doesn't work at all for me since i updated tot 6.0


-current from a few days ago, but I just also tested it on 6.0 release.



Van: Stuart Henderson [mailto:s...@spacehopper.org]
Verzonden: dinsdag 13 september 2016 23:07
Aan: Sander van Kranenburg 
CC: ports@openbsd.org
Onderwerp: Re: openvpn broken caused by a change in route add and
delete

On 2016/09/13 19:29, Sander van Kranenburg wrote:
> Hi,
>
> As far as i know -netmask doesn't work anymore.
> We need to add the netbits tot the network adres like openvpn is doing 
with ipv6.


-netmask is expected to work exactly the same as specifying ip/prefix, and 
it does work fine here:


# route add -net 192.0.2.0 82.68.199.133 -netmask 255.255.255.0 add net 
192.0.2.0: gateway 82.68.199.133 # netstat -rnfinet | grep ^192

192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
# route delete -net 192.0.2.0 -netmask 255.255.255.0 delete net
192.0.2.0 # netstat -rnfinet | grep ^192 #

Exactly the same behaviour as the prefix:

# route add 192.0.2.0/24 82.68.199.133 add net 192.0.2.0/24: gateway
82.68.199.133 # netstat -rnfinet | grep ^192
192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
# route delete 192.0.2.0/24
delete net 192.0.2.0/24
# netstat -rnfinet | grep ^192
#

I think the problem you ran into was something to do with the gateway 
address, handling of this *was* changed relatively recently, and not the 
syntax of address format to route(8).

CVS: cvs.openbsd.org: ports

[Robert Peichaer]

CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2016/09/13 16:38:14

Modified files:
editors/vim: Makefile 
editors/vim/patches: patch-runtime_syntax_fstab_vim 

Log message:
Add the new 'noperm' mount option to the fstab syntax file.

OK sthen

Re: New: graphics/gimp/deskew

[Giovanni Bechis]

On Mon, Sep 12, 2016 at 05:28:19PM +0200, Dmitrij D. Czarkoff wrote:
> Hi!
> 
> From pkg/DESCR:
> 
> | Deskew, or auto straighten, is the automatic rotation of an image such
> | that the text is vertically aligned. This is great for cleaning up
> | scanned documents.
> | 
> | Plugin is accessible via Layer => Transform => Deskew.
> 
> I want this port in ports collection because the original website for
> the plugin is long offline, and the fork this port is based on is not
> very easy to find (at least when GIMP plugin index malfunctions, which
> seems to happen frequently.)
> 
> Comments?  OKs?
> 
added a couple of patches to fix regression tests (xgettext not properly 
detected) and to remove debug messages.
Other that that ok giovanni@
 Cheers
  Giovanni
> (The port is available in openbsd-wip, so suggestions are *also*
> accepted there in form of new revisions.)
> 
> --
> Dmitrij D. Czarkoff




gimp-deskew-plugin-0.0.20141025.tgz
Description: application/tar-gz

Re: lftp man page broken

[Rafael Sadowski]

On Tue Sep 13, 2016 at 05:49:35PM -0400, Jiri B wrote:
> On Tue, Sep 13, 2016 at 11:25:56PM +0200, Rafael Sadowski wrote:
> > I know of no Jiri B's "/usr/local/man/cat1/lftp.0"! man(1) shows me:
> > 
> > $ man -w lftp
> > /usr/local/man/man1/lftp.1
> 
> I have no idea why this differs:
> 
> $ pkg_info -L lftp | grep man
> /usr/local/man/cat1/lftp.0
> /usr/local/man/cat1/lftpget.0
> /usr/local/man/cat5/lftp.conf.0

Your man pages are from lftp 4.1.2.

Added (version 1.24, 2011/01/04 10:32:39)

http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/lftp/pkg/PLIST.diff?r1=1.23=1.24=h

and removed (version 1.25, 2011/05/04 00:59:30) lftp 4.2.3

http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/lftp/pkg/PLIST.diff?r1=1.24=1.25=h

Re: lftp man page broken

[Jiri B]

On Tue, Sep 13, 2016 at 11:25:56PM +0200, Rafael Sadowski wrote:
> I know of no Jiri B's "/usr/local/man/cat1/lftp.0"! man(1) shows me:
> 
> $ man -w lftp
> /usr/local/man/man1/lftp.1

I have no idea why this differs:

$ pkg_info -L lftp | grep man
/usr/local/man/cat1/lftp.0
/usr/local/man/cat1/lftpget.0
/usr/local/man/cat5/lftp.conf.0

jirib:/home/jirib
$ grep man cvs/openbsd-ports/net/lftp/pkg/PLIST
@man man/man1/lftp.1
@man man/man1/lftpget.1
@man man/man5/lftp.conf.5

$ pkg_info lftp | head -n1
Information for inst:lftp-4.7.3

j.

CVS: cvs.openbsd.org: ports

[T . J . Townsend]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2016/09/13 15:36:48

Modified files:
net/dnscrypt-proxy: Makefile 
net/dnscrypt-proxy/pkg: DESCR-main README-main 

Log message:
add information on running multiple instances to the readme file, clean up
pkg description, switch homepage and master_sites to https.

ok sthen

Re: openvpn broken caused by a change in route add and delete

[Sander van Kranenburg]

Hi,

GMBL so it's probably my vpn provider that doesn't work with 6.0.
Thx for your time and the great support.

Best regards,

Sander van Kranenburg

-Oorspronkelijk bericht-
Van: Stuart Henderson [mailto:s...@spacehopper.org] 
Verzonden: dinsdag 13 september 2016 23:26
Aan: Sander van Kranenburg 
CC: ports@openbsd.org
Onderwerp: Re: openvpn broken caused by a change in route add and delete

On 2016/09/13 21:20, Sander van Kranenburg wrote:
> Hi,
> 
> Are you at openbsd 6.0 at the moment?
> This is my uname -a OpenBSD openbsd.HOME.local 6.0 GENERIC#0 i386.
> -netmask doesn't work at all for me since i updated tot 6.0

-current from a few days ago, but I just also tested it on 6.0 release.


> Van: Stuart Henderson [mailto:s...@spacehopper.org]
> Verzonden: dinsdag 13 september 2016 23:07
> Aan: Sander van Kranenburg 
> CC: ports@openbsd.org
> Onderwerp: Re: openvpn broken caused by a change in route add and 
> delete
> 
> On 2016/09/13 19:29, Sander van Kranenburg wrote:
> > Hi,
> > 
> > As far as i know -netmask doesn't work anymore.
> > We need to add the netbits tot the network adres like openvpn is doing with 
> > ipv6.
> 
> -netmask is expected to work exactly the same as specifying ip/prefix, and it 
> does work fine here:
> 
> # route add -net 192.0.2.0 82.68.199.133 -netmask 255.255.255.0 add net 
> 192.0.2.0: gateway 82.68.199.133 # netstat -rnfinet | grep ^192
> 192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
> # route delete -net 192.0.2.0 -netmask 255.255.255.0 delete net 
> 192.0.2.0 # netstat -rnfinet | grep ^192 #
> 
> Exactly the same behaviour as the prefix:
> 
> # route add 192.0.2.0/24 82.68.199.133 add net 192.0.2.0/24: gateway 
> 82.68.199.133 # netstat -rnfinet | grep ^192
> 192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
> # route delete 192.0.2.0/24
> delete net 192.0.2.0/24
> # netstat -rnfinet | grep ^192
> #
> 
> I think the problem you ran into was something to do with the gateway 
> address, handling of this *was* changed relatively recently, and not the 
> syntax of address format to route(8).
> 

Re: openvpn broken caused by a change in route add and delete

[Stuart Henderson]

On 2016/09/13 21:20, Sander van Kranenburg wrote:
> Hi,
> 
> Are you at openbsd 6.0 at the moment?
> This is my uname -a OpenBSD openbsd.HOME.local 6.0 GENERIC#0 i386.
> -netmask doesn't work at all for me since i updated tot 6.0

-current from a few days ago, but I just also tested it on 6.0 release.


> Van: Stuart Henderson [mailto:s...@spacehopper.org] 
> Verzonden: dinsdag 13 september 2016 23:07
> Aan: Sander van Kranenburg 
> CC: ports@openbsd.org
> Onderwerp: Re: openvpn broken caused by a change in route add and delete
> 
> On 2016/09/13 19:29, Sander van Kranenburg wrote:
> > Hi,
> > 
> > As far as i know -netmask doesn't work anymore.
> > We need to add the netbits tot the network adres like openvpn is doing with 
> > ipv6.
> 
> -netmask is expected to work exactly the same as specifying ip/prefix, and it 
> does work fine here:
> 
> # route add -net 192.0.2.0 82.68.199.133 -netmask 255.255.255.0 add net 
> 192.0.2.0: gateway 82.68.199.133 # netstat -rnfinet | grep ^192
> 192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
> # route delete -net 192.0.2.0 -netmask 255.255.255.0 delete net 192.0.2.0 # 
> netstat -rnfinet | grep ^192 # 
> 
> Exactly the same behaviour as the prefix:
> 
> # route add 192.0.2.0/24 82.68.199.133
> add net 192.0.2.0/24: gateway 82.68.199.133 # netstat -rnfinet | grep ^192 
> 192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
> # route delete 192.0.2.0/24
> delete net 192.0.2.0/24
> # netstat -rnfinet | grep ^192
> # 
> 
> I think the problem you ran into was something to do with the gateway 
> address, handling of this *was* changed relatively recently, and not the 
> syntax of address format to route(8).
> 

Re: lftp man page broken

[Rafael Sadowski]

On Tue Sep 13, 2016 at 02:15:12PM +0200, Ingo Schwarze wrote:
> Hi Anthony,
> 
> Anthony J. Bentley wrote on Tue, Sep 13, 2016 at 03:32:05AM -0600:
> 
> > Jiri B writes:
> 
> >> lftp man pages is odd, see section for 'mirror' command.
> 
> > The lftp(1) manual uses tbl(7) macros, which need extra preprocessing.
> > pkg_create(1) doesn't do any preprocessing... although that's easy
> > enough to fix. (Anyone have an idea of how many USE_GROFF manuals use
> > troff preprocessors? Is it worth it?)
> 
> I wouldn't oppose adding the comment requesting tbl(1) to the manual
> as suggested by espie@, but if we switch to mandoc, it is not needed,
> so handle that as you like.
> 
> > USE_GROFF could also be removed from lftp. It's got some spacing and
> > line wrapping issues in mandoc though.
> 
> Those are trivial and don't require USE_GROFF.  Arguably, the wrapping
> groff does is almost as ugly (considering the very narrow right column)
> as the overlong lines produced by mandoc.  I think if people want a
> really readable version of the manual, they should get an xterm(1)
> 132 columns wide and run "man -O width=130 lftp", which works fine
> if we remove USE_GROFF.  Even without the -O option, just dragging
> the xterm(1) window a bit wider helps readability with mandoc.
> 
> So please simply commit the following patch.  Bumping makes sense to
> me because it makes the manuals more readable.  Besides, maybe we should
> start forgetting about the old special rule "dropping USE_GROFF only
> requires no bump":  It was useful in the past to prevent excessive
> bumping, but mass deletions no longer happen nowadays, and those that
> still happen usually happen for a specific reason, which often makes
> pushing them to users useful enough to warrant a bump.
> 
> Yours,
>   Ingo
> 
> P.S.
> I also added two low-priority entries to the mandoc TODO list.
> 

I know of no Jiri B's "/usr/local/man/cat1/lftp.0"! man(1) shows me:

$ man -w lftp
/usr/local/man/man1/lftp.1

Ingo's patch works for me and the man page looks OK. Ingo is the
mna(1) master, so I'm OK with the patch.

Kind regards,

Rafael

Re: openvpn broken caused by a change in route add and delete

[Sander van Kranenburg]

Hi,

Are you at openbsd 6.0 at the moment?
This is my uname -a OpenBSD openbsd.HOME.local 6.0 GENERIC#0 i386.
-netmask doesn't work at all for me since i updated tot 6.0

Best regards,

Sander van Kranenburg

-Oorspronkelijk bericht-
Van: Stuart Henderson [mailto:s...@spacehopper.org] 
Verzonden: dinsdag 13 september 2016 23:07
Aan: Sander van Kranenburg 
CC: ports@openbsd.org
Onderwerp: Re: openvpn broken caused by a change in route add and delete

On 2016/09/13 19:29, Sander van Kranenburg wrote:
> Hi,
> 
> As far as i know -netmask doesn't work anymore.
> We need to add the netbits tot the network adres like openvpn is doing with 
> ipv6.

-netmask is expected to work exactly the same as specifying ip/prefix, and it 
does work fine here:

# route add -net 192.0.2.0 82.68.199.133 -netmask 255.255.255.0 add net 
192.0.2.0: gateway 82.68.199.133 # netstat -rnfinet | grep ^192
192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
# route delete -net 192.0.2.0 -netmask 255.255.255.0 delete net 192.0.2.0 # 
netstat -rnfinet | grep ^192 # 

Exactly the same behaviour as the prefix:

# route add 192.0.2.0/24 82.68.199.133
add net 192.0.2.0/24: gateway 82.68.199.133 # netstat -rnfinet | grep ^192 
192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
# route delete 192.0.2.0/24
delete net 192.0.2.0/24
# netstat -rnfinet | grep ^192
# 

I think the problem you ran into was something to do with the gateway address, 
handling of this *was* changed relatively recently, and not the syntax of 
address format to route(8).

Re: openvpn broken caused by a change in route add and delete

[Stuart Henderson]

On 2016/09/13 19:29, Sander van Kranenburg wrote:
> Hi,
> 
> As far as i know -netmask doesn't work anymore.
> We need to add the netbits tot the network adres like openvpn is doing with 
> ipv6.

-netmask is expected to work exactly the same as specifying ip/prefix,
and it does work fine here:

# route add -net 192.0.2.0 82.68.199.133 -netmask 255.255.255.0
add net 192.0.2.0: gateway 82.68.199.133
# netstat -rnfinet | grep ^192
192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
# route delete -net 192.0.2.0 -netmask 255.255.255.0
delete net 192.0.2.0
# netstat -rnfinet | grep ^192
# 

Exactly the same behaviour as the prefix:

# route add 192.0.2.0/24 82.68.199.133
add net 192.0.2.0/24: gateway 82.68.199.133
# netstat -rnfinet | grep ^192 
192.0.2/24 82.68.199.133  UGS00 - 8 vlan2
# route delete 192.0.2.0/24
delete net 192.0.2.0/24
# netstat -rnfinet | grep ^192 
# 

I think the problem you ran into was something to do with the gateway
address, handling of this *was* changed relatively recently, and not
the syntax of address format to route(8).

CVS: cvs.openbsd.org: ports

[Dmitrij Czarkoff]

CVSROOT:/cvs
Module name:ports
Changes by: czark...@cvs.openbsd.org2016/09/13 14:13:38

Modified files:
x11/xclip  : Makefile 

Log message:
Forgot to set bdeps for autoconf and automake

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/13 13:44:35

Modified files:
infrastructure/templates: mk.conf.template 
Removed files:
converters/libiconv: libiconv.port.mk 

Log message:
Remove the converters/libiconv module.  No longer useful after the removal
of static architectures.  Ports now use a normal LIB_DEPENDS.

Re: openvpn broken caused by a change in route add and delete

[Sander van Kranenburg]

Hi,

As far as i know -netmask doesn't work anymore.
We need to add the netbits tot the network adres like openvpn is doing with 
ipv6.

Best regards,

Sander van Kranenburg

-Oorspronkelijk bericht-
Van: Stuart Henderson [mailto:s...@spacehopper.org] 
Verzonden: dinsdag 13 september 2016 21:22
Aan: Sander van Kranenburg 
CC: ports@openbsd.org
Onderwerp: Re: openvpn broken caused by a change in route add and delete

On 2016/09/13 19:19, Sander van Kranenburg wrote:
> Hi,
> 
> I'm sorry the logs are the old ones with the problem.

Yes, I understood that. But they don't have "delete ... -netmask"
which makes it look like it's not even using the codepath you modified for the 
delete case?


> This is from my current log with the patch applied.
> 
> Sun Sep 11 23:07:18 2016 /sbin/route add -host 109.201.137.162 
> 192.168.2.1 add host 109.201.137.162: gateway 192.168.2.1 Sun Sep 11 
> 23:07:18 2016 /sbin/route delete -net 0.0.0.0/0 192.168.2.1 delete net 
> 0.0.0.0/0: gateway 192.168.2.1 Sun Sep 11 23:07:18 2016 /sbin/route 
> add -net 0.0.0.0/0 10.10.10.157 add net 0.0.0.0/0: gateway 
> 10.10.10.157 Sun Sep 11 23:07:18 2016 /sbin/route add -host 10.10.10.1 
> 10.10.10.157 add host 10.10.10.1: gateway 10.10.10.157
> 
> Best regards,
> 
> Sander van Kranenburg
> 
> -Oorspronkelijk bericht-
> Van: Stuart Henderson [mailto:s...@spacehopper.org]
> Verzonden: dinsdag 13 september 2016 21:13
> Aan: Sander van Kranenburg 
> CC: ports@openbsd.org
> Onderwerp: Re: openvpn broken caused by a change in route add and 
> delete
> 
> On 2016/09/11 18:20, Sander van Kranenburg wrote:
> > Hi,
> > 
> > In openbsd 6.0 is the openvpn package is broken because the route add and 
> > delete commands are different from 5.9 and before.
> > 
> > Mon Sep  5 13:27:46 2016 /sbin/route delete -net 0.0.0.0 192.168.2.1 
> > delete net 0.0.0.0: gateway 192.168.2.1: not in table Mon Sep  5
> > 13:27:46 2016 ERROR: OpenBSD/NetBSD route delete command failed: 
> > external program exited with error status: 1 Mon Sep  5 13:27:46 
> > 2016 /sbin/route add -net 0.0.0.0 10.10.10.237 -netmask 0.0.0.0 add 
> > net
> > 0.0.0.0: gateway 10.10.10.237: File exists
> > 
> > I have created a patch for version 2.3.12 see attachment.
> 
> It wouldn't surprise me about possible OpenVPN problems due to changes 
> to the routing code in OpenBSD, but I'm confused as to how this would 
> fix it, it's just changing commands like
> 
>route (delete|add) -net $foo $gateway -netmask $mask
> 
> to
> 
>route (delete|add) $foo/$prefix $gateway
> 
> and I'm not aware of any changes (certainly not intentional ones) that would 
> necessitate this. Also the lines you are patching include "-netmask" but that 
> isn't showing in your log output at all for the "route delete" line..?
> 
> > --- route.c Tue Aug 23 16:16:22 2016
> > +++ /root/route.c   Sun Sep 11 18:17:43 2016
> > @@ -1501,10 +1501,19 @@
> >  argv_printf_cat (, "-rtt %d", r->metric);  #endif
> > 
> > -  argv_printf_cat (, "-net %s %s -netmask %s",
> > +if( count_netmask_bits(netmask) < 32)
> > +  {
> > +  argv_printf_cat (, "-net %s/%d %s",
> >   network,
> > - gateway,
> > - netmask);
> > + count_netmask_bits(netmask),
> > + gateway);
> > +}
> > +else
> > +{
> > +  argv_printf_cat (, "-host %s %s",
> > +  network,
> > +  gateway);
> > +}
> > 
> >/* FIXME -- add on-link support for OpenBSD/NetBSD */
> > 
> > @@ -1880,11 +1889,21 @@
> > 
> >  #elif defined(TARGET_OPENBSD) || defined(TARGET_NETBSD)
> > 
> > -  argv_printf (, "%s delete -net %s %s -netmask %s",
> > +if (count_netmask_bits(netmask) < 32)
> > +  {
> > +  argv_printf (, "%s delete -net %s/%d %s",
> > ROUTE_PATH,
> >   network,
> > - gateway,
> > - netmask);
> > + count_netmask_bits(netmask),
> > + gateway);
> > +  }
> > +else
> > +  {
> > +  argv_printf (, "%s delete -host %s %s",
> > +ROUTE_PATH,
> > +  network,
> > +  gateway);
> > +  }
> > 
> >argv_msg (D_ROUTE, );
> >openvpn_execve_check (, es, 0, "ERROR: OpenBSD/NetBSD route 
> > delete command failed");

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/13 13:29:01

Modified files:
textproc/html-xml-utils: Makefile 

Log message:
replace libiconv module

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/13 13:27:11

Modified files:
www/squid  : Makefile distinfo 

Log message:
update to squid-3.5.21

Re: openvpn broken caused by a change in route add and delete

[Sander van Kranenburg]

Hi,

I'm sorry the logs are the old ones with the problem.
This is from my current log with the patch applied.

Sun Sep 11 23:07:18 2016 /sbin/route add -host 109.201.137.162 192.168.2.1
add host 109.201.137.162: gateway 192.168.2.1
Sun Sep 11 23:07:18 2016 /sbin/route delete -net 0.0.0.0/0 192.168.2.1
delete net 0.0.0.0/0: gateway 192.168.2.1
Sun Sep 11 23:07:18 2016 /sbin/route add -net 0.0.0.0/0 10.10.10.157
add net 0.0.0.0/0: gateway 10.10.10.157
Sun Sep 11 23:07:18 2016 /sbin/route add -host 10.10.10.1 10.10.10.157
add host 10.10.10.1: gateway 10.10.10.157

Best regards,

Sander van Kranenburg

-Oorspronkelijk bericht-
Van: Stuart Henderson [mailto:s...@spacehopper.org] 
Verzonden: dinsdag 13 september 2016 21:13
Aan: Sander van Kranenburg 
CC: ports@openbsd.org
Onderwerp: Re: openvpn broken caused by a change in route add and delete

On 2016/09/11 18:20, Sander van Kranenburg wrote:
> Hi,
> 
> In openbsd 6.0 is the openvpn package is broken because the route add and 
> delete commands are different from 5.9 and before.
> 
> Mon Sep  5 13:27:46 2016 /sbin/route delete -net 0.0.0.0 192.168.2.1 
> delete net 0.0.0.0: gateway 192.168.2.1: not in table Mon Sep  5 
> 13:27:46 2016 ERROR: OpenBSD/NetBSD route delete command failed: 
> external program exited with error status: 1 Mon Sep  5 13:27:46 2016 
> /sbin/route add -net 0.0.0.0 10.10.10.237 -netmask 0.0.0.0 add net 
> 0.0.0.0: gateway 10.10.10.237: File exists
> 
> I have created a patch for version 2.3.12 see attachment.

It wouldn't surprise me about possible OpenVPN problems due to changes to the 
routing code in OpenBSD, but I'm confused as to how this would fix it, it's 
just changing commands like

   route (delete|add) -net $foo $gateway -netmask $mask

to

   route (delete|add) $foo/$prefix $gateway

and I'm not aware of any changes (certainly not intentional ones) that would 
necessitate this. Also the lines you are patching include "-netmask" but that 
isn't showing in your log output at all for the "route delete" line..?

> --- route.c Tue Aug 23 16:16:22 2016
> +++ /root/route.c   Sun Sep 11 18:17:43 2016
> @@ -1501,10 +1501,19 @@
>  argv_printf_cat (, "-rtt %d", r->metric);  #endif
> 
> -  argv_printf_cat (, "-net %s %s -netmask %s",
> +if( count_netmask_bits(netmask) < 32)
> +  {
> +  argv_printf_cat (, "-net %s/%d %s",
>   network,
> - gateway,
> - netmask);
> + count_netmask_bits(netmask),
> + gateway);
> +}
> +else
> +{
> +  argv_printf_cat (, "-host %s %s",
> +  network,
> +  gateway);
> +}
> 
>/* FIXME -- add on-link support for OpenBSD/NetBSD */
> 
> @@ -1880,11 +1889,21 @@
> 
>  #elif defined(TARGET_OPENBSD) || defined(TARGET_NETBSD)
> 
> -  argv_printf (, "%s delete -net %s %s -netmask %s",
> +if (count_netmask_bits(netmask) < 32)
> +  {
> +  argv_printf (, "%s delete -net %s/%d %s",
> ROUTE_PATH,
>   network,
> - gateway,
> - netmask);
> + count_netmask_bits(netmask),
> + gateway);
> +  }
> +else
> +  {
> +  argv_printf (, "%s delete -host %s %s",
> +ROUTE_PATH,
> +  network,
> +  gateway);
> +  }
> 
>argv_msg (D_ROUTE, );
>openvpn_execve_check (, es, 0, "ERROR: OpenBSD/NetBSD route 
> delete command failed");

Re: openvpn broken caused by a change in route add and delete

[Stuart Henderson]

On 2016/09/13 19:19, Sander van Kranenburg wrote:
> Hi,
> 
> I'm sorry the logs are the old ones with the problem.

Yes, I understood that. But they don't have "delete ... -netmask"
which makes it look like it's not even using the codepath you modified
for the delete case?


> This is from my current log with the patch applied.
> 
> Sun Sep 11 23:07:18 2016 /sbin/route add -host 109.201.137.162 192.168.2.1
> add host 109.201.137.162: gateway 192.168.2.1
> Sun Sep 11 23:07:18 2016 /sbin/route delete -net 0.0.0.0/0 192.168.2.1
> delete net 0.0.0.0/0: gateway 192.168.2.1
> Sun Sep 11 23:07:18 2016 /sbin/route add -net 0.0.0.0/0 10.10.10.157
> add net 0.0.0.0/0: gateway 10.10.10.157
> Sun Sep 11 23:07:18 2016 /sbin/route add -host 10.10.10.1 10.10.10.157
> add host 10.10.10.1: gateway 10.10.10.157
> 
> Best regards,
> 
> Sander van Kranenburg
> 
> -Oorspronkelijk bericht-
> Van: Stuart Henderson [mailto:s...@spacehopper.org] 
> Verzonden: dinsdag 13 september 2016 21:13
> Aan: Sander van Kranenburg 
> CC: ports@openbsd.org
> Onderwerp: Re: openvpn broken caused by a change in route add and delete
> 
> On 2016/09/11 18:20, Sander van Kranenburg wrote:
> > Hi,
> > 
> > In openbsd 6.0 is the openvpn package is broken because the route add and 
> > delete commands are different from 5.9 and before.
> > 
> > Mon Sep  5 13:27:46 2016 /sbin/route delete -net 0.0.0.0 192.168.2.1 
> > delete net 0.0.0.0: gateway 192.168.2.1: not in table Mon Sep  5 
> > 13:27:46 2016 ERROR: OpenBSD/NetBSD route delete command failed: 
> > external program exited with error status: 1 Mon Sep  5 13:27:46 2016 
> > /sbin/route add -net 0.0.0.0 10.10.10.237 -netmask 0.0.0.0 add net 
> > 0.0.0.0: gateway 10.10.10.237: File exists
> > 
> > I have created a patch for version 2.3.12 see attachment.
> 
> It wouldn't surprise me about possible OpenVPN problems due to changes to the 
> routing code in OpenBSD, but I'm confused as to how this would fix it, it's 
> just changing commands like
> 
>route (delete|add) -net $foo $gateway -netmask $mask
> 
> to
> 
>route (delete|add) $foo/$prefix $gateway
> 
> and I'm not aware of any changes (certainly not intentional ones) that would 
> necessitate this. Also the lines you are patching include "-netmask" but that 
> isn't showing in your log output at all for the "route delete" line..?
> 
> > --- route.c Tue Aug 23 16:16:22 2016
> > +++ /root/route.c   Sun Sep 11 18:17:43 2016
> > @@ -1501,10 +1501,19 @@
> >  argv_printf_cat (, "-rtt %d", r->metric);  #endif
> > 
> > -  argv_printf_cat (, "-net %s %s -netmask %s",
> > +if( count_netmask_bits(netmask) < 32)
> > +  {
> > +  argv_printf_cat (, "-net %s/%d %s",
> >   network,
> > - gateway,
> > - netmask);
> > + count_netmask_bits(netmask),
> > + gateway);
> > +}
> > +else
> > +{
> > +  argv_printf_cat (, "-host %s %s",
> > +  network,
> > +  gateway);
> > +}
> > 
> >/* FIXME -- add on-link support for OpenBSD/NetBSD */
> > 
> > @@ -1880,11 +1889,21 @@
> > 
> >  #elif defined(TARGET_OPENBSD) || defined(TARGET_NETBSD)
> > 
> > -  argv_printf (, "%s delete -net %s %s -netmask %s",
> > +if (count_netmask_bits(netmask) < 32)
> > +  {
> > +  argv_printf (, "%s delete -net %s/%d %s",
> > ROUTE_PATH,
> >   network,
> > - gateway,
> > - netmask);
> > + count_netmask_bits(netmask),
> > + gateway);
> > +  }
> > +else
> > +  {
> > +  argv_printf (, "%s delete -host %s %s",
> > +ROUTE_PATH,
> > +  network,
> > +  gateway);
> > +  }
> > 
> >argv_msg (D_ROUTE, );
> >openvpn_execve_check (, es, 0, "ERROR: OpenBSD/NetBSD route 
> > delete command failed");

Re: pledge gsm

[Stuart Henderson]

On 2016/09/13 13:03, Stuart Henderson wrote:
> 
> We also often defer pledge until after option parsing, when we have
> a better idea of what is actually needed: for toast(/untoast/tcat)
> this would allow a more accurate pledge because we'll then know
> whether or not it needs filesystem access.

An additional comment on this: doing so would also give us
more confidence that the various codepaths have been checked
and annotated correctly..

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/13 13:15:03

Modified files:
www/analog : Makefile 
www/ap2-mod_perl: Makefile 
www/dillo  : Makefile 
www/elinks : Makefile 
www/netsurf/hubbub: Makefile 
www/netsurf/libcss: Makefile 
www/netsurf/libdom: Makefile 
www/p5-libapreq2: Makefile 
x11/compiz/libcompizconfig: Makefile 
x11/e17/eet: Makefile 
x11/e17/embryo : Makefile 
x11/eterm  : Makefile 
x11/fluxbox: Makefile 
x11/xmobar : Makefile 

Log message:
replace libiconv module

Re: openvpn broken caused by a change in route add and delete

[Stuart Henderson]

On 2016/09/11 18:20, Sander van Kranenburg wrote:
> Hi,
> 
> In openbsd 6.0 is the openvpn package is broken because the route add and 
> delete commands are different from 5.9 and before.
> 
> Mon Sep  5 13:27:46 2016 /sbin/route delete -net 0.0.0.0 192.168.2.1
> delete net 0.0.0.0: gateway 192.168.2.1: not in table
> Mon Sep  5 13:27:46 2016 ERROR: OpenBSD/NetBSD route delete command failed: 
> external program exited with error status: 1
> Mon Sep  5 13:27:46 2016 /sbin/route add -net 0.0.0.0 10.10.10.237 -netmask 
> 0.0.0.0
> add net 0.0.0.0: gateway 10.10.10.237: File exists
> 
> I have created a patch for version 2.3.12 see attachment.

It wouldn't surprise me about possible OpenVPN problems due to changes
to the routing code in OpenBSD, but I'm confused as to how this would
fix it, it's just changing commands like

   route (delete|add) -net $foo $gateway -netmask $mask

to

   route (delete|add) $foo/$prefix $gateway

and I'm not aware of any changes (certainly not intentional ones)
that would necessitate this. Also the lines you are patching include
"-netmask" but that isn't showing in your log output at all for the
"route delete" line..?

> --- route.c Tue Aug 23 16:16:22 2016
> +++ /root/route.c   Sun Sep 11 18:17:43 2016
> @@ -1501,10 +1501,19 @@
>  argv_printf_cat (, "-rtt %d", r->metric);
>  #endif
> 
> -  argv_printf_cat (, "-net %s %s -netmask %s",
> +if( count_netmask_bits(netmask) < 32)
> +  {
> +  argv_printf_cat (, "-net %s/%d %s",
>   network,
> - gateway,
> - netmask);
> + count_netmask_bits(netmask),
> + gateway);
> +}
> +else
> +{
> +  argv_printf_cat (, "-host %s %s",
> +  network,
> +  gateway);
> +}
> 
>/* FIXME -- add on-link support for OpenBSD/NetBSD */
> 
> @@ -1880,11 +1889,21 @@
> 
>  #elif defined(TARGET_OPENBSD) || defined(TARGET_NETBSD)
> 
> -  argv_printf (, "%s delete -net %s %s -netmask %s",
> +if (count_netmask_bits(netmask) < 32)
> +  {
> +  argv_printf (, "%s delete -net %s/%d %s",
> ROUTE_PATH,
>   network,
> - gateway,
> - netmask);
> + count_netmask_bits(netmask),
> + gateway);
> +  }
> +else
> +  {
> +  argv_printf (, "%s delete -host %s %s",
> +ROUTE_PATH,
> +  network,
> +  gateway);
> +  }
> 
>argv_msg (D_ROUTE, );
>openvpn_execve_check (, es, 0, "ERROR: OpenBSD/NetBSD route delete 
> command failed");

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/13 12:52:06

Modified files:
lang/ghc   : Makefile 
print/foomatic-db-engine: Makefile 
print/ghostscript/gnu: Makefile 
print/gv   : Makefile 
print/texlive/base: Makefile 
security/opendnssec: Makefile 
security/rarcrack: Makefile 
sysutils/augeas: Makefile 
sysutils/cfengine: Makefile 
sysutils/testdisk: Makefile 
textproc/TclXML: Makefile 
textproc/apertium: Makefile 
textproc/clo++ : Makefile 
textproc/docbook2x: Makefile 
textproc/hs-HaXml: Makefile 
textproc/hyperestraier: Makefile 
textproc/lttoolbox: Makefile 
textproc/ocaml-text: Makefile 
textproc/p5-XML-LibXML: Makefile 
textproc/ruby-nokogiri: Makefile 
textproc/sphinx: Makefile 
textproc/swish-e: Makefile 
textproc/wkhtmltopdf: Makefile 

Log message:
replace libiconv module

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/13 10:26:03

Modified files:
lang   : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
lang/railo : Makefile distinfo 
lang/railo/patches: patch-WEB-INF_web_xml 
lang/railo/pkg : DESCR PLIST README 

Log message:
switch railo to lucee

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/13 10:24:37

Log message:
import ports/lang/lucee, to replace railo.  ok daniel@ jca@

Lucee is a light-weight dynamic scripting language for the JVM that
enables the rapid development of simple to highly sophisticated web
applications. Lucee is fully compatible with the CFML Script and Tag
Language.

Lucee is a JVM language and runs on the JVM as a servlet and will work
with any servlet container (e.g. Apache Tomcat, Eclipse Jetty) or
application server (e.g. JBoss AS, GlassFish). This package is setup
to run Lucee under Tomcat.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20160913

N ports/lang/lucee/distinfo
N ports/lang/lucee/Makefile
N ports/lang/lucee/patches/patch-WEB-INF_web_xml
N ports/lang/lucee/pkg/DESCR
N ports/lang/lucee/pkg/PLIST
N ports/lang/lucee/pkg/README

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/13 10:12:14

Modified files:
mail/bogofilter: Makefile 
mail/mailest   : Makefile 
mail/nmh   : Makefile 
mail/s-nail: Makefile 
misc/openbabel : Makefile 
misc/srcpd : Makefile 
multimedia/ffmpeg2theora: Makefile 
multimedia/libass: Makefile 
multimedia/mpv : Makefile 
net/dclib  : Makefile 
net/ejabberd   : Makefile 
net/ezstream   : Makefile 
net/hpodder: Makefile 
net/ices   : Makefile 
net/ices2  : Makefile 
net/isc-bind   : Makefile 
net/pure-ftpd  : Makefile 
net/rtg: Makefile 
net/serf   : Makefile 
net/si : Makefile 
net/winexe : Makefile 

Log message:
replace libiconv module

Re: pledge gsm

[Daniel Jakots]

On Tue, 13 Sep 2016 15:36:52 +0200, Jan Stary  wrote:

> On Sep 13 15:27:27, t...@math.ethz.ch wrote:
> > perror(3) only prints the error message; you also need to exit(3)
> > explicitly:  
> 
> Right; sorry.
> Another try below.

And can you add # uses pledge() just before WANTLIB please?

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/13 09:35:10

Modified files:
mail/abook : Makefile 

Log message:
replace libiconv and gettext modules

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/13 09:29:02

Modified files:
editors/nedit  : Makefile 
emulators/bochs: Makefile 
emulators/openmsx: Makefile 
games/abuse: Makefile 
games/armagetronad: Makefile 
games/burgerspace: Makefile 
games/cosmosmash: Makefile 
games/love : Makefile 
games/quadrupleback: Makefile 
games/residualvm: Makefile 
graphics/DevIL : Makefile 
graphics/GraphicsMagick: Makefile 
graphics/ImageMagick: Makefile 
graphics/agg   : Makefile 
graphics/delaboratory: Makefile 
graphics/djvulibre: Makefile 
graphics/dmtx-utils: Makefile 
graphics/gd: Makefile 
graphics/geomview: Makefile 
graphics/luagd : Makefile 
graphics/mscgen: Makefile 
graphics/p5-GD : Makefile 
graphics/pecl-imagick: Makefile 
java/tanukiwrapper: Makefile 

Log message:
replace libiconv module

[wip] samba-4.5.0

[Jeremie Courreges-Anglas]

Here's a tentative update to 4.5.0, if people want to give it a shot.

I'd like to point out that test reports on 4.4.x are the most important
concern right now.  We have to deal with this s3fs vs. ntvfs issue.
I don't (and won't in the foreseeably future) have any windows machine
at hand, so test reports are needed (private or public).  I can help
ports-wise and functionality-wise.


Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.228
diff -u -p -r1.228 Makefile
--- Makefile12 Sep 2016 15:38:22 -  1.228
+++ Makefile12 Sep 2016 20:38:21 -
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile,v 1.228 2016/09/12 15:38:22 jca Exp $
 
-VERSION =  4.4.5
+VERSION =  4.5.0
 DISTNAME = samba-${VERSION}
 
 COMMENT-main = SMB and CIFS client and server for UNIX
@@ -15,14 +15,10 @@ PKGNAME-tevent =tevent-${TEVENT_V}
 PKGNAME-util = samba-util-${VERSION}
 PKGNAME-docs = samba-docs-${VERSION}
 
-REVISION-main =0
-REVISION-ldb = 0
-REVISION-tevent =  0
-
 PKG_ARCH-docs =*
 
-LDB_V =1.1.26
-TEVENT_V = 0.9.28
+LDB_V =1.1.27
+TEVENT_V = 0.9.29
 
 SHARED_LIBS =  asn1-samba4 0.0 \
com_err-samba4  0.0 \
@@ -39,7 +35,6 @@ SHARED_LIBS = asn1-samba4 0.0 \
kdc-samba4  0.0 \
krb5-samba4 0.0 \
ldb 0.2 \
-   tevent-unix-util0.0 \
ndr 0.1 \
ndr-krb5pac 0.0 \
ndr-nbt 0.0 \
@@ -161,7 +156,8 @@ CONFIGURE_ARGS =--enable-fhs \
--without-acl-support \
--without-libarchive \
--disable-rpath \
-   --with-ntvfs-fileserver
+   --with-ntvfs-fileserver \
+   --without-gpgme
 
 # XXX Remember to remove --enable-developer, it prints passwords in logs.
 #CONFIGURE_ARGS += --enable-developer
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.53
diff -u -p -r1.53 distinfo
--- distinfo8 Jul 2016 18:39:50 -   1.53
+++ distinfo12 Sep 2016 20:38:21 -
@@ -1,2 +1,2 @@
-SHA256 (samba-4.4.5.tar.gz) = uHbvLmP2YmVJDoChIuZu8tdhYRK4Od9o9WrC4c4Xp70=
-SIZE (samba-4.4.5.tar.gz) = 20715838
+SHA256 (samba-4.5.0.tar.gz) = 06mkObdG3dLF8Rn2DHLvigJrzuHvsRmb8Z5E8RT2tYY=
+SIZE (samba-4.5.0.tar.gz) = 20937551
Index: patches/patch-buildtools_wafsamba_samba_autoconf_py
===
RCS file: 
/cvs/ports/net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-buildtools_wafsamba_samba_autoconf_py
--- patches/patch-buildtools_wafsamba_samba_autoconf_py 22 Apr 2016 11:48:36 
-  1.4
+++ patches/patch-buildtools_wafsamba_samba_autoconf_py 12 Sep 2016 20:38:21 
-
@@ -4,9 +4,9 @@ $OpenBSD: patch-buildtools_wafsamba_samb
 
 2. Use -Wl,-no-undefined as on other platforms.
 
 buildtools/wafsamba/samba_autoconf.py.orig Wed Apr 13 17:18:35 2016
-+++ buildtools/wafsamba/samba_autoconf.py  Wed Apr 13 17:18:35 2016
-@@ -804,6 +804,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
+--- buildtools/wafsamba/samba_autoconf.py.orig Mon Sep 12 18:42:31 2016
 buildtools/wafsamba/samba_autoconf.py  Mon Sep 12 18:42:31 2016
+@@ -805,6 +805,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
  if not 'EXTRA_LDFLAGS' in conf.env:
  conf.env['EXTRA_LDFLAGS'] = []
  conf.env['EXTRA_LDFLAGS'].extend(TO_LIST(flags))
@@ -34,7 +34,7 @@ $OpenBSD: patch-buildtools_wafsamba_samb
  return flags
  
  
-@@ -867,10 +888,9 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
+@@ -868,10 +889,9 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
  def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
  # we don't want any libraries or modules to rely on runtime
  # resolution of symbols
Index: patches/patch-lib_replace_wscript
===
RCS file: patches/patch-lib_replace_wscript
diff -N patches/patch-lib_replace_wscript
--- patches/patch-lib_replace_wscript   27 Apr 2016 08:50:03 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,34 +0,0 @@
-$OpenBSD: patch-lib_replace_wscript,v 1.5 2016/04/27 08:50:03 jca Exp $
-
-Fix __sync_fetch_and_add check so that it properly fails instead of
-succeeding erroneously (eg on hppa).
-
-Committed upstream:
-  
https://git.samba.org/?p=samba.git;a=commit;h=53e0860122c3fa6b9fe80b5693c7b1eee2ad605d
-
 

Re: [s...@spacehopper.org: [s...@spacehopper.org: NEW: lang/lucee, to replace railo]]

[Jeremie Courreges-Anglas]

Stuart Henderson  writes:

> please?
>
> From: Stuart Henderson 
> Subject: [s...@spacehopper.org: NEW: lang/lucee, to replace railo]
> To: ports 
> Date: Sat, 3 Sep 2016 10:38:54 +0100 (1 week, 3 days, 6 hours ago)
> User-Agent: Mutt/1.6.2 (2016-07-01)
> Mail-Followup-To: ports 
>
> anyone?
>
>
> From: Stuart Henderson 
> Date: Wed, 17 Aug 2016 17:20:36 +0100
> To: ports 
> User-Agent: Mutt/1.6.2 (2016-07-01)
> Subject: NEW: lang/lucee, to replace railo
> Mail-Followup-To: ports 
>
> OK to import this to replace lang/railo? (Yes I am aware there is
> a newer branch, but it's quite a big change and still pretty recent,
> so I'd like to hold off a while before doing that..)
>
> -
> Lucee is a light-weight dynamic scripting language for the JVM that
> enables the rapid development of simple to highly sophisticated web
> applications. Lucee is fully compatible with the CFML Script and Tag
> Language.
>
> Lucee is a JVM language and runs on the JVM as a servlet and will work
> with any servlet container (e.g. Apache Tomcat, Eclipse Jetty) or
> application server (e.g. JBoss AS, GlassFish). This package is setup
> to run Lucee under Tomcat.

I took a look during g2k16 but didn't struggle enough to actually test
it live.  Looks fine to me ports-wise, if it works for you ok jca@.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

[s...@spacehopper.org: [s...@spacehopper.org: NEW: lang/lucee, to replace railo]]

[Stuart Henderson]

please?

- Forwarded message from Stuart Henderson  -

From: Stuart Henderson 
Date: Sat, 3 Sep 2016 10:38:54 +0100
To: ports 
User-Agent: Mutt/1.6.2 (2016-07-01)
Subject: [s...@spacehopper.org: NEW: lang/lucee, to replace railo]
Mail-Followup-To: ports 

anyone?


From: Stuart Henderson 
Date: Wed, 17 Aug 2016 17:20:36 +0100
To: ports 
User-Agent: Mutt/1.6.2 (2016-07-01)
Subject: NEW: lang/lucee, to replace railo
Mail-Followup-To: ports 

OK to import this to replace lang/railo? (Yes I am aware there is
a newer branch, but it's quite a big change and still pretty recent,
so I'd like to hold off a while before doing that..)

-
Lucee is a light-weight dynamic scripting language for the JVM that
enables the rapid development of simple to highly sophisticated web
applications. Lucee is fully compatible with the CFML Script and Tag
Language.

Lucee is a JVM language and runs on the JVM as a servlet and will work
with any servlet container (e.g. Apache Tomcat, Eclipse Jetty) or
application server (e.g. JBoss AS, GlassFish). This package is setup
to run Lucee under Tomcat.
-




- End forwarded message -

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/13 08:40:30

Modified files:
devel/alex : Makefile 
devel/apr-util : Makefile 
devel/boost: Makefile 
devel/cabal-install: Makefile 
devel/cvsgraph : Makefile 
devel/ddd  : Makefile 
devel/droplet  : Makefile 
devel/flatzebra: Makefile 
devel/gmc4cc   : Makefile 
devel/guilib   : Makefile 
devel/happy: Makefile 
devel/hasktags : Makefile 
devel/hscolour : Makefile 
devel/lazarus  : Makefile 
devel/libslang : Makefile 
devel/lua-lgi  : Makefile 
devel/ocaml-lambda-term: Makefile 
devel/py-silc  : Makefile 
devel/sdlmm: Makefile 
devel/smpeg: Makefile 

Log message:
replace libiconv module

CVS: cvs.openbsd.org: ports

[Dmitrij Czarkoff]

CVSROOT:/cvs
Module name:ports
Changes by: czark...@cvs.openbsd.org2016/09/13 08:10:13

Modified files:
x11/xclip  : Makefile distinfo 

Log message:
update to xclip-0.13

OK sthen@

Re: Update: x11/xclip

[Dmitrij D. Czarkoff]

Stuart Henderson  wrote:

>There's nothing specific about github that means this, it's just that
>nobody bothered to roll a proper release..

I mean these days projects from Github generally don't make release tarballs.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/09/13 07:50:59

Modified files:
devel/cryptopp : Makefile distinfo 
devel/cryptopp/patches: patch-GNUmakefile 
devel/cryptopp/pkg: PLIST 
Added files:
devel/cryptopp/patches: patch-config_h 

Log message:
Update to cryptopp-5.6.4

Re: pledge gsm

[Jan Stary]

On Sep 13 15:27:27, t...@math.ethz.ch wrote:
> perror(3) only prints the error message; you also need to exit(3)
> explicitly:

Right; sorry.
Another try below.

Jan


Index: Makefile
===
RCS file: /cvs/ports/audio/gsm/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile13 Sep 2016 11:33:28 -  1.45
+++ Makefile13 Sep 2016 13:35:46 -
@@ -3,6 +3,7 @@
 COMMENT=   GSM audio codec library and converter
 
 DISTNAME=  gsm-1.0.15
+REVISION=  0
 WRKDIST=   ${WRKDIR}/gsm-1.0-pl15
 
 SHARED_LIBS=   gsm 1.0
Index: patches/patch-src_toast_c
===
RCS file: patches/patch-src_toast_c
diff -N patches/patch-src_toast_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_toast_c   13 Sep 2016 13:35:46 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- src/toast.c.orig   Wed Apr 26 21:14:26 2006
 src/toast.cTue Sep 13 15:35:24 2016
+@@ -756,6 +756,11 @@ int main P2((ac, av), int ac, char **av)
+   extern int  optind;
+   extern char * optarg;
+ 
++  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++  perror("pledge");
++  exit(1);
++  }
++
+   parse_argv0(*av);
+ 
+   while ((opt = getopt(ac, av, "fcdpvhuaslVFC:")) != EOF) switch (opt) {

Re: pledge gsm

[Theo Buehler]

> ++if (pledge("stdio rpath wpath cpath fattr", NULL) == -1)
> ++perror("pledge");

perror(3) only prints the error message; you also need to exit(3)
explicitly:

if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
perror("pledge");
exit(1);
}

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/13 07:24:37

Modified files:
www/trac   : Makefile distinfo 

Log message:
bugfix update to Trac-1.0.13

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/13 07:24:25

Modified files:
devel/cvs-fast-export: Makefile distinfo 
devel/cvs-fast-export/patches: patch-Makefile 
Removed files:
devel/cvs-fast-export/patches: patch-lex_l 

Log message:
update to cvs-fast-export-1.40

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/13 07:20:24

Modified files:
devel/ccache   : Makefile distinfo 

Log message:
update to ccache-3.3.1

Re: NEW: comms/gnuradio

[Aaron Poffenberger]

Has anyone tried this? Any feedback?

--Aaron

* Aaron Poffenberger  [2016-09-09 09:53:10 -0500]:

> Hello ports@,
> 
> Here is a new port : comms/gnuradio
> 
> Tested on: amd64.
> 
> From DESCR:
> 
> GNU Radio is a software development toolkit that provides signal processing
> blocks to implement software radios. It can be used with readily-available
> low-cost external RF hardware to create software-defined radios, or
> without hardware in a simulation-like environment. It is widely used in
> hobbyist, academic and commercial environments to support both wireless
> communications research and real-world radio systems.
> 
> 
> 
> This port is based on commits to openbsd-wip by sthen@, bentley@ and
> Aaron Bieber.
> 
> I've updated the port to the latest from gnuradio (3.7.10.1).
> 
> This port of gnuradio is first in a series of ports and updates to get
> the key SDR projects working on OpenBSD. I have an update for rtl-sdr
> I'll send shortly. gr-osmosdr is almost ready. I'll follow that with
> gqrx.
> 
> If anyone is already working on those, please let me know.
> 
> N.B., SDR on OpenBSD may require more work to be fully functional.
> sthen@ pointed out to me that our libusb doesn't support async yet.
> Still, having the software and drivers available may help in that
> regard.
> 
> Cheers,
> Aaron

Re: lftp man page broken

[Stuart Henderson]

On 2016/09/13 14:15, Ingo Schwarze wrote:
> So please simply commit the following patch.  Bumping makes sense to
> me because it makes the manuals more readable.  Besides, maybe we should
> start forgetting about the old special rule "dropping USE_GROFF only
> requires no bump":  It was useful in the past to prevent excessive
> bumping, but mass deletions no longer happen nowadays, and those that
> still happen usually happen for a specific reason, which often makes
> pushing them to users useful enough to warrant a bump.

I switched it to USE_GROFF previously because there was data loss in a
previous version, but this has gone away in the meantime (unsure whether
it was due to changes in mandoc or in the upstream page), so at this
point, it's OK with me.

I agree with bumping REVISION.

Re: pledge gsm

[Jan Stary]

On Sep 13 13:03:51, s...@spacehopper.org wrote:
> On 2016/09/12 18:00, Jan Stary wrote:
> > Attached please find a new patch that pledges audio/gsm
> > and a diff to the Makefile that bumps the revision.
> 
> Usually we try to use the same error-printing function as the
> surrounding code, so in this case I think "perror("pledge");" would
> be better.

OK

> We also often defer pledge until after option parsing, when we have
> a better idea of what is actually needed: for toast(/untoast/tcat)
> this would allow a more accurate pledge because we'll then know
> whether or not it needs filesystem access.
> 
> > $OpenBSD$
> > --- src/toast.c.origMon Sep 12 17:41:27 2016
> > +++ src/toast.c Mon Sep 12 17:41:36 2016
> 
> If you use "cvs add patch-src_toast_c" you can then do "cvs
> diff -uNp" which will show the added file in the diff.

Better diff below.

Jan


Index: Makefile
===
RCS file: /cvs/ports/audio/gsm/Makefile,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 Makefile
--- Makefile13 Sep 2016 11:33:28 -  1.45
+++ Makefile13 Sep 2016 12:34:04 -
@@ -3,6 +3,7 @@
 COMMENT=   GSM audio codec library and converter
 
 DISTNAME=  gsm-1.0.15
+REVISION=  0
 WRKDIST=   ${WRKDIR}/gsm-1.0-pl15
 
 SHARED_LIBS=   gsm 1.0
Index: patches/patch-src_toast_c
===
RCS file: patches/patch-src_toast_c
diff -N patches/patch-src_toast_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_toast_c   13 Sep 2016 12:34:04 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/toast.c.orig   Mon Sep 12 17:41:27 2016
 src/toast.cMon Sep 12 17:41:36 2016
+@@ -756,6 +756,9 @@ int main P2((ac, av), int ac, char **av)
+   extern int  optind;
+   extern char * optarg;
+ 
++  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1)
++  perror("pledge");
++
+   parse_argv0(*av);
+ 
+   while ((opt = getopt(ac, av, "fcdpvhuaslVFC:")) != EOF) switch (opt) {

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/13 06:27:15

Modified files:
net/wireshark  : Makefile distinfo 

Log message:
update to wireshark-2.0.6, fixing the following reported as security
bugs, plus various others including protocol dissection errors and crashes

wnpa-sec-2016-50: QNX6 QNET dissector crash.
wnpa-sec-2016-51: H.225 dissector crash.
wnpa-sec-2016-52: Catapult DCT2000 dissector crash.
wnpa-sec-2016-53: UMTS FP dissector crash.
wnpa-sec-2016-54: Catapult DCT2000 dissector crash.
wnpa-sec-2016-55: IPMI trace dissector crash.

Re: lftp man page broken

[Ingo Schwarze]

Hi Anthony,

Anthony J. Bentley wrote on Tue, Sep 13, 2016 at 03:32:05AM -0600:

> Jiri B writes:

>> lftp man pages is odd, see section for 'mirror' command.

> The lftp(1) manual uses tbl(7) macros, which need extra preprocessing.
> pkg_create(1) doesn't do any preprocessing... although that's easy
> enough to fix. (Anyone have an idea of how many USE_GROFF manuals use
> troff preprocessors? Is it worth it?)

I wouldn't oppose adding the comment requesting tbl(1) to the manual
as suggested by espie@, but if we switch to mandoc, it is not needed,
so handle that as you like.

> USE_GROFF could also be removed from lftp. It's got some spacing and
> line wrapping issues in mandoc though.

Those are trivial and don't require USE_GROFF.  Arguably, the wrapping
groff does is almost as ugly (considering the very narrow right column)
as the overlong lines produced by mandoc.  I think if people want a
really readable version of the manual, they should get an xterm(1)
132 columns wide and run "man -O width=130 lftp", which works fine
if we remove USE_GROFF.  Even without the -O option, just dragging
the xterm(1) window a bit wider helps readability with mandoc.

So please simply commit the following patch.  Bumping makes sense to
me because it makes the manuals more readable.  Besides, maybe we should
start forgetting about the old special rule "dropping USE_GROFF only
requires no bump":  It was useful in the past to prevent excessive
bumping, but mass deletions no longer happen nowadays, and those that
still happen usually happen for a specific reason, which often makes
pushing them to users useful enough to warrant a bump.

Yours,
  Ingo

P.S.
I also added two low-priority entries to the mandoc TODO list.


Index: Makefile
===
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.110
diff -u -p -r1.110 Makefile
--- Makefile7 Aug 2016 21:40:20 -   1.110
+++ Makefile13 Sep 2016 11:53:37 -
@@ -3,6 +3,7 @@
 COMMENT=   shell-like command line ftp and sftp client
 
 DISTNAME=  lftp-4.7.3
+REVISION=  0
 CATEGORIES=net
 
 HOMEPAGE=  https://lftp.yar.ru/
@@ -14,8 +15,6 @@ PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB += c crypto curses ereadline expat iconv idn intl m ssl
 WANTLIB += stdc++ util z
-
-USE_GROFF= Yes
 
 # lftp needs add_history_time()
 LIB_DEPENDS=   devel/libidn \

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/13 06:13:03

Modified files:
telephony/asterisk: Makefile distinfo 

Log message:
update to asterisk-13.11.2

res_pjsip: Do not crash on ACKs from unknown endpoints
chan_sip: Don't allocate new RTP instances on top of old ones

Re: Update: x11/xclip

[Stuart Henderson]

On 2016/09/13 13:51, Dmitrij D. Czarkoff wrote:
> Hi!
> 
> Below is an update to xclip-0.13.  The project moved to Github, so now
> have to deal with auto* tools.

There's nothing specific about github that means this, it's just that
nobody bothered to roll a proper release..

> I'd like to become a MAINTAINER if it is not a problem.
> 
> OKs?

OK.

> --
> Dmitrij D. Czarkoff
> 
> Index: Makefile
> ===
> RCS file: /var/cvs/ports/x11/xclip/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- Makefile  21 Jan 2015 13:24:40 -  1.13
> +++ Makefile  13 Sep 2016 11:48:15 -
> @@ -1,11 +1,12 @@
>  # $OpenBSD: Makefile,v 1.13 2015/01/21 13:24:40 jca Exp $
>  
>  COMMENT= command line interface to X selections
> -DISTNAME=xclip-0.12
> -REVISION=0
> +GH_ACCOUNT=  astrand
> +GH_PROJECT=  xclip
> +GH_TAGNAME=  0.13
>  CATEGORIES=  x11
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=xclip/}
> -HOMEPAGE=http://xclip.sourceforge.net/
> +
> +MAINTAINER=  Dmitrij D. Czarkoff 
>  
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM=   Yes
> @@ -16,6 +17,13 @@ NO_TEST=   yes
>  USE_GMAKE=   yes
>  CONFIGURE_STYLE= gnu
>  CONFIGURE_ENV=   CPPFLAGS="-I${X11BASE}/include" \
> - LDFLAGS="-L${X11BASE}/lib"
> + LDFLAGS="-L${X11BASE}/lib" \
> + AUTOCONF_VERSION="${AUTOCONF_VERSION}" \
> + AUTOMAKE_VERSION="${AUTOMAKE_VERSION}"
> +AUTOCONF_VERSION=2.69
> +AUTOMAKE_VERSION=1.15
> +
> +post-patch:
> + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -i
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /var/cvs/ports/x11/xclip/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo  21 Jan 2015 12:57:41 -  1.6
> +++ distinfo  13 Sep 2016 11:15:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (xclip-0.12.tar.gz) = t8f60Fm6RG31aS0XXCodOBblQlSWYSJIBts2mg1xbEU=
> -SIZE (xclip-0.12.tar.gz) = 63420
> +SHA256 (xclip-0.13.tar.gz) = yluIBOPJEKZkI6iC15vzyUULh1rIUoeR+2DsneZn91g=
> +SIZE (xclip-0.13.tar.gz) = 30461
> 

Re: pledge gsm

[Stuart Henderson]

On 2016/09/12 18:00, Jan Stary wrote:
> Attached please find a new patch that pledges audio/gsm
> and a diff to the Makefile that bumps the revision.

Usually we try to use the same error-printing function as the
surrounding code, so in this case I think "perror("pledge");" would
be better.

We also often defer pledge until after option parsing, when we have
a better idea of what is actually needed: for toast(/untoast/tcat)
this would allow a more accurate pledge because we'll then know
whether or not it needs filesystem access.

> $OpenBSD$
> --- src/toast.c.orig  Mon Sep 12 17:41:27 2016
> +++ src/toast.c   Mon Sep 12 17:41:36 2016

If you use "cvs add patch-src_toast_c" you can then do "cvs
diff -uNp" which will show the added file in the diff.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/13 05:44:07

Modified files:
archivers/unzip: Makefile 
audio/cmu-sphinx3: Makefile 
audio/cmu-sphinxbase: Makefile 
audio/libcdio  : Makefile 
audio/mpc  : Makefile 
audio/ruby-id3lib: Makefile 
cad/tkgate : Makefile 
comms/smstools : Makefile 
converters/p5-Text-Iconv: Makefile 
converters/py-iconvcodec: Makefile 
databases/freetds: Makefile 
databases/sqsh : Makefile 
databases/virtuoso: Makefile 

Log message:
replace libiconv module

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/09/13 05:40:38

Modified files:
devel/pango: Makefile distinfo 

Log message:
Update to pango-1.40.3.

Re: update audio/gsm

[Stuart Henderson]

Thanks, committed.

Re: WIP: GCC 6.2.0

[Jan Stary]

On Sep 04 13:30:26, pas...@stumpf.co wrote:
> Here's a preliminary port of GCC 6.2.0, tested only on amd64, i386 and
> sparc64 as I don't have access to anything else at the moment.

It built and installed fine on my MacMini (current/macppc),
even with  /etc/malloc.conf -> CFGPRSU

What would be a good stress test to do now?
Recompile itself? Recompile the system?
(I tried building firefox, but that requires llvm,
which requires gcc 4.9, which is in conflict with gcc 6.2)

On a BeagleBoneBlack (current/armv7), building gcc 6.2
made the machine drop to ddb three times.
I'll have a look.

Jan

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/13 05:33:28

Modified files:
audio/gsm  : Makefile distinfo 
audio/gsm/pkg  : DESCR 

Log message:
update to gsm-1.0.15 (minor change only, to remove an .orig file) and
update COMMENT/DESCR, from Jan Stary.

CVS: cvs.openbsd.org: ports

[Ingo Schwarze]

CVSROOT:/cvs
Module name:ports
Changes by: schwa...@cvs.openbsd.org2016/09/13 05:17:21

Modified files:
textproc/groff/patches: patch-Makefile_in 

Log message:
Make sure all directories used as targets during the fake install
stage are marked as .PHONY, or make(1) might consider some of them
up to date, skipping the fake install for them and causing later
packaging to fail.
Also regenerate the patch with make update-patches.
No package change (as far as it built at all), no bump.
Issue observed by Jerome Ibanes  on sparc64.
OK sthen@

Re: update audio/gsm

[Jan Stary]

Hi Stuart,

On Sep 13 09:39:07, s...@spacehopper.org wrote:
> .orig isn't really a problem for ports, you can just set PATCH_ORIG if it's
> getting in the way. I didn't bother before with this before because it's
> only one file and they don't usually last more than a release or two
> upstream.
> 
> With the COMMENT change, please also change PKG/DESCR to match, and since
> we're touching the line anyway, also fix capitalisation of GSM.

thanks for reviewing - tweaked diff below,

Jan



> On 13 September 2016 07:07:49 Jan Stary  wrote:
> 
> >The diff below updates audio/gsm to 1.0.15,
> >promptly released last night.
> >
> >There is no change to the gsm code itself,
> >just a stale *.orig file was removed from the tarball.
> >That's a minor change, but imho important enough
> >- having a missplaced *.orig in the source
> >confuses 'make update-patches'.
> >
> >While there, tweak the COMMENT - it's not "u-law to gsm",
> >toast(1) converts linear PCM.
> >
> >The yesterday patch to pledge gsm is orthogonal to this
> >and can be applied after this, saving a REVISION bump.
> >
> > Jan
> >
> >>> > Thanks for letting me know, I had no idea (neither about
> >>> > the file's existence nor of .orig's significance in OpenBSD)!
> >>> > Looks like that .orig file just got included by accident.
> >>> > I've removed the file and cut a new patchlevel without it.
> >>>
> >>> > > Dear authors of GSM,
> >>> > >
> >>> > > it seems that gsm-1.0.14.tar.gz contains
> >>> > > an erronerous inc/gsm.h.orig - I suppose
> >>> > > that it's a relict of patching the source
> >>> > > at some point, but the *.orig should probably
> >>> > > not be part of the tarball.
> >>> > >
> >>> > > This confuses e.g. the OpenBSD ports system
> >>> > > where having an *.orig in the extractedd source
> >>> > > means the port maintainer has patched the file.


Index: Makefile
===
RCS file: /cvs/ports/audio/gsm/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile10 Mar 2016 23:05:53 -  1.44
+++ Makefile13 Sep 2016 11:14:08 -
@@ -1,9 +1,9 @@
 # $OpenBSD: Makefile,v 1.44 2016/03/10 23:05:53 naddy Exp $
 
-COMMENT=   u-law to gsm encoding audio converter and library
+COMMENT=   GSM audio codec library and converter
 
-DISTNAME=  gsm-1.0.14
-WRKDIST=   ${WRKDIR}/gsm-1.0-pl14
+DISTNAME=  gsm-1.0.15
+WRKDIST=   ${WRKDIR}/gsm-1.0-pl15
 
 SHARED_LIBS=   gsm 1.0
 
Index: distinfo
===
RCS file: /cvs/ports/audio/gsm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo16 Mar 2015 09:43:29 -  1.6
+++ distinfo13 Sep 2016 11:14:08 -
@@ -1,2 +1,2 @@
-SHA256 (gsm-1.0.14.tar.gz) = WBShajCzwCaHGzc5gS3EoqhCmTMRgsmH2hwhLJPpNSw=
-SIZE (gsm-1.0.14.tar.gz) = 62372
+SHA256 (gsm-1.0.15.tar.gz) = 5foXEFeJR/kulI6DEww8gnGcOAozQJm3NNBdNOdlXy8=
+SIZE (gsm-1.0.15.tar.gz) = 64902
Index: pkg/DESCR
===
RCS file: /cvs/ports/audio/gsm/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   5 Dec 1997 02:07:59 -   1.1.1.1
+++ pkg/DESCR   13 Sep 2016 11:14:08 -
@@ -1,2 +1,2 @@
-gsm is a conversion package and library for converting u-law audio to
-gsm encoding (which is much more efficient) and back again.
+gsm is a conversion package and library for converting audio
+to GSM encoding (which is much more efficient) and back again.

Re: lftp man page broken

[Anthony J. Bentley]

Jiri B writes:
> Hi,
> 
> lftp man pages is odd, see section for 'mirror' command.

The lftp(1) manual uses tbl(7) macros, which need extra preprocessing.
pkg_create(1) doesn't do any preprocessing... although that's easy
enough to fix. (Anyone have an idea of how many USE_GROFF manuals use
troff preprocessors? Is it worth it?)

USE_GROFF could also be removed from lftp. It's got some spacing and
line wrapping issues in mandoc though.

Index: OpenBSD/PackingElement.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackingElement.pm,v
retrieving revision 1.244
diff -u -p -r1.244 PackingElement.pm
--- OpenBSD/PackingElement.pm   25 Jun 2016 18:02:59 -  1.244
+++ OpenBSD/PackingElement.pm   13 Sep 2016 09:22:17 -
@@ -655,7 +655,7 @@ sub format
chdir($dir) or die "Can't chdir to $dir";
},
OpenBSD::Paths->groff,
-   qw(-mandoc -mtty-char -E -Ww -Tascii -P -c),
+   qw(-mandoc -mtty-char -E -Ww -Tascii -t -P -c),
@extra, '--', $file);
} else {
die "Can't parse source name $fname";

Re: CVS: cvs.openbsd.org: ports

[Stuart Henderson]

I wonder if we should do something to actively prevent building ports as
root. Is there a valid reason for doing this any more? Should we just exit
with an error if someone tries it?


On 12 September 2016 16:33:27 Antoine Jacoutot  wrote:


On Mon, Sep 12, 2016 at 09:28:30AM -0600, Jeremie Courreges-Anglas wrote:

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/09/12 09:28:30

Modified files:
net/libnice: Makefile
net/avahi  : Makefile
textproc/gtkspell3: Makefile

Log message:
Set PORTHOME to avoid junk directories in /

from Solene Rapenne.


For the record, I'm not a fan of this.
First it encourages people to build as root.
Second building things will always creates shits on your system, be it
under / or somewhere else.

--
Antoine

lftp man page broken

[Jiri B]

Hi,

lftp man pages is odd, see section for 'mirror' command.

~~~
$ cat /usr/local/man/cat1/lftp.0 | col -b | sed -n '/mirror.*OPTS/,/When using 
\-R/p' | head
   mirror [OPTS] [source [target]]

   Mirror specified source directory to local target directory. If the
   target directory ends with a slash (except the root), the source base
   name is appended to target directory name. Source and/or target can be
   URLs pointing to directories.

l1   llx   .  -c,  --continue T{ continue a mirror job if
possible T} -e,  --delete  T{ delete files not present at remote
site T}  --delete-first T{ delete old files before

~~~

On EL7:

~~~
# man -P cat lftp | col -b | sed -n '/mirror.*OPTS/,/When using \-R/p' | head
   mirror [OPTS] 
   ing to directories.

-c,--continuecontinue a mirror job if possible
-e,--delete  delete files not present at remote 
site
   --delete-firstdelete old files before 
transferring new ones
   --depth-first descend into subdirectories before 
transferring files
-s,--allow-suid  set suid/sgid bits according to 
remote site
[source [target]]

   Mirror  specified source directory to local target directory. If target 
directory ends with a slash, the source base name is appended to target 
directory name. Source and/or target can be URLs point
~~~

j.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/09/13 02:48:12

Modified files:
audio/deadbeef : Makefile distinfo 
audio/deadbeef/files: Makefile.am 
audio/deadbeef/patches: patch-Makefile_am patch-configure_ac 
patch-junklib_c 
patch-plugins_aac_Makefile_am 
patch-plugins_alac_Makefile_am 
patch-plugins_ao_Makefile_am 
patch-plugins_artwork_artwork_c 
patch-plugins_c 
patch-plugins_flac_Makefile_am 
patch-plugins_gtkui_Makefile_am 
patch-plugins_gtkui_prefwin_c 
patch-plugins_mms_Makefile_am 
patch-plugins_vorbis_Makefile_am 
audio/deadbeef/pkg: PLIST 
Added files:
audio/deadbeef/patches: patch-plugins_artwork_artwork_h 
patch-plugins_artwork_artwork_internal_c 
patch-plugins_dumb_Makefile_am 
patch-plugins_flac_flac_c 
patch-plugins_gtkui_coverart_c 
patch-plugins_mp3_mp3_h 
patch-plugins_notify_notify_c 
Removed files:
audio/deadbeef/patches: patch-playlist_c 
patch-plugins_cdda_cdda_c 
patch-plugins_converter_converter_c 
patch-plugins_ffmpeg_ffmpeg_c 
patch-plugins_gtkui_ddblistview_c 
patch-plugins_gtkui_ddblistview_h 
patch-plugins_lastfm_lastfm_c 
patch-plugins_vfs_zip_vfs_zip_c 
patch-plugins_wavpack_wavpack_c 
patch-streamer_c patch-utf8_c 

Log message:
Update to deadbeef-0.7.2

Most of the work done by Timo Myyra, thanks!
Some tweaks by me.

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2016/09/13 02:21:36

Modified files:
graphics/nomacs: Makefile distinfo 
graphics/nomacs/patches: patch-cmake_UnixBuildTarget_cmake 
graphics/nomacs/pkg: PLIST 

Log message:
update to nomacs-3.4
from maintainer Rafael Sadowski, thanks!
with some input from sthen@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/09/13 02:13:49

Modified files:
graphics/shotwell: Makefile distinfo 

Log message:
Update to shotwell-0.23.7.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/09/13 01:47:41

Modified files:
devel/llvm : Makefile 
devel/llvm/patches: patch-tools_clang_lib_Driver_Tools_cpp 
Added files:
devel/llvm/patches: patch-lib_CodeGen_StackProtector_cpp 
Removed files:
devel/llvm/patches: patch-Makefile_config_in 

Log message:
- Remove an obsolete patch that was for the GNU make build infrastructure
- Merge in the stack protector and EH frame header patches

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/09/13 01:45:04

Modified files:
net/netatalk3  : Makefile distinfo 
Removed files:
net/netatalk3/patches: patch-etc_afpd_volume_c 

Log message:
Update to netatalk-3.1.10.

Re: update audio/gsm

[Jeremie Courreges-Anglas]

Jan Stary  writes:

> On Sep 13 09:27:06, j...@wxcvbn.org wrote:
>> Jan Stary  writes:
>> 
>> > The diff below updates audio/gsm to 1.0.15,
>> > promptly released last night.
>> >
>> > There is no change to the gsm code itself,
>> > just a stale *.orig file was removed from the tarball.
>> > That's a minor change, but imho important enough
>> > - having a missplaced *.orig in the source
>> > confuses 'make update-patches'.
>> 
>> To work around this, see PATCHORIG in bsd.port.mk(5).
>
> The point of the update is that 1.0.15 does not have this problem
> - the erroneous gsm.h.orig from 1.0.14 is not there anymore.

Maybe I should have added "Next time, ...".  I was just giving a hint. ;)

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: update audio/gsm

[Jeremie Courreges-Anglas]

Jan Stary  writes:

> The diff below updates audio/gsm to 1.0.15,
> promptly released last night.
>
> There is no change to the gsm code itself,
> just a stale *.orig file was removed from the tarball.
> That's a minor change, but imho important enough
> - having a missplaced *.orig in the source
> confuses 'make update-patches'.

To work around this, see PATCHORIG in bsd.port.mk(5).

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE