text renering in gd

[Jordon]

I am working on getting a little hobby project to build in openbsd and have 
encountered some issues.
I have successfully built this in OS X and FreeBSD.  It needs clang and gd.

I’m pretty sure I am running a recent snapshot.  I have gd-2.1.1p3 installed.  
When I try to build, I get this:

/usr/local/lib/libgd.so.21.1: warning: warning: rand() may return deterministic 
values, is that what you want?
/usr/local/lib/libgd.so.21.1: warning: warning: strcpy() is almost always 
misused, please use strlcpy()
/usr/bin/ld: warning: libfreetype.so.27.0, needed by 
/usr/local/lib/libgd.so.21.1, not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libfontconfig.so.11.0, needed by 
/usr/local/lib/libgd.so.21.1, not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libpthread-stubs.so.2.0, needed by 
/usr/local/lib/libgd.so.21.1, not found (try using -rpath or -rpath-link)
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Init_FreeType'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Load_Glyph'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Done_Face'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Get_Kerning'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Get_Char_Index'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Done_Size'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Set_Charmap'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_New_Size'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Get_Glyph'
/usr/local/lib/libgd.so.21.1: undefined reference to `FcPatternGetString'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Glyph_To_Bitmap'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Attach_File'
/usr/local/lib/libgd.so.21.1: undefined reference to `FcConfigSubstitute'
/usr/local/lib/libgd.so.21.1: undefined reference to `FcPatternDestroy'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Done_FreeType'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Set_Char_Size'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Set_Transform'
/usr/local/lib/libgd.so.21.1: undefined reference to `FcPatternBuild'
/usr/local/lib/libgd.so.21.1: undefined reference to `FcNameParse'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Done_Glyph'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_New_Face'
/usr/local/lib/libgd.so.21.1: undefined reference to `FcFontMatch'
/usr/local/lib/libgd.so.21.1: undefined reference to `FT_Activate_Size'
/usr/local/lib/libgd.so.21.1: undefined reference to `FcDefaultSubstitute'


I installed freetype-1.3.1p4 (no difference) and couldn’t find fontconfig.  Is 
text rendering with gd unsupported in openbsd?  Is this an issue where not all 
packages are there for the snapshots?

Thanks
Jordon

CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/11/14 15:33:07

Modified files:
textproc/lua-yaml: Makefile distinfo 

Log message:
update to lua-yaml 6.1
ok Florian Stinglmayr (maintainer), fcambus@

UPDATE productivity/baikal 0.4.6

[Remi Locherer]

Hi

This is an update of baikal from 0.2.7 to 0.4.6.

I havn't tested an update with an actual database. An existing database
will not be overwritten by this update.o

Remi



Index: Makefile
===
RCS file: /cvs/ports/productivity/baikal/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile4 Feb 2016 13:14:15 -   1.12
+++ Makefile14 Nov 2016 21:56:41 -
@@ -2,35 +2,30 @@
 
 COMMENT=   lightweight CalDAV and CardDAV server
 
-DISTNAME=  baikal-regular-0.2.7
-PKGNAME=   ${DISTNAME:S/-regular//}
-EXTRACT_SUFX=  .tgz
+VERSION=   0.4.6
+DISTNAME=  baikal-${VERSION}
+MASTER_SITES=  https://github.com/fruux/Baikal/releases/download/${VERSION}/
+DISTFILES= ${DISTNAME}.zip
 CATEGORIES=productivity www
-REVISION=  2
 
-HOMEPAGE=  http://baikal-server.com/
+HOMEPAGE=  http://sabre.io/baikal/
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES=  http://baikal-server.com/get/
-
 MODULES=   lang/php
 
-WRKDIST=   ${WRKDIR}/baikal-regular/
-
 NO_BUILD=  Yes
 NO_TEST=   Yes
 PKG_ARCH=  *
 
-PREFIX=${VARBASE}/www
+PREFIX=${VARBASE}/www
 INSTDIR=   ${PREFIX}/baikal
+WRKSRC=${WRKDIR}/baikal
 SUBST_VARS=INSTDIR
 
 do-install:
${INSTALL_DATA_DIR} ${INSTDIR}
cd ${WRKSRC} && tar cf - . | (cd ${INSTDIR}; tar xf -)
-   find ${INSTDIR} -name '*.orig' -exec rm {} \;
-   mv ${INSTDIR}/Specific/db/db.sqlite{,.dist}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/productivity/baikal/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo9 Jun 2014 13:12:53 -   1.3
+++ distinfo14 Nov 2016 21:56:41 -
@@ -1,2 +1,2 @@
-SHA256 (baikal-regular-0.2.7.tgz) = 
Jo2u7Ja58bv+4MFjmK4hOr/oJ8l+xIcXmYWCi2JnNZ8=
-SIZE (baikal-regular-0.2.7.tgz) = 2273699
+SHA256 (baikal-0.4.6.zip) = lG6OQWH374S+QkMLbp07t91Lu+JBtAm+IIwURH16p6Y=
+SIZE (baikal-0.4.6.zip) = 3288478
Index: patches/patch-Specific_virtualhosts_baikal_nginx
===
RCS file: patches/patch-Specific_virtualhosts_baikal_nginx
diff -N patches/patch-Specific_virtualhosts_baikal_nginx
--- patches/patch-Specific_virtualhosts_baikal_nginx13 Sep 2013 15:27:58 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,35 +0,0 @@
-$OpenBSD: patch-Specific_virtualhosts_baikal_nginx,v 1.1 2013/09/13 15:27:58 
ajacoutot Exp $
 Specific/virtualhosts/baikal.nginx.origFri Sep 13 15:10:51 2013
-+++ Specific/virtualhosts/baikal.nginx Fri Sep 13 15:12:06 2013
-@@ -2,11 +2,11 @@ server {
- listen   80;
- server_name  dav.mydomain.com;
- 
--root  /var/www/dav.mydomain.com;
-+root  /var/www/baikal/html;
- index index.php;
- 
--  rewrite ^/.well-known/caldav /cal.php redirect;
--  rewrite ^/.well-known/carddav /card.php redirect;
-+rewrite ^/.well-known/caldav /cal.php redirect;
-+rewrite ^/.well-known/carddav /card.php redirect;
- 
- charset utf-8;
- 
-@@ -18,7 +18,7 @@ server {
- location ~ ^(.+\.php)(.*)$ {
- try_files $fastcgi_script_name =404;
- fastcgi_split_path_info  ^(.+\.php)(.*)$;
--fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
-+fastcgi_pass   127.0.0.1:9000;
- fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
- fastcgi_param  PATH_INFO$fastcgi_path_info;
- include/etc/nginx/fastcgi_params;
-@@ -26,6 +26,6 @@ server {
- 
- error_page   500 502 503 504  /50x.html;
- location = /50x.html {
--root   /var/www/nginx-default;
-+root   /var/www/htdocs;
- }
- }
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/baikal/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   9 Jun 2014 13:12:53 -   1.5
+++ pkg/PLIST   14 Nov 2016 21:56:42 -
@@ -1,13 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.5 2014/06/09 13:12:53 jasper Exp $
-@ask-update baikal-<0.2.4p1 Due to a bug in older versions of this package, 
backup baikal/Specific/db/db.sqlite before updating and restore it afterwards.
+@comment $OpenBSD$
 baikal/
-baikal/ChangeLog.md
+baikal/CHANGELOG.md
 baikal/Core/
 baikal/Core/Distrib.php
 baikal/Core/Frameworks/
 baikal/Core/Frameworks/Baikal/
 baikal/Core/Frameworks/Baikal/Core/
 baikal/Core/Frameworks/Baikal/Core/PDOBasicAuth.php
+baikal/Core/Frameworks/Baikal/Core/Server.php
 baikal/Core/Frameworks/Baikal/Core/Tools.php
 baikal/Core/Frameworks/Baikal/Framework.php
 baikal/Core/Frameworks/Baikal/Model/
@@ -26,8 +26,6 @@ baikal/Core/Frameworks/Baikal/Model/Conf
 baikal/Core/Frameworks/Baikal/Model/Principal.php
 baikal/Core/Frameworks/Baikal/Model/User.php
 baikal/Core/Frameworks/Baikal/WWWRoot/

Re: [NEW] textproc/distribution

[Taylor Stearns]

On Fri, Nov 04, 2016 at 05:52:49PM -0400, Taylor Stearns wrote:
> On Thu, Jun 16, 2016 at 07:28:43PM -0400, Taylor Stearns wrote:
> > A small but very handy Perl script that I use myself frequently, so made a 
> > port of
> > it. Upstream is https://github.com/philovivero/distribution
> > Looking for feedback or Ok. Thanks!
> > 
> > $ cat distribution/pkg/DESCR
> > Short, simple, direct scripts for creating character-based graphs in a 
> > command
> > terminal.
> > 
> > It was originally for generating histograms (a distribution of the 
> > frequency of
> > input tokens) but it has since been expanded to generate time-series graphs 
> > (or,
> > in fact, graphs with any arbitrary "x-axis") as well.
> > 
> 
> Attached is an update to version 1.3 of 'textproc/distribution'. Tests
> are now enabled in the Makefile, and a few bugs fixed upstream. Any
> takers? I find that this little utility is one of the first things I
> install on a new system.
> 
> -Taylor

Hi all, can anybody provide feedback on this port or commit it?

Thanks!
-Taylor


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

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2016/11/14 13:04:56

Modified files:
net/scapy  : Makefile distinfo 
net/scapy/patches: patch-scapy_config_py patch-setup_py 
net/scapy/pkg  : PLIST 
Removed files:
net/scapy/patches: patch-scapy_arch_unix_py 
   patch-scapy_sendrecv_py 
   patch-test_regression_uts 
   patch-test_run_tests 

Log message:
Update to scapy-2.3.3 and take maintainership (no objection from
previous maintainer armani@)

tested by bluhm@
previous diff ok sthen@

Re: [UPDATE] sysutils/rancid

[Pavel Korovin]

On 11/14, Ryan Freeman wrote:
> I think rather than using REVISION, just use pl at the end of the version
> number in DISTNAME like so:
> 
> DISTANAME = rancid-3.5.1pl1

OK, please see updated patch attached.

-- 
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rancid/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile15 May 2013 09:49:40 -  1.17
+++ Makefile14 Nov 2016 19:38:28 -
@@ -2,8 +2,9 @@
 
 COMMENT =  Really Awesome New Cisco confIg Differ
 
-DISTNAME = rancid-2.3.8
-REVISION = 0
+DISTNAME = rancid-3.5.1
+DISTPATCH =1
+PKGNAME =  ${DISTNAME}pl${DISTPATCH}
 EPOCH =0
 CATEGORIES =   sysutils
 
@@ -18,21 +19,21 @@ PERMIT_PACKAGE_FTP =Yes
 WANTLIB =  c util
 
 MASTER_SITES = ftp://ftp.shrubbery.net/pub/rancid/
+MASTER_SITES0 =ftp://ftp.shrubbery.net/pub/rancid/
+
+PATCHFILES =   ${DISTNAME}.p${DISTPATCH}.gz:0
 
 RUN_DEPENDS =  lang/expect
 BUILD_DEPENDS =${RUN_DEPENDS}
 
 LOCALSTATEDIR =${BASELOCALSTATEDIR}/rancid
 
-AUTOMAKE_VERSION =  1.8
-CONFIGURE_STYLE =  automake
+CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --prefix=${PREFIX} \
--disable-mk-localstatedir
 
+MAKE_FLAGS =   sysconfdir=${BASESYSCONFDIR}/rancid
+FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/rancid
 USE_GMAKE =yes
-USE_GROFF =Yes
-
-pre-configure:
-   @cp ${FILESDIR}/fnlogin.in ${WRKSRC}/bin/fnlogin.in
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rancid/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:15:14 -  1.6
+++ distinfo14 Nov 2016 19:38:28 -
@@ -1,2 +1,4 @@
-SHA256 (rancid-2.3.8.tar.gz) = RORMh6IpaNUinAHWCqRpYNoCOiSEbu9D+ePI1w/Vs/s=
-SIZE (rancid-2.3.8.tar.gz) = 379908
+SHA256 (rancid-3.5.1.p1.gz) = GqbR11OkR4dA3jbeTn8Zmiio1ZZ/iAfShCHJ4yogAPQ=
+SHA256 (rancid-3.5.1.tar.gz) = 82V5MNbr+FWs2WHJrK3v+wUM2e15gJ+tXbHB917PxxE=
+SIZE (rancid-3.5.1.p1.gz) = 202
+SIZE (rancid-3.5.1.tar.gz) = 501561
Index: files/fnlogin.in
===
RCS file: files/fnlogin.in
diff -N files/fnlogin.in
--- files/fnlogin.in16 Dec 2008 21:07:55 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,544 +0,0 @@
-#! @EXPECT_PATH@ --
-##
-## $Id: fnlogin.in,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
-##
-## rancid 2.3.2a7
-## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
-## All rights reserved.
-##
-## This software may be freely copied, modified and redistributed
-## without fee for non-commerical purposes provided that this license
-## remains intact and unmodified with any RANCID distribution.
-##
-## There is no warranty or other guarantee of fitness of this software.
-## It is provided solely "as is".  The author(s) disclaim(s) all
-## responsibility and liability with respect to this software's usage
-## or its effect upon hardware, computer systems, other software, or
-## anything else.
-##
-## Except where noted otherwise, rancid was written by and is maintained by
-## Henry Kilmer, John Heasley, Andrew Partan, Pete Whiting, and Austin Schutz.
-##
-#
-# The login expect scripts were based on Erik Sherk's gwtn, by permission.
-# Netscreen hacks implemented by Stephen Gill .
-#
-# nlogin - netscreen login
-#
-# Most options are intuitive for logging into a netscreen firewall.
-#
-# Misc notes
-#  netscreen does not have the concept of "enable", once logged in, a
-#  users permissions can not change.
-
-# Usage line
-set usage "Usage: $argv0 \[-c command\] \[-Evar=x\] \[-f cloginrc-file\] \
-\[-p user-password\] \
-\[-s script-file\] \[-t timeout\] \[-u username\] \
-\[-v vty-password\] \[-x command-file\] \
-\[-y ssh_cypher_type\] router \[router...\]\n"
-
-# env(CLOGIN) may contain:
-#  x == do not set xterm banner or name
-
-# Password file
-set password_file $env(HOME)/.cloginrc
-# Default is to login to the firewall
-set do_command 0
-set do_script 0
-# The default is to look in the password file to find the passwords.  This
-# tracks if we receive them on the command line.
-set do_passwd 1
-set do_enapasswd 1
-
-# Find the user in the ENV, or use the unix userid.
-if {[ info exists env(CISCO_USER) ]} {
-set default_user $env(CISCO_USER)
-} elseif {[ info exists env(USER) ]} {
-set default_user $env(USER)
-} elseif {[ info exists env(LOGNAME) ]} {
-set default_user $env(LOGNAME)
-} else {
-# This uses "id" which I think is portable.  At least it has existed
-# (without options) on all machines/OSes I've been on recently -
-# unlike whoami or id -nu.
-if [ catch {exec id} reason ] {
-   send_error "\nError: could not exec id: $reason\n"
-   exit 1
-}
-regexp {\(([^)]*)} "$reason" junk default_user

[UPDATE] sysutils/collectd + [NEW] sysutils/riemann-c-client

[Pavel Korovin]

Dear all,

Please find the update for sysutils/collectd to v5.6.1 attached.
Since the write_riemann plugin requires riemann-c-client library (the
change was introduced in collectd-5.6.0), the new port for
sysutils/riemann-c-client is also attached.

Tested on amd64.

-- 
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile7 Nov 2016 10:51:36 -   1.40
+++ Makefile14 Nov 2016 17:00:04 -
@@ -9,10 +9,9 @@ COMMENT-virt = collectd libvirt plugin
 COMMENT-python =   collectd python plugin
 COMMENT-memcachec =collectd memcachec plugin
 COMMENT-nut =  collectd nut plugin
+COMMENT-riemann =  collectd riemann plugin
 
-V =5.5.1
-REVISION-main =0
-REVISION-virt =1
+V =5.6.1
 DISTNAME = collectd-$V
 PKGNAME-main = collectd-$V
 PKGNAME-mysql =collectd-mysql-$V
@@ -23,6 +22,7 @@ PKGNAME-virt =collectd-virt-$V
 PKGNAME-python =   collectd-python-$V
 PKGNAME-memcachec =collectd-memcachec-$V
 PKGNAME-nut =  collectd-nut-$V
+PKGNAME-riemann =  collectd-riemann-$V
 CATEGORIES =   sysutils
 
 HOMEPAGE = http://www.collectd.org/
@@ -32,11 +32,13 @@ SHARED_LIBS +=  collectdclient 1.0
 PERMIT_PACKAGE_CDROM = Yes
 
 MASTER_SITES = ${HOMEPAGE}/files/
+EXTRACT_SUFX = .tar.bz2
 
 MODULES =  devel/gettext lang/python
 MODPY_RUNDEP = No
 
-MULTI_PACKAGES =   -main -mysql -pgsql -rrdtool -snmp -virt -python 
-memcachec -nut
+MULTI_PACKAGES =   -main -mysql -pgsql -rrdtool -snmp -virt -python 
-memcachec -nut -riemann
+   
 
 WANTLIB-mysql =crypto m ssl z mysqlclient_r pthread
 LIB_DEPENDS-mysql =databases/mariadb
@@ -78,6 +80,11 @@ LIB_DEPENDS-nut =nut->=2.7.3p0:sysutils
 RUN_DEPENDS-nut =  collectd-$V:${BASE_PKGPATH},-main
 WANTLIB-nut =  crypto pthread ssl upsclient
 
+LIB_DEPENDS-riemann =  sysutils/riemann-c-client
+WANTLIB-riemann =  c gmp gnutls ffi hogweed intl iconv idn json-c m \
+   nettle protobuf p11-kit pthread riemann-client stdc++ 
tasn1 z
+RUN_DEPENDS-riemann =  collectd-$V:${BASE_PKGPATH},-main
+
 LIB_DEPENDS += net/curl \
net/liboping \
textproc/libxml \
@@ -99,7 +106,7 @@ CONFIGURE_ARGS +=--with-ltdl-include=${L
--with-ltdl-lib=${LOCALBASE}/lib \
--with-librrd=${LOCALBASE} \
--with-libstatgrab=${LOCALBASE} \
-   --with-libnetsnmp=${LOCALBASE}/bin/net-snmp-config \
+   --with-libnetsnmp=${LOCALBASE} \
--with-python=${MODPY_BIN} \
--enable-all-plugins=no
 
@@ -117,12 +124,14 @@ ENABLED_PLUGINS = apache apcups ascent b
users uuid write_http write_graphite pf python virt 
memcachec nut \
aggregation curl_json log_logstash memcached \
threshold write_log write_riemann
+#  threshold write_log
 
 .for _plugin in ${ENABLED_PLUGINS}
 CONFIGURE_ARGS += --enable-${_plugin}
 .endfor
 
-CONFIGURE_ENV +=   CPPFLAGS='-I${LOCALBASE}/include' \
+CONFIGURE_ENV +=   PYTHON_CONFIG='${LOCALBASE}/bin/python2.7-config' \
+   CPPFLAGS='-I${LOCALBASE}/include' \
LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread'
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo13 Jun 2016 09:12:40 -  1.7
+++ distinfo14 Nov 2016 17:00:04 -
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.5.1.tar.gz) = TbpR1iQ/93hY//H/vv5vZShoH/IZBR8SKqJyfiYnEHk=
-SIZE (collectd-5.5.1.tar.gz) = 2254181
+SHA256 (collectd-5.6.1.tar.bz2) = ww/2RPkUB7TcLZl4e5nMRewA5Ti9HMJpQp08XopK7iw=
+SIZE (collectd-5.6.1.tar.bz2) = 1903962
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in   13 Jun 2016 09:12:40 -  1.6
+++ patches/patch-Makefile_in   14 Nov 2016 17:00:04 -
@@ -1,8 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2016/06/13 09:12:40 landry Exp $
-dont create var/{run,lib,log}
 Makefile.in.orig   Fri Jan 22 10:55:46 2016
-+++ Makefile.inMon Jun  6 09:18:40 2016
-@@ -947,9 +947,6 @@ uninstall-am:
+$OpenBSD$
+--- Makefile.in.orig   Wed Nov  9 19:58:43 2016
 Makefile.inWed Nov  9 19:59:27 2016
+@@ -988,9 +988,6 @@ uninstall-am:
  
  
  install-exec-hook:
Index: patches/patch-configure

Re: [UPDATE] sysutils/rancid

[Ryan Freeman]

On Mon, Nov 14, 2016 at 10:12:37PM +0300, Pavel Korovin wrote:
> On 11/14, Jeremie Courreges-Anglas wrote:
> > 
> > REVISION can be removed.
> 
> The reason I added REVISION is the official patch
> ftp://ftp.shrubbery.net/pub/rancid/rancid-3.5.1.p1.gz
> 
> Sometimes Shrubbery releases several patches before major release so
> I'm using REVISION to keep it clear which patchlevel I have. I'm not
> sure how to keep it with OpenBSD port's REVISION, please advise.

I think rather than using REVISION, just use pl at the end of the version
number in DISTNAME like so:

DISTANAME = rancid-3.5.1pl1

You can increase that trailing digit for each new patch sets come out.

Cheers,
-ryan

> 
> > "@ask-update rancid-<3v0 Make sure ..." is v0 needed here?  I see that
> > your previous submission didn't have it.
> > 
> > Is the router.db format the only issue?  What happens if the format
> > isn't upgraded before rancid-3 runs?
> 
> I switched to v3 about 2 years ago. I remember I had problems making it
> conflict with versions <3. I had to use 3v0 to make @ask-update work.
> In case it's upgraded without prior modifications to router.db, it will
> put garbage in CVS tree in best case.
> 
> -- 
> With best regards,
> Pavel Korovin
> 

Re: [UPDATE] sysutils/rancid

[Pavel Korovin]

On 11/14, Jeremie Courreges-Anglas wrote:
> 
> REVISION can be removed.

The reason I added REVISION is the official patch
ftp://ftp.shrubbery.net/pub/rancid/rancid-3.5.1.p1.gz

Sometimes Shrubbery releases several patches before major release so
I'm using REVISION to keep it clear which patchlevel I have. I'm not
sure how to keep it with OpenBSD port's REVISION, please advise.

> "@ask-update rancid-<3v0 Make sure ..." is v0 needed here?  I see that
> your previous submission didn't have it.
> 
> Is the router.db format the only issue?  What happens if the format
> isn't upgraded before rancid-3 runs?

I switched to v3 about 2 years ago. I remember I had problems making it
conflict with versions <3. I had to use 3v0 to make @ask-update work.
In case it's upgraded without prior modifications to router.db, it will
put garbage in CVS tree in best case.

-- 
With best regards,
Pavel Korovin

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/11/14 11:55:50

Modified files:
graphics/py-matplotlib: Makefile distinfo 
graphics/py-matplotlib/patches: patch-setupext_py 
patch-src__gtkagg_cpp 
graphics/py-matplotlib/pkg: PLIST 
Added files:
graphics/py-matplotlib/patches: 

patch-lib_matplotlib_sphinxext_tests_test_tinypages_py 
graphics/py-matplotlib/pkg: PFRAG.no-python3 
Removed files:
graphics/py-matplotlib/patches: 

patch-lib_matplotlib_testing_decorators_py 

Log message:
Update to py-matplotlib 1.5.3.

ok daniel@ (maintainer)

Re: [UPDATE] sysutils/collectd + [NEW] sysutils/riemann-c-client

[Pavel Korovin]

Sorry, forgot to cvs delete before diff.
The correct diff for sysutils/collectd attached.

-- 
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile7 Nov 2016 10:51:36 -   1.40
+++ Makefile14 Nov 2016 17:31:23 -
@@ -9,10 +9,9 @@ COMMENT-virt = collectd libvirt plugin
 COMMENT-python =   collectd python plugin
 COMMENT-memcachec =collectd memcachec plugin
 COMMENT-nut =  collectd nut plugin
+COMMENT-riemann =  collectd riemann plugin
 
-V =5.5.1
-REVISION-main =0
-REVISION-virt =1
+V =5.6.1
 DISTNAME = collectd-$V
 PKGNAME-main = collectd-$V
 PKGNAME-mysql =collectd-mysql-$V
@@ -23,6 +22,7 @@ PKGNAME-virt =collectd-virt-$V
 PKGNAME-python =   collectd-python-$V
 PKGNAME-memcachec =collectd-memcachec-$V
 PKGNAME-nut =  collectd-nut-$V
+PKGNAME-riemann =  collectd-riemann-$V
 CATEGORIES =   sysutils
 
 HOMEPAGE = http://www.collectd.org/
@@ -32,11 +32,13 @@ SHARED_LIBS +=  collectdclient 1.0
 PERMIT_PACKAGE_CDROM = Yes
 
 MASTER_SITES = ${HOMEPAGE}/files/
+EXTRACT_SUFX = .tar.bz2
 
 MODULES =  devel/gettext lang/python
 MODPY_RUNDEP = No
 
-MULTI_PACKAGES =   -main -mysql -pgsql -rrdtool -snmp -virt -python 
-memcachec -nut
+MULTI_PACKAGES =   -main -mysql -pgsql -rrdtool -snmp -virt -python 
-memcachec -nut -riemann
+   
 
 WANTLIB-mysql =crypto m ssl z mysqlclient_r pthread
 LIB_DEPENDS-mysql =databases/mariadb
@@ -78,6 +80,11 @@ LIB_DEPENDS-nut =nut->=2.7.3p0:sysutils
 RUN_DEPENDS-nut =  collectd-$V:${BASE_PKGPATH},-main
 WANTLIB-nut =  crypto pthread ssl upsclient
 
+LIB_DEPENDS-riemann =  sysutils/riemann-c-client
+WANTLIB-riemann =  c gmp gnutls ffi hogweed intl iconv idn json-c m \
+   nettle protobuf p11-kit pthread riemann-client stdc++ 
tasn1 z
+RUN_DEPENDS-riemann =  collectd-$V:${BASE_PKGPATH},-main
+
 LIB_DEPENDS += net/curl \
net/liboping \
textproc/libxml \
@@ -99,7 +106,7 @@ CONFIGURE_ARGS +=--with-ltdl-include=${L
--with-ltdl-lib=${LOCALBASE}/lib \
--with-librrd=${LOCALBASE} \
--with-libstatgrab=${LOCALBASE} \
-   --with-libnetsnmp=${LOCALBASE}/bin/net-snmp-config \
+   --with-libnetsnmp=${LOCALBASE} \
--with-python=${MODPY_BIN} \
--enable-all-plugins=no
 
@@ -117,12 +124,14 @@ ENABLED_PLUGINS = apache apcups ascent b
users uuid write_http write_graphite pf python virt 
memcachec nut \
aggregation curl_json log_logstash memcached \
threshold write_log write_riemann
+#  threshold write_log
 
 .for _plugin in ${ENABLED_PLUGINS}
 CONFIGURE_ARGS += --enable-${_plugin}
 .endfor
 
-CONFIGURE_ENV +=   CPPFLAGS='-I${LOCALBASE}/include' \
+CONFIGURE_ENV +=   PYTHON_CONFIG='${LOCALBASE}/bin/python2.7-config' \
+   CPPFLAGS='-I${LOCALBASE}/include' \
LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread'
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/collectd/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo13 Jun 2016 09:12:40 -  1.7
+++ distinfo14 Nov 2016 17:31:23 -
@@ -1,2 +1,2 @@
-SHA256 (collectd-5.5.1.tar.gz) = TbpR1iQ/93hY//H/vv5vZShoH/IZBR8SKqJyfiYnEHk=
-SIZE (collectd-5.5.1.tar.gz) = 2254181
+SHA256 (collectd-5.6.1.tar.bz2) = ww/2RPkUB7TcLZl4e5nMRewA5Ti9HMJpQp08XopK7iw=
+SIZE (collectd-5.6.1.tar.bz2) = 1903962
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in   13 Jun 2016 09:12:40 -  1.6
+++ patches/patch-Makefile_in   14 Nov 2016 17:31:23 -
@@ -1,8 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2016/06/13 09:12:40 landry Exp $
-dont create var/{run,lib,log}
 Makefile.in.orig   Fri Jan 22 10:55:46 2016
-+++ Makefile.inMon Jun  6 09:18:40 2016
-@@ -947,9 +947,6 @@ uninstall-am:
+$OpenBSD$
+--- Makefile.in.orig   Wed Nov  9 19:58:43 2016
 Makefile.inWed Nov  9 19:59:27 2016
+@@ -988,9 +988,6 @@ uninstall-am:
  
  
  install-exec-hook:
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 13 Jun 2016 

Re: [UPDATE] sysutils/rancid

[Jeremie Courreges-Anglas]

Cc'ing maintainer,

Pavel Korovin  writes:

> Sorry for the noise, the corrected patch attached.

REVISION can be removed.

"@ask-update rancid-<3v0 Make sure ..." is v0 needed here?  I see that
your previous submission didn't have it.

Is the router.db format the only issue?  What happens if the format
isn't upgraded before rancid-3 runs?

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

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/11/14 11:45:08

Modified files:
www/tomcat/v8  : Makefile distinfo 
www/tomcat/v8/pkg: PLIST-examples 

Log message:
Update to tomcat-8.5.8

CVS: cvs.openbsd.org: ports

[Giovanni Bechis]

CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2016/11/14 11:41:12

Modified files:
misc/memcached : Tag: OPENBSD_6_0 Makefile distinfo 
misc/memcached/patches: Tag: OPENBSD_6_0 patch-memcached_c 
Removed files:
misc/memcached/patches: Tag: OPENBSD_6_0 patch-items_c 

Log message:
Security update to 1.4.33
ok sthen@

Re: [UPDATE] sysutils/rancid

[Pavel Korovin]

Sorry for the noise, the corrected patch attached.

-- 
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rancid/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile15 May 2013 09:49:40 -  1.17
+++ Makefile14 Nov 2016 18:20:38 -
@@ -2,9 +2,9 @@
 
 COMMENT =  Really Awesome New Cisco confIg Differ
 
-DISTNAME = rancid-2.3.8
-REVISION = 0
+DISTNAME = rancid-3.5.1
 EPOCH =0
+REVISION = 1
 CATEGORIES =   sysutils
 
 HOMEPAGE = http://www.shrubbery.net/rancid/
@@ -18,21 +18,21 @@ PERMIT_PACKAGE_FTP =Yes
 WANTLIB =  c util
 
 MASTER_SITES = ftp://ftp.shrubbery.net/pub/rancid/
+MASTER_SITES0 =ftp://ftp.shrubbery.net/pub/rancid/
+
+PATCHFILES =   ${DISTNAME}.p${REVISION}.gz:0
 
 RUN_DEPENDS =  lang/expect
 BUILD_DEPENDS =${RUN_DEPENDS}
 
 LOCALSTATEDIR =${BASELOCALSTATEDIR}/rancid
 
-AUTOMAKE_VERSION =  1.8
-CONFIGURE_STYLE =  automake
+CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --prefix=${PREFIX} \
--disable-mk-localstatedir
 
+MAKE_FLAGS =   sysconfdir=${BASESYSCONFDIR}/rancid
+FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/rancid
 USE_GMAKE =yes
-USE_GROFF =Yes
-
-pre-configure:
-   @cp ${FILESDIR}/fnlogin.in ${WRKSRC}/bin/fnlogin.in
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rancid/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:15:14 -  1.6
+++ distinfo14 Nov 2016 18:20:38 -
@@ -1,2 +1,4 @@
-SHA256 (rancid-2.3.8.tar.gz) = RORMh6IpaNUinAHWCqRpYNoCOiSEbu9D+ePI1w/Vs/s=
-SIZE (rancid-2.3.8.tar.gz) = 379908
+SHA256 (rancid-3.5.1.p1.gz) = GqbR11OkR4dA3jbeTn8Zmiio1ZZ/iAfShCHJ4yogAPQ=
+SHA256 (rancid-3.5.1.tar.gz) = 82V5MNbr+FWs2WHJrK3v+wUM2e15gJ+tXbHB917PxxE=
+SIZE (rancid-3.5.1.p1.gz) = 202
+SIZE (rancid-3.5.1.tar.gz) = 501561
Index: files/fnlogin.in
===
RCS file: files/fnlogin.in
diff -N files/fnlogin.in
--- files/fnlogin.in16 Dec 2008 21:07:55 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,544 +0,0 @@
-#! @EXPECT_PATH@ --
-##
-## $Id: fnlogin.in,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
-##
-## rancid 2.3.2a7
-## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
-## All rights reserved.
-##
-## This software may be freely copied, modified and redistributed
-## without fee for non-commerical purposes provided that this license
-## remains intact and unmodified with any RANCID distribution.
-##
-## There is no warranty or other guarantee of fitness of this software.
-## It is provided solely "as is".  The author(s) disclaim(s) all
-## responsibility and liability with respect to this software's usage
-## or its effect upon hardware, computer systems, other software, or
-## anything else.
-##
-## Except where noted otherwise, rancid was written by and is maintained by
-## Henry Kilmer, John Heasley, Andrew Partan, Pete Whiting, and Austin Schutz.
-##
-#
-# The login expect scripts were based on Erik Sherk's gwtn, by permission.
-# Netscreen hacks implemented by Stephen Gill .
-#
-# nlogin - netscreen login
-#
-# Most options are intuitive for logging into a netscreen firewall.
-#
-# Misc notes
-#  netscreen does not have the concept of "enable", once logged in, a
-#  users permissions can not change.
-
-# Usage line
-set usage "Usage: $argv0 \[-c command\] \[-Evar=x\] \[-f cloginrc-file\] \
-\[-p user-password\] \
-\[-s script-file\] \[-t timeout\] \[-u username\] \
-\[-v vty-password\] \[-x command-file\] \
-\[-y ssh_cypher_type\] router \[router...\]\n"
-
-# env(CLOGIN) may contain:
-#  x == do not set xterm banner or name
-
-# Password file
-set password_file $env(HOME)/.cloginrc
-# Default is to login to the firewall
-set do_command 0
-set do_script 0
-# The default is to look in the password file to find the passwords.  This
-# tracks if we receive them on the command line.
-set do_passwd 1
-set do_enapasswd 1
-
-# Find the user in the ENV, or use the unix userid.
-if {[ info exists env(CISCO_USER) ]} {
-set default_user $env(CISCO_USER)
-} elseif {[ info exists env(USER) ]} {
-set default_user $env(USER)
-} elseif {[ info exists env(LOGNAME) ]} {
-set default_user $env(LOGNAME)
-} else {
-# This uses "id" which I think is portable.  At least it has existed
-# (without options) on all machines/OSes I've been on recently -
-# unlike whoami or id -nu.
-if [ catch {exec id} reason ] {
-   send_error "\nError: could not exec id: $reason\n"
-   exit 1
-}
-regexp {\(([^)]*)} "$reason" junk default_user
-}
-if {[ info exists env(CLOGINRC) ]} {
-set password_file $env(CLOGINRC)
-}
-
-# Sometimes firewall take awhile to answer (the default is 10 sec)

Re: GSSAPI flavor for Dovecot

[William Leuschner]

Hello, ports@!

Has anyone had a chance to look at this yet?

- William

On 10/31/2016 2:45 PM, William Leuschner wrote:
> Hello again, porters!
> 
> I've written a new flavor for Dovecot to add support for GSSAPI. Could
> someone take a look at it?
> 
> Thanks,
> William Leuschner
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/Makefile,v
> retrieving revision 1.342
> diff -u -p -r1.342 Makefile
> --- Makefile  11 Jul 2016 10:15:18 -  1.342
> +++ Makefile  31 Oct 2016 18:41:24 -
> @@ -33,6 +33,7 @@
>   SUBDIR += dkim-milter
>   SUBDIR += dkimproxy
>   SUBDIR += dovecot
> + SUBDIR += dovecot,gssapi
>   SUBDIR += dovecot-antispam
>   SUBDIR += dovecot-pigeonhole
>   SUBDIR += dspam
> Index: dovecot/Makefile
> ===
> RCS file: /cvs/ports/mail/dovecot/Makefile,v
> retrieving revision 1.241
> diff -u -p -r1.241 Makefile
> --- dovecot/Makefile  5 Jul 2016 09:27:35 -   1.241
> +++ dovecot/Makefile  31 Oct 2016 18:41:24 -
> @@ -7,7 +7,7 @@ COMMENT-postgresql= PostgreSQL authentic
> 
>  V_MAJOR= 2.2
>  V_DOVECOT=   2.2.24
> -REVISION=0
> +REVISION=1
> 
>  DISTNAME=dovecot-${V_DOVECOT}
>  PKGNAME= dovecot-${V_DOVECOT}
> @@ -66,10 +66,17 @@ CONFIGURE_ARGS=   --with-rundir=/var/dovec
>  CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
> 
> +FLAVORS= gssapi
>  PSEUDO_FLAVORS=  no_db no_ldap no_mysql no_postgresql
>  FLAVOR?=
>  .if ${FLAVOR:Mno_db}
>  FLAVOR+= no_ldap no_mysql no_postgresql
> +.endif
> +
> +.if ${FLAVOR:Mgssapi}
> +CONFIGURE_ARGS+=KRB5CONFIG=/usr/local/heimdal/bin/krb5-config
> +CONFIGURE_ARGS+=--with-gssapi=yes
> +MODULES+=security/heimdal
>  .endif
> 
>  MULTI_PACKAGES= -server -ldap -mysql -postgresql
> Index: dovecot/pkg/DESCR-server
> ===
> RCS file: /cvs/ports/mail/dovecot/pkg/DESCR-server,v
> retrieving revision 1.6
> diff -u -p -r1.6 DESCR-server
> --- dovecot/pkg/DESCR-server  28 May 2011 19:40:41 -  1.6
> +++ dovecot/pkg/DESCR-server  31 Oct 2016 18:41:24 -
> @@ -4,3 +4,6 @@ several coding techniques to avoid most
>  can work with standard mbox and maildir formats and it's fully compatible
>  with UW-IMAP and Courier IMAP servers as well as mail clients accessing
>  the mailboxes directly.
> +
> +Flavors:
> +gssapi: support for GSSAPI authentication in Dovecot
> 

[UPDATE] sysutils/rancid

[Pavel Korovin]

Dear all,

Please see the update for sysutils/rancid attached.

-- 
With best regards,
Pavel Korovin
? patches/patch-etc_rancid_conf_sample_in
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rancid/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile15 May 2013 09:49:40 -  1.17
+++ Makefile14 Nov 2016 17:57:47 -
@@ -2,9 +2,9 @@
 
 COMMENT =  Really Awesome New Cisco confIg Differ
 
-DISTNAME = rancid-2.3.8
-REVISION = 0
+DISTNAME = rancid-3.5.1
 EPOCH =0
+REVISION = 1
 CATEGORIES =   sysutils
 
 HOMEPAGE = http://www.shrubbery.net/rancid/
@@ -18,21 +18,21 @@ PERMIT_PACKAGE_FTP =Yes
 WANTLIB =  c util
 
 MASTER_SITES = ftp://ftp.shrubbery.net/pub/rancid/
+MASTER_SITES0 =ftp://ftp.shrubbery.net/pub/rancid/
+
+PATCHFILES =   ${DISTNAME}.p${REVISION}.gz:0
 
 RUN_DEPENDS =  lang/expect
 BUILD_DEPENDS =${RUN_DEPENDS}
 
 LOCALSTATEDIR =${BASELOCALSTATEDIR}/rancid
 
-AUTOMAKE_VERSION =  1.8
-CONFIGURE_STYLE =  automake
+CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --prefix=${PREFIX} \
--disable-mk-localstatedir
 
+MAKE_FLAGS =   sysconfdir=${BASESYSCONFDIR}/rancid
+FAKE_FLAGS =   sysconfdir=${PREFIX}/share/examples/rancid
 USE_GMAKE =yes
-USE_GROFF =Yes
-
-pre-configure:
-   @cp ${FILESDIR}/fnlogin.in ${WRKSRC}/bin/fnlogin.in
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rancid/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:15:14 -  1.6
+++ distinfo14 Nov 2016 17:57:47 -
@@ -1,2 +1,4 @@
-SHA256 (rancid-2.3.8.tar.gz) = RORMh6IpaNUinAHWCqRpYNoCOiSEbu9D+ePI1w/Vs/s=
-SIZE (rancid-2.3.8.tar.gz) = 379908
+SHA256 (rancid-3.5.1.p1.gz) = GqbR11OkR4dA3jbeTn8Zmiio1ZZ/iAfShCHJ4yogAPQ=
+SHA256 (rancid-3.5.1.tar.gz) = 82V5MNbr+FWs2WHJrK3v+wUM2e15gJ+tXbHB917PxxE=
+SIZE (rancid-3.5.1.p1.gz) = 202
+SIZE (rancid-3.5.1.tar.gz) = 501561
Index: files/fnlogin.in
===
RCS file: files/fnlogin.in
diff -N files/fnlogin.in
--- files/fnlogin.in16 Dec 2008 21:07:55 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,544 +0,0 @@
-#! @EXPECT_PATH@ --
-##
-## $Id: fnlogin.in,v 1.1.1.1 2008/12/16 21:07:55 pea Exp $
-##
-## rancid 2.3.2a7
-## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
-## All rights reserved.
-##
-## This software may be freely copied, modified and redistributed
-## without fee for non-commerical purposes provided that this license
-## remains intact and unmodified with any RANCID distribution.
-##
-## There is no warranty or other guarantee of fitness of this software.
-## It is provided solely "as is".  The author(s) disclaim(s) all
-## responsibility and liability with respect to this software's usage
-## or its effect upon hardware, computer systems, other software, or
-## anything else.
-##
-## Except where noted otherwise, rancid was written by and is maintained by
-## Henry Kilmer, John Heasley, Andrew Partan, Pete Whiting, and Austin Schutz.
-##
-#
-# The login expect scripts were based on Erik Sherk's gwtn, by permission.
-# Netscreen hacks implemented by Stephen Gill .
-#
-# nlogin - netscreen login
-#
-# Most options are intuitive for logging into a netscreen firewall.
-#
-# Misc notes
-#  netscreen does not have the concept of "enable", once logged in, a
-#  users permissions can not change.
-
-# Usage line
-set usage "Usage: $argv0 \[-c command\] \[-Evar=x\] \[-f cloginrc-file\] \
-\[-p user-password\] \
-\[-s script-file\] \[-t timeout\] \[-u username\] \
-\[-v vty-password\] \[-x command-file\] \
-\[-y ssh_cypher_type\] router \[router...\]\n"
-
-# env(CLOGIN) may contain:
-#  x == do not set xterm banner or name
-
-# Password file
-set password_file $env(HOME)/.cloginrc
-# Default is to login to the firewall
-set do_command 0
-set do_script 0
-# The default is to look in the password file to find the passwords.  This
-# tracks if we receive them on the command line.
-set do_passwd 1
-set do_enapasswd 1
-
-# Find the user in the ENV, or use the unix userid.
-if {[ info exists env(CISCO_USER) ]} {
-set default_user $env(CISCO_USER)
-} elseif {[ info exists env(USER) ]} {
-set default_user $env(USER)
-} elseif {[ info exists env(LOGNAME) ]} {
-set default_user $env(LOGNAME)
-} else {
-# This uses "id" which I think is portable.  At least it has existed
-# (without options) on all machines/OSes I've been on recently -
-# unlike whoami or id -nu.
-if [ catch {exec id} reason ] {
-   send_error "\nError: could not exec id: $reason\n"
-   exit 1
-}
-regexp {\(([^)]*)} "$reason" junk default_user
-}
-if {[ info exists env(CLOGINRC) ]} {
-set password_file $env(CLOGINRC)
-}
-
-# Sometimes 

CVS: cvs.openbsd.org: ports

[Giovanni Bechis]

CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2016/11/14 10:44:49

Modified files:
misc/memcached : Makefile distinfo 

Log message:
Security update to 1.4.33
fixes a remote code execution but pledge(2) is protecting us

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/11/14 10:31:39

Modified files:
lang/lucee : Makefile distinfo 
lang/lucee/patches: patch-WEB-INF_web_xml 
lang/lucee/pkg : PLIST 

Log message:
update to lucee-5.1.0.34 (moving to the 5.1-stable branch).

Re: UPDATE: textproc/lua-yaml 6.1

[Florian Stinglmayr]

On Sun, Nov 13, 2016 at 04:31:40PM +1100, Jonathan Gray wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/lua-yaml/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile  16 Oct 2016 23:21:23 -  1.2
> +++ Makefile  13 Nov 2016 05:12:28 -
> @@ -1,7 +1,7 @@
>  # $OpenBSD: Makefile,v 1.2 2016/10/16 23:21:23 jca Exp $
>
>  COMMENT =Lua library for parsing and emitting YAML
> -V =  6.0
> +V =  6.1
>
>  PKGNAME =lua-yaml-${V}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/lua-yaml/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo  24 Apr 2016 02:36:45 -  1.1.1.1
> +++ distinfo  13 Nov 2016 05:12:40 -
> @@ -1,2 +1,2 @@
> -SHA256 (lyaml-release-v6.0.tar.gz) = 
> nXz3TXdpmf9vdYxWnVIC/12h8wPG9CKdO0H3HNOj56c=
> -SIZE (lyaml-release-v6.0.tar.gz) = 475288
> +SHA256 (lyaml-release-v6.1.tar.gz) = 
> cGPlDfzuJfh/Gin8LXXRLl2P2DUiqZk21RhBw/N0hRo=
> +SIZE (lyaml-release-v6.1.tar.gz) = 476721
>

Looks and works with my project & lua flavour (5.3)

OK maintainer

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/14 08:49:12

Modified files:
misc/gtk3mm-documentation: Makefile distinfo 
misc/gtk3mm-documentation/pkg: PLIST 

Log message:
Update to gtk3mm-documentation-3.22.0.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/11/14 08:29:24

Modified files:
print/hplip: Makefile 
print/hplip/patches: patch-setup_py 

Log message:
Fix printing a test page from hp-setup

OK ajacoutot@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/14 05:58:23

Modified files:
print/hplip: Makefile 
print/hplip/pkg: PLIST-hpijs 

Log message:
Create a link from foomatic-rip to foomatic-rip-hplip; some old filters
still look for it.

reported by dcoppa@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/14 05:46:09

Modified files:
textproc/libxml++3: Makefile distinfo 
textproc/libxml++3/pkg: PLIST 

Log message:
Update to libxml++3-3.0.1.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2016/11/14 02:35:38

Modified files:
net/xl2tpd : Makefile distinfo 
net/xl2tpd/patches: patch-Makefile 
Removed files:
net/xl2tpd/patches: patch-call_c patch-call_h patch-l2tp_h 
patch-network_c patch-xl2tpd-control_c 

Log message:
Update to xl2tpd 1.3.8, xelerance switched to github.

Most of our patches merged upstream, and while here remove a -Os from
CFLAGS (spotted by jca@). With this update, i've (finally!) been able to
connect to an OpenBSD VPN running isakmpd with psk/npppd.

ok sthen@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2016/11/14 02:10:59

Modified files:
editors/le : Makefile 

Log message:
Remove unneeded LIB_DEPENDS.

OK maintainer (Ivan Ivanov)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/11/14 01:47:45

Modified files:
print/libpaper : Makefile distinfo 

Log message:
Update to libpaper-1.1.24.5.

Re: NEW: devel/py-nose-warnings-filters 0.1.2

[Alexandr Shadchin]

On Thu, Sep 29, 2016 at 09:06:53PM +0500, Alexandr Shadchin wrote:
> Hi,
> 
> ok to import?
> 
> Need for update IPython 5.
> 
> DESCR:
> 
> Allow to inject warning filters during nosetest.
> 
> -- 
> Alexandr Shadchin
> 

Update to py-nose-warnings_filters 0.1.5.

ok to import?

-- 
Alexandr Shadchin



py-nose-warnings-filters.tgz
Description: application/tar-gz

Re: UPDATE: devel/doxygen

[Nigel Taylor]

On 11/13/16 22:54, Jeremie Courreges-Anglas wrote:
> Jeremie Courreges-Anglas  writes:
> 
>> Stuart Henderson  writes:
> 
> [...]
> 
>>> 3. split the gui off to a different port. keep the same pkgname stem,
>>> so it just needs an @pkgpath in PLIST for updates to work.
>>
>> I'd prefer this option.
> 
> In the meantime, let's unbreak the current situation by going back to
> Qt4.  Rafael, does the -Dforce_qt4:Bool=ON part actually works?  I don't
> have Qt5 anymore on this machine...
> 
> ok?
> 
> 
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/devel/doxygen/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- Makefile  12 Nov 2016 20:59:18 -  1.37
> +++ Makefile  13 Nov 2016 22:48:32 -
> @@ -3,8 +3,6 @@
>  # Memory hog, stuck for days on the same file (configoptions.cpp) during 
> build.
>  # XXX check with different optimizer level? see doc/install.doc
>  NOT_FOR_ARCHS=   m88k sh
> -# Qt5 doesn't build yet on powerpc
> -NOT_FOR_ARCHS-gui=   m88k sh powerpc
>  BROKEN-alpha=.got subsegment exceeds 64K
>  
>  COMMENT-main=source code documentation generator tool
> @@ -15,6 +13,9 @@ DISTNAME=   doxygen-${VERSION}.src
>  PKGNAME-main=doxygen-${VERSION}
>  FULLPKGNAME-gui=doxygen-gui-${VERSION}
>  
> +REVISION-main=   0
> +REVISION-gui=0
> +
>  CATEGORIES=  devel textproc
>  
>  HOMEPAGE=http://www.doxygen.org/
> @@ -30,10 +31,8 @@ MASTER_SITES=  http://ftp.stack.nl/pub/us
>  MULTI_PACKAGES=  -main -gui
>  PSEUDO_FLAVORS=  no_gui bootstrap
>  
> -COMMON_WANTLIB= c m pthread estdc++
> -WANTLIB-main=${COMMON_WANTLIB} iconv z xapian
> -WANTLIB-gui= Qt5Core Qt5Gui Qt5Widgets Qt5Xml \
> - ${COMMON_WANTLIB}
> +WANTLIB-main +=  c iconv m pthread stdc++ xapian z
> +WANTLIB-gui +=   QtCore QtGui QtXml c m stdc++
>  
>  LIB_DEPENDS-main=converters/libiconv \
>   databases/xapian-core
> @@ -50,7 +49,8 @@ MODPY_RUNDEP=   No
>  .include 
>  .if ${BUILD_PACKAGES:M-gui}
>  CONFIGURE_ARGS+=-Dbuild_wizard:Bool=ON
> -MODULES+=x11/qt5
> +CONFIGURE_ARGS+=-Dforce_qt4:Bool=ON
> +MODULES+=x11/qt4
>  .endif
>  .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
>  # ld(1) fails
> 
> 
Thanks, I will try out, seen it gone in to CVS.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/11/14 01:11:00

Modified files:
devel/git  : Makefile 
devel/git/pkg  : PLIST-main 

Log message:
Fix PLIST: add 'share/emacs/' and 'share/emacs/site-lisp/' directories

ok sthen@, benoit@ (maintainer)